Completed
Pull Request — dev (#76)
by Sarah
02:56 queued 32s
created
views/user/account/connected-accounts.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,11 @@
 block discarded – undo
27 27
                         <?= Html::a(Yii::t('UserModule.base', 'Currently in use'), '#', ['class' => 'btn btn-default btn-sm', 'data-method' => 'POST', 'disabled' => 'disabled']); ?>
28 28
                     <?php elseif (in_array($client->getId(), $activeAuthClientIds)) : ?>
29 29
                         <?= Html::a(Yii::t('UserModule.base', 'Disconnect account'), ['connected-accounts', 'disconnect' => $client->getId()], ['class' => 'btn btn-danger btn-sm', 'data-method' => 'POST']); ?>
30
-                    <?php else: ?>
31
-                        <?= Html::a(Yii::t('UserModule.base', 'Connect account'), Url::to(['/user/auth/external', 'authclient' => $client->getId()]), ['class' => 'btn btn-success  btn-sm']); ?>
30
+                    <?php else {
31
+    : ?>
32
+                        <?= Html::a(Yii::t('UserModule.base', 'Connect account'), Url::to(['/user/auth/external', 'authclient' => $client->getId()]), ['class' => 'btn btn-success  btn-sm']);
33
+}
34
+?>
32 35
                     <?php endif; ?>
33 36
                 </td>
34 37
             </tr>
Please login to merge, or discard this patch.
views/user/profile/about.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,14 +38,20 @@
 block discarded – undo
38 38
                                     <div class="col-sm-9">
39 39
                                         <p class="form-control-static"><?= RichText::widget(['text' => $field->getUserValue($user, true)]); ?></p>
40 40
                                     </div>
41
-                                <?php else: ?>
41
+                                <?php else {
42
+    : ?>
42 43
                                     <div class="col-sm-9">
43 44
                                         <?php if ($field->field_type_class == MarkdownEditor::className()): ?>
44 45
                                             <p class="form-control-static" style="min-height: 0 !important;padding-top:0;">
45
-                                                <?= MarkdownView::widget(['markdown' => $field->getUserValue($user, false)]); ?>
46
+                                                <?= MarkdownView::widget(['markdown' => $field->getUserValue($user, false)]);
47
+}
48
+?>
46 49
                                             </p>
47
-                                        <?php else: ?>
48
-                                            <p class="form-control-static"><?= $field->getUserValue($user, false); ?></p>                     
50
+                                        <?php else {
51
+    : ?>
52
+                                            <p class="form-control-static"><?= $field->getUserValue($user, false);
53
+}
54
+?></p>                     
49 55
                                         <?php endif; ?>
50 56
                                     </div>
51 57
                                 <?php endif; ?>
Please login to merge, or discard this patch.
views/user/profile/_layout.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,9 +18,12 @@
 block discarded – undo
18 18
             <div class="col-md-10 layout-content-container">
19 19
                 <?= $content; ?>
20 20
             </div>
21
-        <?php else: ?>
21
+        <?php else {
22
+    : ?>
22 23
             <div class="col-md-7 layout-content-container">
23
-                <?= $content; ?>
24
+                <?= $content;
25
+}
26
+?>
24 27
             </div>
25 28
             <div class="col-md-3 layout-sidebar-container">
26 29
                 <?php
Please login to merge, or discard this patch.
views/layouts/main.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,8 +98,11 @@
 block discarded – undo
98 98
                             <!-- start: show content (and check, if exists a sublayout -->
99 99
                             <?php if (isset($this->context->subLayout) && $this->context->subLayout != "") : ?>
100 100
                             <?= $this->render($this->context->subLayout, array('content' => $content)); ?>
101
-                                <?php else: ?>
102
-                                <?= $content; ?>
101
+                                <?php else {
102
+    : ?>
103
+                                <?= $content;
104
+}
105
+?>
103 106
                                     <?php endif; ?>
104 107
                                     <!-- end: show content -->
105 108
 
Please login to merge, or discard this patch.
views/content/widgets/pinLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,9 +3,12 @@
 block discarded – undo
3 3
         <a href="#" data-action-click="unpin" data-action-url="<?= $unpinUrl ?>">
4 4
             <i class="fa fa-arrow-up"></i> <?php echo Yii::t('ContentModule.widgets_views_pinLink', 'Unpin'); ?>
5 5
         </a>
6
-       <?php else: ?>
6
+       <?php else {
7
+    : ?>
7 8
         <a href="#" data-action-click="pin" data-action-url="<?= $pinUrl ?>">
8
-            <i class="fa fa-arrow-up"></i> <?php echo Yii::t('ContentModule.widgets_views_pinLink', 'Pin to top'); ?>
9
+            <i class="fa fa-arrow-up"></i> <?php echo Yii::t('ContentModule.widgets_views_pinLink', 'Pin to top');
10
+}
11
+?>
9 12
         </a>
10 13
     <?php endif; ?>
11 14
 </li>
Please login to merge, or discard this patch.
views/content/widgets/archiveLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,9 +12,12 @@
 block discarded – undo
12 12
         <a href="#" data-action-click="unarchive" data-action-url="<?= $unarchiveLink ?>">
13 13
             <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Unarchive'); ?>
14 14
         </a>
15
-    <?php else: ?>
15
+    <?php else {
16
+    : ?>
16 17
         <a href="#" data-action-click="archive" data-action-url="<?= $archiveLink ?>">
17
-            <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Move to archive'); ?>
18
+            <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Move to archive');
19
+}
20
+?>
18 21
         </a>
19 22
     <?php endif; ?>
20 23
 </li>
Please login to merge, or discard this patch.
views/content/widgets/visibilityLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,9 +10,12 @@
 block discarded – undo
10 10
         <a href="#"  class="makePublicLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
11 11
             <i class="fa fa-unlock makePublic"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make public') ?>
12 12
         </a>
13
-    <?php else: ?>
13
+    <?php else {
14
+    : ?>
14 15
         <a href="#" class="makePriavteLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
15 16
             <i class="fa fa-lock makePrivate"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make private') ?>
16 17
         </a>
17
-    <?php endif; ?>
18
+    <?php endif;
19
+}
20
+?>
18 21
 </li>
Please login to merge, or discard this patch.
views/admin/setting/oembed.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
             <li><?= Html::a($providerUrl, Url::to(['oembed-edit', 'prefix' => $providerUrl]), ['data-method' => 'POST']); ?></li>
19 19
         <?php endforeach; ?>
20 20
     </ul>
21
-<?php else: ?>
22
-    <p><strong><?= Yii::t('AdminModule.views_setting_oembed', 'Currently no provider active!'); ?></strong></p>
21
+<?php else {
22
+    : ?>
23
+    <p><strong><?= Yii::t('AdminModule.views_setting_oembed', 'Currently no provider active!');
24
+}
25
+?></strong></p>
23 26
 <?php endif; ?>
24 27
 
25 28
 <?php $this->endContent(); ?>
Please login to merge, or discard this patch.
views/like/widgets/likeLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,14 +10,17 @@
 block discarded – undo
10 10
     <?php if (Yii::$app->user->isGuest): ?>
11 11
 
12 12
         <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', 'Like'), Yii::$app->user->loginUrl, ['data-target' => '#globalModal']); ?>
13
-    <?php else: ?>
13
+    <?php else {
14
+    : ?>
14 15
         <a href="#" data-action-click="like.toggleLike" data-action-url="<?= $likeUrl ?>" class="like likeAnchor" style="<?= (!$currentUserLiked) ? '' : 'display:none'?>">
15 16
             <?= Yii::t('LikeModule.widgets_views_likeLink', 'Like') ?>
16 17
         </a>
17 18
         <a href="#" data-action-click="like.toggleLike" data-action-url="<?= $unlikeUrl ?>" class="unlike likeAnchor" style="<?= ($currentUserLiked) ? '' : 'display:none'?>">
18 19
             <?= Yii::t('LikeModule.widgets_views_likeLink', 'Unlike') ?>
19 20
         </a>
20
-    <?php endif; ?>
21
+    <?php endif;
22
+}
23
+?>
21 24
 
22 25
     <?php if (count($likes) > 0) { ?>
23 26
         <!-- Create link to show all users, who liked this -->
Please login to merge, or discard this patch.