@@ -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"> |
@@ -81,7 +81,7 @@ |
||
81 | 81 | |
82 | 82 | <body> |
83 | 83 | |
84 | - <script src="<?php echo $this->theme->getBaseUrl() . '/js/lightbox-plus-jquery.min.js'; ?>"></script> |
|
84 | + <script src="<?php echo $this->theme->getBaseUrl().'/js/lightbox-plus-jquery.min.js'; ?>"></script> |
|
85 | 85 | |
86 | 86 | <?php $this->beginBody() ?> |
87 | 87 |
@@ -10,8 +10,8 @@ |
||
10 | 10 | <?php if (Yii::$app->user->isGuest): ?> |
11 | 11 | <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-heart-o"></i>'), Yii::$app->user->loginUrl, array('data-target' => '#globalModal')); ?> |
12 | 12 | <?php else: ?> |
13 | - <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $likeUrl, ['style' => 'display:' . ((!$currentUserLiked) ? 'inline' : 'none'), 'class' => 'like likeAnchor', 'data-objectId' => $id]); ?> |
|
14 | - <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $unlikeUrl, ['style' => 'display:' . (($currentUserLiked) ? 'inline' : 'none'), 'class' => 'unlike likeAnchor', 'data-objectId' => $id]); ?> |
|
13 | + <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $likeUrl, ['style' => 'display:'.((!$currentUserLiked) ? 'inline' : 'none'), 'class' => 'like likeAnchor', 'data-objectId' => $id]); ?> |
|
14 | + <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', '<i class="fa fa-thumbs-o-up"></i>'), $unlikeUrl, ['style' => 'display:'.(($currentUserLiked) ? 'inline' : 'none'), 'class' => 'unlike likeAnchor', 'data-objectId' => $id]); ?> |
|
15 | 15 | <?php endif; ?> |
16 | 16 | |
17 | 17 | <?php if (count($likes) > 0) { ?> |
@@ -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; ?> |
@@ -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' |
@@ -16,7 +16,7 @@ |
||
16 | 16 | if (Yii::$app->user->isGuest) { |
17 | 17 | echo Html::a(Yii::t('CommentModule.widgets_views_link', "<i class='fa fa-comments-o'></i>"), Yii::$app->user->loginUrl, array('data-target' => '#globalModal')); |
18 | 18 | } else { |
19 | - echo Html::a(Yii::t('CommentModule.widgets_views_link', "<i class='fa fa-comments-o'></i>"), "#", array('onClick' => "$('#comment_" . $id . "').show();$('#newCommentForm_" . $id . "_contenteditable').focus();return false;")); |
|
19 | + echo Html::a(Yii::t('CommentModule.widgets_views_link', "<i class='fa fa-comments-o'></i>"), "#", array('onClick' => "$('#comment_".$id."').show();$('#newCommentForm_".$id."_contenteditable').focus();return false;")); |
|
20 | 20 | } |
21 | 21 | ?> |
22 | 22 | </div> |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | <li> |
26 | 26 | <?php |
27 | 27 | echo AjaxButton::widget([ |
28 | - 'label' => '<i class="fa fa-pencil"></i> ' . Yii::t('CommentModule.widgets_views_showComment', 'Edit'), |
|
28 | + 'label' => '<i class="fa fa-pencil"></i> '.Yii::t('CommentModule.widgets_views_showComment', 'Edit'), |
|
29 | 29 | 'ajaxOptions' => [ |
30 | 30 | 'type' => 'POST', |
31 | - 'success' => new yii\web\JsExpression("function(html){ $('.preferences .dropdown').removeClass('open'); $('#comment_editarea_" . $comment->id . "').replaceWith(html); $('#comment_input_" . $comment->id . "_contenteditable').focus(); }"), |
|
31 | + 'success' => new yii\web\JsExpression("function(html){ $('.preferences .dropdown').removeClass('open'); $('#comment_editarea_".$comment->id."').replaceWith(html); $('#comment_input_".$comment->id."_contenteditable').focus(); }"), |
|
32 | 32 | 'url' => Url::to(['/comment/comment/edit', 'contentModel' => $comment->object_model, 'contentId' => $comment->object_id, 'id' => $comment->id]), |
33 | 33 | ], |
34 | 34 | 'tag' => 'a' |
@@ -44,15 +44,15 @@ discard block |
||
44 | 44 | <!-- load modal confirm widget --> |
45 | 45 | <?php |
46 | 46 | echo humhub\widgets\ModalConfirm::widget(array( |
47 | - 'uniqueID' => 'modal_commentdelete_' . $comment->id, |
|
47 | + 'uniqueID' => 'modal_commentdelete_'.$comment->id, |
|
48 | 48 | 'linkOutput' => 'a', |
49 | 49 | 'title' => Yii::t('CommentModule.widgets_views_showComment', '<strong>Confirm</strong> comment deleting'), |
50 | 50 | 'message' => Yii::t('CommentModule.widgets_views_showComment', 'Do you really want to delete this comment?'), |
51 | 51 | 'buttonTrue' => Yii::t('CommentModule.widgets_views_showComment', 'Delete'), |
52 | 52 | 'buttonFalse' => Yii::t('CommentModule.widgets_views_showComment', 'Cancel'), |
53 | - 'linkContent' => '<i class="fa fa-trash-o"></i> ' . Yii::t('CommentModule.widgets_views_showComment', 'Delete'), |
|
53 | + 'linkContent' => '<i class="fa fa-trash-o"></i> '.Yii::t('CommentModule.widgets_views_showComment', 'Delete'), |
|
54 | 54 | 'linkHref' => Url::to(["/comment/comment/delete", 'contentModel' => $comment->object_model, 'contentId' => $comment->object_id, 'id' => $comment->id]), |
55 | - 'confirmJS' => "function(html) { $('#comment_" . $comment->id . "').slideUp(); }" |
|
55 | + 'confirmJS' => "function(html) { $('#comment_".$comment->id."').slideUp(); }" |
|
56 | 56 | )); |
57 | 57 | ?> |
58 | 58 | </li> |
@@ -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 --> |