@@ -1,13 +1,13 @@ |
||
1 | 1 | <!-- MAIN STYLE --> |
2 | 2 | |
3 | -<link rel="stylesheet" type="text/css" media="screen" title="white-theme" href="<?php echo $this->theme->getBaseUrl() . '/css/theme.css'; ?>"> |
|
4 | -<link rel="alternate stylesheet" type="text/css" media="screen" title="dark-theme" href="<?php echo $this->theme->getBaseUrl() . '/css/dark.css'; ?>"> |
|
3 | +<link rel="stylesheet" type="text/css" media="screen" title="white-theme" href="<?php echo $this->theme->getBaseUrl().'/css/theme.css'; ?>"> |
|
4 | +<link rel="alternate stylesheet" type="text/css" media="screen" title="dark-theme" href="<?php echo $this->theme->getBaseUrl().'/css/dark.css'; ?>"> |
|
5 | 5 | |
6 | 6 | <!-- JS --> |
7 | 7 | |
8 | -<script src="<?php echo $this->theme->getBaseUrl() . '/js/styleswitch.js'; ?>"></script> |
|
8 | +<script src="<?php echo $this->theme->getBaseUrl().'/js/styleswitch.js'; ?>"></script> |
|
9 | 9 | |
10 | 10 | <!-- OTHER --> |
11 | 11 | |
12 | -<link href="<?php echo $this->theme->getBaseUrl() . '/css/lightbox.css'; ?>" rel="stylesheet"> |
|
12 | +<link href="<?php echo $this->theme->getBaseUrl().'/css/lightbox.css'; ?>" rel="stylesheet"> |
|
13 | 13 | <link href="https://fonts.googleapis.com/css?family=Open+Sans|PT+Sans|Rancho|Ubuntu+Condensed&subset=latin,cyrillic" rel="stylesheet" type="text/css"> |
@@ -10,7 +10,7 @@ |
||
10 | 10 | <?php endif; ?> |
11 | 11 | <a class="navbar-brand" style="<?php if ($logo->hasImage()) : ?>display:none;<?php endif; ?> " |
12 | 12 | href="<?php echo Yii::$app->homeUrl; ?>" id="text-logo"> |
13 | - <!-- <img src="<?php echo $this->theme->getBaseUrl() . '/img/logo.png'; ?>"></img> --> |
|
13 | + <!-- <img src="<?php echo $this->theme->getBaseUrl().'/img/logo.png'; ?>"></img> --> |
|
14 | 14 | <?php echo Html::encode(Yii::$app->name); ?> |
15 | 15 | </a> |
16 | 16 | <?php endif; ?> |
@@ -20,7 +20,10 @@ |
||
20 | 20 | <img src="<?php echo $logo->getUrl(); ?>" id="img-logo"/> |
21 | 21 | </a> |
22 | 22 | <br> |
23 | - <?php else: ?> |
|
24 | - <h1 id="app-title" class="animated fadeIn"><a href="<?php echo Yii::$app->homeUrl; ?>"><?php echo Html::encode(Yii::$app->name); ?></a></h1> |
|
23 | + <?php else { |
|
24 | + : ?> |
|
25 | + <h1 id="app-title" class="animated fadeIn"><a href="<?php echo Yii::$app->homeUrl; |
|
26 | +} |
|
27 | +?>"><?php echo Html::encode(Yii::$app->name); ?></a></h1> |
|
25 | 28 | <?php endif; ?> |
26 | 29 | <?php endif; ?> |
@@ -25,9 +25,9 @@ |
||
25 | 25 | |
26 | 26 | "; |
27 | 27 | ?> |
28 | - <?= Html::a('<i class="fa fa-facebook" style="font-size:16px;color:#3a5795"> </i>', 'https://www.facebook.com/sharer/sharer.php?u=' . urlencode($permalink) . '&description=' . urlencode($object->getContentDescription()),['onclick'=> $option]);?> |
|
29 | - <?= Html::a('<i class="fa fa-twitter" style="font-size:16px;color:#55acee"> </i> </i>', 'https://twitter.com/intent/tweet?text=' . urlencode($object->getContentDescription()) . '&url=' . urlencode($permalink),['onclick'=> $option]);?> |
|
30 | - <?= Html::a('<i class="fa fa-linkedin-square" style="font-size:16px;color:#0177b5"></i>', 'https://www.linkedin.com/shareArticle?summary=&mini=true&source=&title=' . urlencode($object->getContentDescription()) . '&url=' . urlencode($permalink) . '&ro=false', ['onclick'=> $option]);?> |
|
28 | + <?= Html::a('<i class="fa fa-facebook" style="font-size:16px;color:#3a5795"> </i>', 'https://www.facebook.com/sharer/sharer.php?u='.urlencode($permalink).'&description='.urlencode($object->getContentDescription()), ['onclick'=> $option]); ?> |
|
29 | + <?= Html::a('<i class="fa fa-twitter" style="font-size:16px;color:#55acee"> </i> </i>', 'https://twitter.com/intent/tweet?text='.urlencode($object->getContentDescription()).'&url='.urlencode($permalink), ['onclick'=> $option]); ?> |
|
30 | + <?= Html::a('<i class="fa fa-linkedin-square" style="font-size:16px;color:#0177b5"></i>', 'https://www.linkedin.com/shareArticle?summary=&mini=true&source=&title='.urlencode($object->getContentDescription()).'&url='.urlencode($permalink).'&ro=false', ['onclick'=> $option]); ?> |
|
31 | 31 | </div> |
32 | 32 | </div> |
33 | 33 | </div> |
34 | 34 | \ No newline at end of file |
@@ -12,11 +12,11 @@ |
||
12 | 12 | 'label' => Yii::t('CommentModule.widgets_views_comments', 'Show all {total} comments.', array('{total}' => $total)), |
13 | 13 | 'ajaxOptions' => [ |
14 | 14 | 'type' => 'POST', |
15 | - 'success' => new yii\web\JsExpression("function(html) { $('#comments_area_" . $id . "').html(html); }"), |
|
15 | + 'success' => new yii\web\JsExpression("function(html) { $('#comments_area_".$id."').html(html); }"), |
|
16 | 16 | 'url' => Url::to(['/comment/comment/show', 'contentModel' => $modelName, 'contentId' => $modelId]), |
17 | 17 | ], |
18 | 18 | 'htmlOptions' => [ |
19 | - 'id' => $id . "_showAllLink", |
|
19 | + 'id' => $id."_showAllLink", |
|
20 | 20 | 'class' => 'show show-all-link' |
21 | 21 | ], |
22 | 22 | 'tag' => 'a' |
@@ -7,16 +7,16 @@ |
||
7 | 7 | <div class="panel panel-default panel-tour" id="getting-started-panel"> |
8 | 8 | <?php |
9 | 9 | // Temporary workaround till panel widget rewrite in 0.10 verion |
10 | - $removeOptionHtml = "<li>" . \humhub\widgets\ModalConfirm::widget(array( |
|
10 | + $removeOptionHtml = "<li>".\humhub\widgets\ModalConfirm::widget(array( |
|
11 | 11 | 'uniqueID' => 'hide-panel-button', |
12 | 12 | 'title' => '<strong>Remove</strong> tour panel', |
13 | 13 | 'message' => 'This action will remove the tour panel from your dashboard. You can reactivate it at<br>Account settings <i class="fa fa-caret-right"></i> Settings.', |
14 | 14 | 'buttonTrue' => 'Ok', |
15 | 15 | 'buttonFalse' => 'Cancel', |
16 | - 'linkContent' => '<i class="fa fa-eye-slash"></i> ' . Yii::t('TourModule.widgets_views_tourPanel', ' Remove panel'), |
|
16 | + 'linkContent' => '<i class="fa fa-eye-slash"></i> '.Yii::t('TourModule.widgets_views_tourPanel', ' Remove panel'), |
|
17 | 17 | 'linkHref' => Url::to(["/tour/tour/hide-panel", "ajax" => 1]), |
18 | 18 | 'confirmJS' => '$(".panel-tour").slideToggle("slow")' |
19 | - ), true) . "</li>"; |
|
19 | + ), true)."</li>"; |
|
20 | 20 | ?> |
21 | 21 | |
22 | 22 | <!-- Display panel menu widget --> |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | <!-- STYLE --> |
4 | 4 | |
5 | - <link href="<?php echo $this->theme->getBaseUrl() . '/css/orbit.css'; ?>" rel="stylesheet"> |
|
5 | + <link href="<?php echo $this->theme->getBaseUrl().'/css/orbit.css'; ?>" rel="stylesheet"> |
|
6 | 6 | |
7 | 7 | <!-- BLOCK --> |
8 | 8 | |
@@ -16,12 +16,12 @@ discard block |
||
16 | 16 | --> |
17 | 17 | |
18 | 18 | <div id="featured"> |
19 | - <img src="<?php echo $this->theme->getBaseUrl() . '/img/orbit/banner/1.jpg'; ?>" rel="caption-1" /> |
|
19 | + <img src="<?php echo $this->theme->getBaseUrl().'/img/orbit/banner/1.jpg'; ?>" rel="caption-1" /> |
|
20 | 20 | <a href="http://humhub.com" target="_blank"> |
21 | - <img src="<?php echo $this->theme->getBaseUrl() . '/img/orbit/banner/2.jpg'; ?>" rel="caption-2" /> |
|
21 | + <img src="<?php echo $this->theme->getBaseUrl().'/img/orbit/banner/2.jpg'; ?>" rel="caption-2" /> |
|
22 | 22 | </a> |
23 | - <img src="<?php echo $this->theme->getBaseUrl() . '/img/orbit/banner/3.jpg'; ?>" rel="caption-3" /> |
|
24 | - <img src="<?php echo $this->theme->getBaseUrl() . '/img/orbit/banner/4.jpg'; ?>" rel="caption-4" /> |
|
23 | + <img src="<?php echo $this->theme->getBaseUrl().'/img/orbit/banner/3.jpg'; ?>" rel="caption-3" /> |
|
24 | + <img src="<?php echo $this->theme->getBaseUrl().'/img/orbit/banner/4.jpg'; ?>" rel="caption-4" /> |
|
25 | 25 | </div> |
26 | 26 | |
27 | 27 | <!-- CAPTIONS --> |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | |
35 | 35 | <!-- JAVASCRIPT --> |
36 | 36 | |
37 | - <script src="<?php echo $this->theme->getBaseUrl() . '/js/jquery.orbit.min.js'; ?>"></script> |
|
37 | + <script src="<?php echo $this->theme->getBaseUrl().'/js/jquery.orbit.min.js'; ?>"></script> |
|
38 | 38 | <script type="text/javascript"> |
39 | 39 | $(window).load(function() { |
40 | 40 | $('#featured').orbit({ |