Completed
Pull Request — dev (#76)
by Sarah
02:56 queued 32s
created
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.
views/user/auth/login.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,11 +27,17 @@
 block discarded – undo
27 27
 
28 28
             <?php if (AuthChoice::hasClients()): ?>
29 29
                 <?= AuthChoice::widget([]) ?>
30
-            <?php else: ?>
30
+            <?php else {
31
+    : ?>
31 32
                 <?php if ($canRegister) : ?>
32
-                    <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p>
33
-                <?php else: ?>
34
-                    <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); ?></p>
33
+                    <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password.");
34
+}
35
+?></p>
36
+                <?php else {
37
+    : ?>
38
+                    <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password.");
39
+}
40
+?></p>
35 41
                 <?php endif; ?>
36 42
             <?php endif; ?>
37 43
 
Please login to merge, or discard this patch.
views/user/auth/login_modal.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,11 +36,17 @@
 block discarded – undo
36 36
 
37 37
                     <?php if (AuthChoice::hasClients()): ?>
38 38
                         <?= AuthChoice::widget([]) ?>
39
-                    <?php else: ?>
39
+                    <?php else {
40
+    : ?>
40 41
                         <?php if ($canRegister) : ?>
41
-                            <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p>
42
-                        <?php else: ?>
43
-                            <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); ?></p>
42
+                            <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password.");
43
+}
44
+?></p>
45
+                        <?php else {
46
+    : ?>
47
+                            <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password.");
48
+}
49
+?></p>
44 50
                         <?php endif; ?>                    <?php endif; ?>
45 51
 
46 52
                     <?php $form = ActiveForm::begin(['enableClientValidation' => false]); ?>
Please login to merge, or discard this patch.
views/user/widgets/profileHeader.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,9 +101,12 @@
 block discarded – undo
101 101
                          src="<?= $user->getProfileImage()->getUrl(); ?>"
102 102
                          data-src="holder.js/140x140" alt="140x140" style="width: 140px; height: 140px;"/>
103 103
                 </a>
104
-            <?php else : ?>
104
+            <?php else {
105
+    : ?>
105 106
                 <img class="img-rounded profile-user-photo" id="user-profile-image"
106
-                     src="<?= $user->getProfileImage()->getUrl(); ?>"
107
+                     src="<?= $user->getProfileImage()->getUrl();
108
+}
109
+?>"
107 110
                      data-src="holder.js/140x140" alt="140x140" style="width: 140px; height: 140px;"/>
108 111
                  <?php endif; ?>
109 112
 
Please login to merge, or discard this patch.
views/user/widgets/accountTopMenu.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,18 +8,24 @@  discard block
 block discarded – undo
8 8
     <a href="#" class="btn btn-enter" data-action-click="ui.modal.load" data-action-url="<?= Url::toRoute('/user/auth/login'); ?>">
9 9
         <?php if (Yii::$app->getModule('user')->settings->get('auth.anonymousRegistration')): ?>
10 10
             <?= Yii::t('UserModule.base', 'Sign in / up'); ?>
11
-        <?php else: ?>
12
-            <?= Yii::t('UserModule.base', 'Sign in'); ?>
11
+        <?php else {
12
+    : ?>
13
+            <?= Yii::t('UserModule.base', 'Sign in');
14
+}
15
+?>
13 16
         <?php endif; ?>
14 17
     </a>
15
-<?php else: ?>
18
+<?php else {
19
+    : ?>
16 20
     <ul class="nav">
17 21
         <li class="dropdown account">
18 22
             <a href="#" id="account-dropdown-link" class="dropdown-toggle" data-toggle="dropdown">
19 23
 
20 24
                 <?php if ($this->context->showUserName): ?>
21 25
                     <div class="user-title pull-left hidden-xs">
22
-                        <strong><?= Html::encode(Yii::$app->user->getIdentity()->displayName); ?></strong><br/><span class="truncate"><?= Html::encode(Yii::$app->user->getIdentity()->profile->title); ?></span>
26
+                        <strong><?= Html::encode(Yii::$app->user->getIdentity()->displayName);
27
+}
28
+?></strong><br/><span class="truncate"><?= Html::encode(Yii::$app->user->getIdentity()->profile->title); ?></span>
23 29
                     </div>
24 30
                 <?php endif; ?>
25 31
 
@@ -34,9 +40,12 @@  discard block
 block discarded – undo
34 40
                 <?php foreach ($this->context->getItems() as $item): ?>
35 41
                     <?php if ($item['label'] == '---'): ?>
36 42
                         <li class="divider"></li>
37
-                        <?php else: ?>
43
+                        <?php else {
44
+    : ?>
38 45
                         <li>
39
-                            <a <?= isset($item['id']) ? 'id="' . $item['id'] . '"' : '' ?> href="<?= $item['url']; ?>" <?= isset($item['pjax']) && $item['pjax'] === false ? 'data-pjax-prevent' : '' ?>>
46
+                            <a <?= isset($item['id']) ? 'id="' . $item['id'] . '"' : '' ?> href="<?= $item['url'];
47
+}
48
+?>" <?= isset($item['pjax']) && $item['pjax'] === false ? 'data-pjax-prevent' : '' ?>>
40 49
                                 <?= $item['icon'] . ' ' . $item['label']; ?>
41 50
                             </a>
42 51
                         </li>
Please login to merge, or discard this patch.
views/user/registration/success.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
                     <p><?= Yii::t('UserModule.views_auth_createAccount_success', 'After activating your account by the administrator, you will receive a notification by email.'); ?></p>
19 19
                     <br>
20 20
                     <a href="<?= Url::home() ?>" class="btn btn-primary" data-ui-loader><?= Yii::t('UserModule.views_auth_createAccount_success', 'back to home') ?></a>
21
-                <?php else: ?>
22
-                    <p><?= Yii::t('UserModule.views_auth_createAccount_success', 'To log in with your new account, click the button below.'); ?></p>
21
+                <?php else {
22
+    : ?>
23
+                    <p><?= Yii::t('UserModule.views_auth_createAccount_success', 'To log in with your new account, click the button below.');
24
+}
25
+?></p>
23 26
                     <br>
24 27
                     <a href="<?= Url::home() ?>"
25 28
                        class="btn btn-primary" data-ui-loader><?= Yii::t('UserModule.views_auth_createAccount_success', 'Go to login page') ?></a>
Please login to merge, or discard this patch.