Completed
Push — dev ( db2df6...716f17 )
by Sarah
10s
created
views/mail/mail/notificationList.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,6 +3,9 @@
 block discarded – undo
3 3
     <?php foreach ($userMessages as $userMessage) : ?>
4 4
         <?php echo $this->render('_messagePreview', array('userMessage' => $userMessage)); ?>
5 5
     <?php endforeach; ?>
6
-<?php else: ?>
7
-    <li class="placeholder"> <?php echo Yii::t('MailModule.views_mail_list', 'There are no messages yet.'); ?></li>
6
+<?php else {
7
+    : ?>
8
+    <li class="placeholder"> <?php echo Yii::t('MailModule.views_mail_list', 'There are no messages yet.');
9
+}
10
+?></li>
8 11
 <?php endif; ?>
9 12
\ No newline at end of file
Please login to merge, or discard this patch.
views/mail/mail/index.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
 						<?php foreach ($userMessages as $userMessage) : ?>
19 19
 							<?php echo $this->render('_messagePreview', array('userMessage' => $userMessage)); ?>
20 20
 						<?php endforeach; ?>
21
-					<?php else: ?>
22
-						<li class="placeholder"><?php echo Yii::t('MailModule.views_mail_index', 'There are no messages yet.'); ?></li>
21
+					<?php else {
22
+    : ?>
23
+						<li class="placeholder"><?php echo Yii::t('MailModule.views_mail_index', 'There are no messages yet.');
24
+}
25
+?></li>
23 26
 					<?php endif; ?>
24 27
 				</ul>
25 28
 			</div>
Please login to merge, or discard this patch.
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
                         <?php echo 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
                         <?php echo 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
-                        <?php echo 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
+                        <?php echo 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/account/delete.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,8 +7,11 @@  discard block
 block discarded – undo
7 7
 <?php $this->beginContent('@user/views/account/_userProfileLayout.php') ?>
8 8
 <?php if ($isSpaceOwner) : ?>
9 9
     <?php echo Yii::t('UserModule.views_account_delete', 'Sorry, as an owner of a workspace you are not able to delete your account!<br />Please assign another owner or delete them.'); ?>
10
-<?php else: ?>
11
-    <?php echo Yii::t('UserModule.views_account_delete', 'Are you sure, that you want to delete your account?<br />All your published content will be removed! '); ?>
10
+<?php else {
11
+    : ?>
12
+    <?php echo Yii::t('UserModule.views_account_delete', 'Are you sure, that you want to delete your account?<br />All your published content will be removed! ');
13
+}
14
+?>
12 15
     <br />
13 16
     <br />
14 17
 
@@ -16,8 +19,11 @@  discard block
 block discarded – undo
16 19
 
17 20
     <?php if ($model->isAttributeRequired('currentPassword')): ?>
18 21
         <?php echo $form->field($model, 'currentPassword')->passwordInput(['maxlength' => 45, 'placeholder' => Yii::t('UserModule.views_account_delete', 'Enter your password to continue')])->label(false); ?>
19
-    <?php else: ?>
20
-        <?php echo $form->field($model, 'currentPassword')->hiddenInput()->label(false); ?>
22
+    <?php else {
23
+    : ?>
24
+        <?php echo $form->field($model, 'currentPassword')->hiddenInput()->label(false);
25
+}
26
+?>
21 27
     <?php endif; ?>
22 28
 
23 29
     <?php echo Html::submitButton(Yii::t('UserModule.views_account_delete', 'Delete account'), array('class' => 'btn btn-danger', 'data-ui-loader' => '')); ?>
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="<?php echo $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="<?php echo $user->getProfileImage()->getUrl(); ?>"
107
+                     src="<?php echo $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/space/widgets/header-.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,11 @@
 block discarded – undo
22 22
 				   data-footer='<button type="button" class="btn btn-primary" data-dismiss="modal"><?php echo Yii::t('SpaceModule.widgets_views_profileHeader', 'Close'); ?></button>'>
23 23
 					   <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]); ?>
24 24
 				</a>
25
-			<?php else : ?>
26
-				<?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]); ?>
25
+			<?php else {
26
+    : ?>
27
+				<?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]);
28
+}
29
+?>
27 30
 			<?php endif; ?>
28 31
 
29 32
 			<!-- check if the current user is the profile owner and can change the images -->
Please login to merge, or discard this patch.
views/space/membership/statusInvite.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,12 +7,15 @@
 block discarded – undo
7 7
         <div class="modal-header">
8 8
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
9 9
             <h4 class="modal-title" id="myModalLabel"><?php
10
-                if ($status == Membership::STATUS_INVITED)
11
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has been invited.');
12
-                if ($status == Membership::STATUS_MEMBER)
13
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has become a member.');
14
-                if (!$status)
15
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has not been invited.');
10
+                if ($status == Membership::STATUS_INVITED) {
11
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has been invited.');
12
+                }
13
+                if ($status == Membership::STATUS_MEMBER) {
14
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has become a member.');
15
+                }
16
+                if (!$status) {
17
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has not been invited.');
18
+                }
16 19
                 ?></h4>
17 20
         </div>
18 21
         <div class="modal-body text-center">
Please login to merge, or discard this patch.
views/widgets/leftNavigation.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,10 @@
 block discarded – undo
12 12
     <?php foreach ($this->context->getItemGroups() as $group) : ?>
13 13
 
14 14
         <?php $items = $this->context->getItems($group['id']); ?>
15
-        <?php if (count($items) == 0) continue; ?>
15
+        <?php if (count($items) == 0) {
16
+    continue;
17
+}
18
+?>
16 19
 
17 20
         <?php if ($group['label'] != "") : ?>
18 21
             <div class="panel-heading"><?php echo $group['label']; ?></div>
Please login to merge, or discard this patch.
views/widgets/dropdownNavigation.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,10 @@
 block discarded – undo
9 9
 <?php foreach ($this->context->getItemGroups() as $group) : ?>
10 10
 
11 11
     <?php $items = $this->context->getItems($group['id']); ?>
12
-    <?php if (count($items) == 0) continue; ?>
12
+    <?php if (count($items) == 0) {
13
+    continue;
14
+}
15
+?>
13 16
 
14 17
     <div class="btn-group dropdown-navigation">
15 18
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
Please login to merge, or discard this patch.