Completed
Pull Request — dev (#76)
by Sarah
02:44
created
views/admin/module/info.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,11 @@
 block discarded – undo
18 18
 
19 19
                     <?= \yii\helpers\Markdown::process($content); ?>
20 20
 
21
-                <?php else: ?>
22
-                    <?= $description; ?>
21
+                <?php else {
22
+    : ?>
23
+                    <?= $description;
24
+}
25
+?>
23 26
                     <br>
24 27
                     <br>
25 28
 
Please login to merge, or discard this patch.
views/admin/module/_header.php 1 patch
Braces   +16 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,11 +23,23 @@
 block discarded – undo
23 23
 </div>
24 24
 <div class="tab-menu">
25 25
     <ul class="nav nav-tabs" id="moduleTabs">
26
-        <li <?php if ($this->context->action->id == 'list') echo 'class="active"'; ?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Installed'), Url::to(['list'])); ?></li>
26
+        <li <?php if ($this->context->action->id == 'list') {
27
+    echo 'class="active"';
28
+}
29
+?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Installed'), Url::to(['list'])); ?></li>
27 30
         <?php if (Yii::$app->getModule('admin')->marketplaceEnabled) : ?>
28
-            <li <?php if ($this->context->action->id == 'list-online') echo 'class="active"'; ?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Browse online'), Url::to(['list-online'])); ?></li>
29
-            <li <?php if ($this->context->action->id == 'list-purchases') echo 'class="active"'; ?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Purchases'), Url::to(['list-purchases'])); ?></li>
30
-            <li <?php if ($this->context->action->id == 'list-updates') echo 'class="active"'; ?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Available updates') . $updatesBadge, Url::to(['list-updates'])); ?></li>
31
+            <li <?php if ($this->context->action->id == 'list-online') {
32
+    echo 'class="active"';
33
+}
34
+?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Browse online'), Url::to(['list-online'])); ?></li>
35
+            <li <?php if ($this->context->action->id == 'list-purchases') {
36
+    echo 'class="active"';
37
+}
38
+?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Purchases'), Url::to(['list-purchases'])); ?></li>
39
+            <li <?php if ($this->context->action->id == 'list-updates') {
40
+    echo 'class="active"';
41
+}
42
+?>><?= Html::a(Yii::t('AdminModule.views_module_header', 'Available updates') . $updatesBadge, Url::to(['list-updates'])); ?></li>
31 43
         <?php endif; ?>
32 44
     </ul>
33 45
 </div>
Please login to merge, or discard this patch.
views/admin/module/listPurchases.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,8 @@  discard block
 block discarded – undo
35 35
                 <br><br>
36 36
             </div>
37 37
 
38
-        <?php else: ?>
38
+        <?php else {
39
+    : ?>
39 40
 
40 41
 
41 42
             <?php foreach ($modules as $module): ?>
@@ -44,6 +45,7 @@  discard block
 block discarded – undo
44 45
 
45 46
                     <?php
46 47
                     $moduleImageUrl = Yii::getAlias('@web-static/img/default_module.jpg');
48
+}
47 49
                     if (isset($module['moduleImageUrl']) && $module['moduleImageUrl'] != "") {
48 50
                         $moduleImageUrl = $module['moduleImageUrl'];
49 51
                     }
Please login to merge, or discard this patch.
views/admin/module/listOnline.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,11 +34,14 @@  discard block
 block discarded – undo
34 34
                 <br><br>
35 35
             </div>
36 36
 
37
-        <?php else: ?>
37
+        <?php else {
38
+    : ?>
38 39
 
39 40
             <?php foreach ($modules as $module): ?>
40 41
                 <hr>
41
-                <div class="media <?php if (Yii::$app->moduleManager->hasModule($module['id'])): ?>module-installed<?php endif; ?>">
42
+                <div class="media <?php if (Yii::$app->moduleManager->hasModule($module['id'])): ?>module-installed<?php endif;
43
+}
44
+?>">
42 45
 
43 46
                     <?php
44 47
                     $moduleImageUrl = Yii::getAlias('@web-static/img/default_module.jpg');
@@ -82,14 +85,20 @@  discard block
 block discarded – undo
82 85
                                     <?php if (isset($module['price_eur']) && $module['price_eur'] != 0 && !$module['purchased']) : ?>
83 86
                                         <?php $checkoutUrl = str_replace('-returnToUrl-', Url::to(['/admin/module/list-purchases'], true), $module['checkoutUrl']); ?>
84 87
                                         &middot; <?= Html::a(Yii::t('AdminModule.views_module_listOnline', 'Buy (%price%)', ['%price%' => $module['price_eur'] . '&euro;']), $checkoutUrl, ['style' => 'font-weight:bold', 'target' => '_blank']); ?>
85
-                                    <?php else: ?>
86
-                                        &middot; <?= Html::a(Yii::t('AdminModule.views_module_listOnline', 'Install'), Url::to(['install', 'moduleId' => $module['id']]), ['style' => 'font-weight:bold', 'data-loader' => "modal", 'data-message' => Yii::t('AdminModule.views_module_listOnline', 'Installing module...'), 'data-method' => 'POST']); ?>
88
+                                    <?php else {
89
+    : ?>
90
+                                        &middot; <?= Html::a(Yii::t('AdminModule.views_module_listOnline', 'Install'), Url::to(['install', 'moduleId' => $module['id']]), ['style' => 'font-weight:bold', 'data-loader' => "modal", 'data-message' => Yii::t('AdminModule.views_module_listOnline', 'Installing module...'), 'data-method' => 'POST']);
91
+}
92
+?>
87 93
                                     <?php endif; ?>
88 94
                                 <?php endif; ?>
89 95
 
90
-                            <?php else : ?>
96
+                            <?php else {
97
+    : ?>
91 98
                                 &middot; <span
92
-                                    style="color:red"><?= Yii::t('AdminModule.views_module_listOnline', 'No compatible module version found!'); ?></span>
99
+                                    style="color:red"><?= Yii::t('AdminModule.views_module_listOnline', 'No compatible module version found!');
100
+}
101
+?></span>
93 102
                             <?php endif; ?>
94 103
                             &middot; <?= Html::a(Yii::t('AdminModule.views_module_listOnline', 'More info'), $module['marketplaceUrl'], ['target' => '_blank']); ?>
95 104
                             <?php if (isset($module['showDisclaimer']) && $module['showDisclaimer'] == 1): ?>
Please login to merge, or discard this patch.
views/admin/module/list.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,8 +42,11 @@
 block discarded – undo
42 42
 
43 43
                             &middot; <?= 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
-                            &middot; <?= 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
+                            &middot; <?= 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)): ?>
Please login to merge, or discard this patch.
views/widgets/logo.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,11 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
views/widgets/modalDialog.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,12 +16,15 @@
 block discarded – undo
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; ?>
Please login to merge, or discard this patch.
views/space/space/_layout.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,9 +15,12 @@
 block discarded – undo
15 15
 			<div class="col-md-10 layout-content-container">
16 16
 				<?php echo $content; ?>
17 17
 			</div>
18
-		<?php else: ?>
18
+		<?php else {
19
+    : ?>
19 20
 			<div class="col-md-7 layout-content-container">
20
-				<?php echo $content; ?>
21
+				<?php echo $content;
22
+}
23
+?>
21 24
 			</div>
22 25
 			<div class="col-md-3 layout-sidebar-container">
23 26
 				<?php
Please login to merge, or discard this patch.
views/comment/widgets/link.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,6 +19,9 @@
 block discarded – undo
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
Please login to merge, or discard this patch.