@@ -42,8 +42,11 @@ |
||
42 | 42 | |
43 | 43 | · <?= Html::a(Yii::t('AdminModule.views_module_list', 'Disable'), Url::to(['/admin/module/disable', 'moduleId' => $moduleId]), ['data-method' => 'POST', 'data-confirm' => Yii::t('AdminModule.views_module_list', 'Are you sure? *ALL* module data will be lost!')]); ?> |
44 | 44 | |
45 | - <?php else: ?> |
|
46 | - · <?= Html::a(Yii::t('AdminModule.views_module_list', 'Enable'), Url::to(['/admin/module/enable', 'moduleId' => $moduleId]), ['data-method' => 'POST', 'style' => 'font-weight:bold', 'data-loader' => "modal", 'data-message' => Yii::t('AdminModule.views_module_list', 'Enable module...')]); ?> |
|
45 | + <?php else { |
|
46 | + : ?> |
|
47 | + · <?= Html::a(Yii::t('AdminModule.views_module_list', 'Enable'), Url::to(['/admin/module/enable', 'moduleId' => $moduleId]), ['data-method' => 'POST', 'style' => 'font-weight:bold', 'data-loader' => "modal", 'data-message' => Yii::t('AdminModule.views_module_list', 'Enable module...')]); |
|
48 | +} |
|
49 | +?> |
|
47 | 50 | <?php endif; ?> |
48 | 51 | |
49 | 52 | <?php if (Yii::$app->moduleManager->canRemoveModule($moduleId)): ?> |
@@ -1,4 +1,4 @@ |
||
1 | -<div <?= $id ? 'id="'.$id.'"' : ''?> class="loader humhub-ui-loader <?= $cssClass; ?>" <?php if(isset($show) && !$show) : ?> style="display:none;" <?php endif; ?>> |
|
1 | +<div <?= $id ? 'id="' . $id . '"' : ''?> class="loader humhub-ui-loader <?= $cssClass; ?>" <?php if (isset($show) && !$show) : ?> style="display:none;" <?php endif; ?>> |
|
2 | 2 | <div class="sk-spinner sk-spinner-three-bounce"> |
3 | 3 | <div class="sk-bounce1"></div> |
4 | 4 | <div class="sk-bounce2"></div> |
@@ -23,8 +23,11 @@ |
||
23 | 23 | id="img-logo"/> |
24 | 24 | </a> |
25 | 25 | <br> |
26 | - <?php else: ?> |
|
27 | - <h1 id="app-title" class="animated fadeIn"><?php echo Html::encode(Yii::$app->name); ?></h1> |
|
26 | + <?php else { |
|
27 | + : ?> |
|
28 | + <h1 id="app-title" class="animated fadeIn"><?php echo Html::encode(Yii::$app->name); |
|
29 | +} |
|
30 | +?></h1> |
|
28 | 31 | <?php endif; ?> |
29 | 32 | <?php endif; ?> |
30 | 33 |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <!-- check if flash message exists --> |
2 | -<?php if(Yii::$app->getSession()->hasFlash('data-saved')): ?> |
|
2 | +<?php if (Yii::$app->getSession()->hasFlash('data-saved')): ?> |
|
3 | 3 | |
4 | 4 | <script type="text/javascript"> |
5 | 5 | $(function() { |
@@ -16,12 +16,15 @@ |
||
16 | 16 | |
17 | 17 | <?php if ($dialogContent) : ?> |
18 | 18 | <?= $dialogContent ?> |
19 | - <?php else : ?> |
|
19 | + <?php else { |
|
20 | + : ?> |
|
20 | 21 | <!-- Body --> |
21 | 22 | <div class="<?= $bodyClass ?>"> |
22 | 23 | <?php if ($body !== null): ?> |
23 | 24 | <?= $body ?> |
24 | - <?php endif; ?> |
|
25 | + <?php endif; |
|
26 | +} |
|
27 | +?> |
|
25 | 28 | <?php if ($initialLoader): ?> |
26 | 29 | <?php echo \humhub\widgets\LoaderWidget::widget(); ?> |
27 | 30 | <?php endif; ?> |
@@ -22,10 +22,10 @@ |
||
22 | 22 | 'header' => 'Actions', |
23 | 23 | 'class' => 'yii\grid\ActionColumn', |
24 | 24 | 'buttons' => [ |
25 | - 'update' => function () { |
|
25 | + 'update' => function() { |
|
26 | 26 | return; |
27 | 27 | }, |
28 | - 'view' => function () { |
|
28 | + 'view' => function() { |
|
29 | 29 | return; |
30 | 30 | }, |
31 | 31 | 'delete' => function($url, $model) { |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | |
6 | 6 | $commentCount = $this->context->getCommentsCount(); |
7 | 7 | $hasComments = ($commentCount > 0); |
8 | -$commentCountSpan = Html::tag('span', ' ('.$commentCount.')', [ |
|
8 | +$commentCountSpan = Html::tag('span', ' (' . $commentCount . ')', [ |
|
9 | 9 | 'class' => 'comment-count', |
10 | 10 | 'data-count' => $commentCount, |
11 | 11 | 'style' => ($hasComments) ? null : 'display:none' |
@@ -15,10 +15,10 @@ discard block |
||
15 | 15 | <?php if ($mode == \humhub\modules\comment\widgets\CommentLink::MODE_POPUP): ?> |
16 | 16 | <?php $url = Url::to(['/comment/comment/show', 'contentModel' => $objectModel, 'contentId' => $objectId, 'mode' => 'popup']); ?> |
17 | 17 | <a href="#" data-action-click="ui.modal.load" data-action-url="<?= $url ?>"> |
18 | - <?= Yii::t('CommentModule.widgets_views_link', "Comment").'('.$this->context->getCommentsCount().')' ?> |
|
18 | + <?= Yii::t('CommentModule.widgets_views_link', "Comment") . '(' . $this->context->getCommentsCount() . ')' ?> |
|
19 | 19 | </a> |
20 | -<?php elseif(Yii::$app->user->isGuest): ?> |
|
21 | - <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, Yii::$app->user->loginUrl, ['data-target' => '#globalModal']) ?> |
|
20 | +<?php elseif (Yii::$app->user->isGuest): ?> |
|
21 | + <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment") . $commentCountSpan, Yii::$app->user->loginUrl, ['data-target' => '#globalModal']) ?> |
|
22 | 22 | <?php else : ?> |
23 | - <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, "#",['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); ?> |
|
23 | + <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment") . $commentCountSpan, "#", ['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); ?> |
|
24 | 24 | <?php endif; ?> |
25 | 25 | \ No newline at end of file |
@@ -19,6 +19,9 @@ |
||
19 | 19 | </a> |
20 | 20 | <?php elseif(Yii::$app->user->isGuest): ?> |
21 | 21 | <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, Yii::$app->user->loginUrl, ['data-target' => '#globalModal']) ?> |
22 | -<?php else : ?> |
|
23 | - <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, "#",['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); ?> |
|
22 | +<?php else { |
|
23 | + : ?> |
|
24 | + <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, "#",['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); |
|
25 | +} |
|
26 | +?> |
|
24 | 27 | <?php endif; ?> |
25 | 28 | \ No newline at end of file |
@@ -24,7 +24,7 @@ |
||
24 | 24 | 'id' => 'comment_create_upload_' . $id, |
25 | 25 | 'progress' => '#comment_create_upload_progress_' . $id, |
26 | 26 | 'preview' => '#comment_create_upload_preview_' . $id, |
27 | - 'dropZone' => '#comment_create_form_'.$id, |
|
27 | + 'dropZone' => '#comment_create_form_' . $id, |
|
28 | 28 | 'max' => Yii::$app->getModule('content')->maxAttachedFiles |
29 | 29 | ]); |
30 | 30 | ?> |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | <?= Html::hiddenInput('contentId', $contentId); ?> |
12 | 12 | |
13 | 13 | <?= |
14 | - humhub\widgets\RichtextField::widget([ |
|
14 | + humhub\widgets\RichtextField::widget([ |
|
15 | 15 | 'id' => 'comment_input_'.$comment->id, |
16 | 16 | 'placeholder' => Yii::t('CommentModule.views_edit', 'Edit your comment...'), |
17 | 17 | 'model' => $comment, |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | <div id="comment_upload_progress_<?= $comment->id ?>" style="display:none; margin:10px 0;"></div> |
47 | 47 | |
48 | 48 | <?= |
49 | - \humhub\modules\file\widgets\FilePreview::widget([ |
|
49 | + \humhub\modules\file\widgets\FilePreview::widget([ |
|
50 | 50 | 'id' => 'comment_upload_preview_'.$comment->id, |
51 | 51 | 'options' => ['style' => 'margin-top:10px'], |
52 | 52 | 'model' => $comment, |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | |
13 | 13 | <?= |
14 | 14 | humhub\widgets\RichtextField::widget([ |
15 | - 'id' => 'comment_input_'.$comment->id, |
|
15 | + 'id' => 'comment_input_' . $comment->id, |
|
16 | 16 | 'placeholder' => Yii::t('CommentModule.views_edit', 'Edit your comment...'), |
17 | 17 | 'model' => $comment, |
18 | 18 | 'attribute' => 'message' |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | \humhub\modules\file\widgets\UploadButton::widget([ |
26 | 26 | 'id' => 'comment_upload_' . $comment->id, |
27 | 27 | 'model' => $comment, |
28 | - 'dropZone' => '#comment_'.$comment->id, |
|
29 | - 'preview' => '#comment_upload_preview_'.$comment->id, |
|
30 | - 'progress' => '#comment_upload_progress_'.$comment->id, |
|
28 | + 'dropZone' => '#comment_' . $comment->id, |
|
29 | + 'preview' => '#comment_upload_preview_' . $comment->id, |
|
30 | + 'progress' => '#comment_upload_progress_' . $comment->id, |
|
31 | 31 | 'max' => Yii::$app->getModule('content')->maxAttachedFiles |
32 | 32 | ]); |
33 | 33 | ?> |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | <?= |
49 | 49 | \humhub\modules\file\widgets\FilePreview::widget([ |
50 | - 'id' => 'comment_upload_preview_'.$comment->id, |
|
50 | + 'id' => 'comment_upload_preview_' . $comment->id, |
|
51 | 51 | 'options' => ['style' => 'margin-top:10px'], |
52 | 52 | 'model' => $comment, |
53 | 53 | 'edit' => true |