Completed
Push — master ( 5ff231...f0359e )
by Sarah
02:42
created
views/user/widgets/accountTopMenu.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,9 +5,12 @@  discard block
 block discarded – undo
5 5
 <?php if (Yii::$app->user->isGuest): ?>
6 6
 	<div style="margin-bottom: 0px; padding: 8px;"><a href="<?php echo Url::toRoute('/user/auth/login'); ?>" data-target="#globalModal" class="md-btn md-flat text-danger waves p" style="display: block;">Login</a></div>
7 7
 	<nav id="nav" ui-nav><ul class="nav">
8
-<?php else: ?>
8
+<?php else {
9
+    : ?>
9 10
 	<a class="waves" style="margin-bottom: 0px; padding: 8px 16px; display: block; height: 56px; position: relative; border-bottom: 1px solid #dddee0;">
10
-		<img src="<?php echo Yii::$app->user->getIdentity()->getProfileImage()->getUrl(); ?>" class="pull-left w-40 m-r img-rounded">
11
+		<img src="<?php echo Yii::$app->user->getIdentity()->getProfileImage()->getUrl();
12
+}
13
+?>" class="pull-left w-40 m-r img-rounded">
11 14
 		<div class="clear">
12 15
 			<span class="font-bold block"><?php echo Html::encode(Yii::$app->user->getIdentity()->displayName); ?></span>
13 16
 			<span class="clear text-ellipsis text-xs"><?php echo Html::encode(Yii::$app->user->getIdentity()->profile->title); ?></span>
@@ -16,8 +19,11 @@  discard block
 block discarded – undo
16 19
 	<nav id="nav" ui-nav><ul class="nav">
17 20
 		<?php foreach ($this->context->getItems() as $item): ?>
18 21
 			<?php if ($item['label'] == '---'): ?>
19
-			<?php else: ?>
20
-				<li><a href="<?php echo $item['url']; ?>" class="waves"><?php echo $item['icon'] . ' ' .$item['label']; ?></a></li>
22
+			<?php else {
23
+    : ?>
24
+				<li><a href="<?php echo $item['url'];
25
+}
26
+?>" class="waves"><?php echo $item['icon'] . ' ' .$item['label']; ?></a></li>
21 27
 			<?php endif; ?>
22 28
 		<?php endforeach; ?>
23 29
 <?php endif; ?>
24 30
\ No newline at end of file
Please login to merge, or discard this patch.
views/user/layouts/main.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,8 +69,11 @@
 block discarded – undo
69 69
         <!-- start: show content (and check, if exists a sublayout -->
70 70
         <?php if (isset($this->subLayout) && $this->subLayout != "") : ?>
71 71
             <?php echo $this->renderPartial($this->subLayout, array('content' => $content)); ?>
72
-        <?php else: ?>
73
-            <?php echo $content; ?>
72
+        <?php else {
73
+    : ?>
74
+            <?php echo $content;
75
+}
76
+?>
74 77
         <?php endif; ?>
75 78
         <!-- end: show content -->
76 79
 
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
@@ -17,9 +17,12 @@
 block discarded – undo
17 17
 			<div class="col-md-10 layout-content-container">
18 18
 				<?php echo $content; ?>
19 19
 			</div>
20
-		<?php else: ?>
20
+		<?php else {
21
+    : ?>
21 22
 			<div class="col-md-7 layout-content-container">
22
-				<?php echo $content; ?>
23
+				<?php echo $content;
24
+}
25
+?>
23 26
 			</div>
24 27
 			<div class="col-md-3 layout-sidebar-container">
25 28
 				<?php
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
@@ -102,8 +102,11 @@
 block discarded – undo
102 102
                    data-footer='<button type="button" class="btn btn-primary" data-dismiss="modal"><?php echo Yii::t('SpaceModule.widgets_views_profileHeader', 'Close'); ?></button>'>
103 103
                        <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?>
104 104
                 </a>
105
-            <?php else : ?>
106
-                <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?>
105
+            <?php else {
106
+    : ?>
107
+                <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]);
108
+}
109
+?>
107 110
             <?php endif; ?>
108 111
 
109 112
             <!-- check if the current user is the profile owner and can change the images -->
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/directory/directory/members.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,8 +9,11 @@
 block discarded – undo
9 9
     <div class="panel-heading">
10 10
         <?php if ($group === null) : ?>
11 11
             <?php echo Yii::t('DirectoryModule.views_directory_members', '<strong>Member</strong> directory'); ?>
12
-        <?php else: ?>
13
-            <?php echo Yii::t('DirectoryModule.views_directory_members', '<strong>Group</strong> members - {group}', ['{group}' => $group->name]); ?>
12
+        <?php else {
13
+    : ?>
14
+            <?php echo Yii::t('DirectoryModule.views_directory_members', '<strong>Group</strong> members - {group}', ['{group}' => $group->name]);
15
+}
16
+?>
14 17
         <?php endif; ?>
15 18
     </div>
16 19
 
Please login to merge, or discard this patch.
views/content/widgets/stickLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,8 +2,11 @@
 block discarded – undo
2 2
     <?php if ($isSticked): ?>
3 3
         <a href="#" onClick="wallUnstick('<?php echo $unstickUrl; ?>');
4 4
                     return false;"><i class="fa fa-arrow-up"></i> <?php echo Yii::t('ContentModule.widgets_views_stickLink', 'Unstick'); ?></a>
5
-       <?php else: ?>
6
-        <a href="#" onClick="wallStick('<?php echo $stickUrl; ?>');
5
+       <?php else {
6
+    : ?>
7
+        <a href="#" onClick="wallStick('<?php echo $stickUrl;
8
+}
9
+?>');
7 10
                     return false;"><i class="fa fa-arrow-up"></i> <?php echo Yii::t('ContentModule.widgets_views_stickLink', 'Stick'); ?></a>
8 11
     <?php endif; ?>
9 12
 </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
@@ -10,8 +10,11 @@
 block discarded – undo
10 10
     <?php if ($object->content->isArchived()): ?>
11 11
         <a href="#" onClick="wallUnarchive('<?php echo $id; ?>');
12 12
                 return false;"><i class="fa fa-archive"></i> <?php echo Yii::t('ContentModule.widgets_views_archiveLink', 'Unarchive'); ?></a>
13
-       <?php else: ?>
14
-        <a href="#" onClick="wallArchive('<?php echo $id; ?>');
13
+       <?php else {
14
+    : ?>
15
+        <a href="#" onClick="wallArchive('<?php echo $id;
16
+}
17
+?>');
15 18
                 return false;"><i class="fa fa-archive"></i> <?php echo Yii::t('ContentModule.widgets_views_archiveLink', 'Move to archive'); ?></a>
16 19
     <?php endif; ?>
17 20
 </li>
Please login to merge, or discard this patch.