@@ -81,8 +81,11 @@ |
||
| 81 | 81 | <!-- start: show content (and check, if exists a sublayout --> |
| 82 | 82 | <?php if (isset($this->subLayout) && $this->subLayout != "") : ?> |
| 83 | 83 | <?php echo $this->renderPartial($this->subLayout, array('content' => $content)); ?> |
| 84 | - <?php else: ?> |
|
| 85 | - <?php echo $content; ?> |
|
| 84 | + <?php else { |
|
| 85 | + : ?> |
|
| 86 | + <?php echo $content; |
|
| 87 | +} |
|
| 88 | +?> |
|
| 86 | 89 | <?php endif; ?> |
| 87 | 90 | <!-- end: show content --> |
| 88 | 91 | |
@@ -14,19 +14,19 @@ |
||
| 14 | 14 | <?php $ver = HVersion::VERSION; ?> |
| 15 | 15 | |
| 16 | 16 | <?php |
| 17 | - Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/animate.min.css'); |
|
| 18 | - Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/bootstrap.min.css'); |
|
| 19 | - Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/animate.min.css'); |
|
| 20 | - Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/style.css'); |
|
| 21 | - Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/flatelements.css'); |
|
| 22 | - Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/resources/font-awesome/css/font-awesome.min.css'); |
|
| 23 | - |
|
| 24 | - |
|
| 25 | - Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/bootstrap.min.js'); |
|
| 26 | - Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/modernizr.js'); |
|
| 27 | - Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.cookie.js'); |
|
| 28 | - Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.flatelements.js'); |
|
| 29 | - Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.placeholder.js'); |
|
| 17 | + Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/animate.min.css'); |
|
| 18 | + Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/bootstrap.min.css'); |
|
| 19 | + Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/animate.min.css'); |
|
| 20 | + Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/style.css'); |
|
| 21 | + Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/flatelements.css'); |
|
| 22 | + Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/resources/font-awesome/css/font-awesome.min.css'); |
|
| 23 | + |
|
| 24 | + |
|
| 25 | + Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/bootstrap.min.js'); |
|
| 26 | + Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/modernizr.js'); |
|
| 27 | + Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.cookie.js'); |
|
| 28 | + Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.flatelements.js'); |
|
| 29 | + Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.placeholder.js'); |
|
| 30 | 30 | ?> |
| 31 | 31 | |
| 32 | 32 | <!-- The HTML5 shim, for IE6-8 support of HTML5 elements --> |
@@ -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 |
@@ -11,10 +11,10 @@ |
||
| 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 | 13 | : ?> |
| 14 | - <?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>'), $likeUrl, ['style' => 'display:'.((!$currentUserLiked) ? 'inline' : 'none'), 'class' => 'like likeAnchor', 'data-objectId' => $id]); |
|
| 15 | 15 | } |
| 16 | 16 | ?> |
| 17 | - <?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]); ?> |
|
| 17 | + <?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]); ?> |
|
| 18 | 18 | <?php endif; ?> |
| 19 | 19 | |
| 20 | 20 | <?php if (count($likes) > 0) { ?> |
@@ -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> |