Completed
Push — master ( f0f3ac...801072 )
by Sarah
05:52 queued 03:24
created
views/user/account/editModules.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,8 +28,11 @@
 block discarded – undo
28 28
                     <?php if ($module->getContentContainerConfigUrl($user)) : ?>
29 29
                         <?php echo Html::a(Yii::t('UserModule.views_account_editModules', 'Configure'), $module->getContentContainerConfigUrl($user), array('class' => 'btn btn-sm')); ?>
30 30
                     <?php endif; ?>
31
-                <?php else: ?>
32
-                    <?php echo Html::a(Yii::t('UserModule.views_account_editModules', 'Enable'), Url::to(['/user/account/enable-module', 'moduleId' => $module->id]), array('data-method' => 'POST', 'class' => 'btn btn-sm btn-primary', 'data-ui-loader' => '')); ?>
31
+                <?php else {
32
+    : ?>
33
+                    <?php echo Html::a(Yii::t('UserModule.views_account_editModules', 'Enable'), Url::to(['/user/account/enable-module', 'moduleId' => $module->id]), array('data-method' => 'POST', 'class' => 'btn btn-sm btn-primary', 'data-ui-loader' => ''));
34
+}
35
+?>
33 36
                 <?php endif; ?>
34 37
             </div>
35 38
         </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/editSettings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
     <?php echo $form->field($model, 'tags'); ?>
12 12
 
13
-    <?php if(count($languages) > 1) : ?>
13
+    <?php if (count($languages) > 1) : ?>
14 14
         <?php echo $form->field($model, 'language')->dropdownList($languages); ?>
15 15
     <?php endif; ?>
16 16
 
Please login to merge, or discard this patch.
views/user/account/_userProfileLayout.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php 
2
- humhub\assets\TabbedFormAsset::register($this);
2
+    humhub\assets\TabbedFormAsset::register($this);
3 3
 ?>
4 4
 
5 5
 <div class="panel-heading">
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/profile/home.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,10 +5,8 @@
 block discarded – undo
5 5
     'contentContainer' => $user,
6 6
     'streamAction' => '//user/profile/stream',
7 7
     'messageStreamEmpty' => ($user->permissionManager->can(new \humhub\modules\post\permissions\CreatePost())) ?
8
-            Yii::t('UserModule.views_profile_index', '<b>Your profile stream is still empty</b><br>Get started and post something...') :
9
-            Yii::t('UserModule.views_profile_index', '<b>This profile stream is still empty!</b>'),
8
+            Yii::t('UserModule.views_profile_index', '<b>Your profile stream is still empty</b><br>Get started and post something...') : Yii::t('UserModule.views_profile_index', '<b>This profile stream is still empty!</b>'),
10 9
     'messageStreamEmptyCss' => ($user->permissionManager->can(new \humhub\modules\post\permissions\CreatePost())) ?
11
-            'placeholder-empty-stream' :
12
-            '',
10
+            'placeholder-empty-stream' : '',
13 11
 ));
14 12
 ?>
Please login to merge, or discard this patch.
views/user/profile/_layout.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -21,16 +21,16 @@
 block discarded – undo
21 21
 			</div>
22 22
 			<div class="col-md-3 layout-sidebar-container">
23 23
 				<?php
24
-				echo \humhub\modules\user\widgets\ProfileSidebar::widget([
25
-					'user' => $this->context->user,
26
-					'widgets' => [
27
-						[\humhub\modules\user\widgets\UserTags::className(), ['user' => $this->context->user], ['sortOrder' => 10]],
28
-						[\humhub\modules\user\widgets\UserSpaces::className(), ['user' => $this->context->user], ['sortOrder' => 20]],
29
-						[\humhub\modules\friendship\widgets\FriendsPanel::className(), ['user' => $this->context->user], ['sortOrder' => 30]],
30
-						[\humhub\modules\user\widgets\UserFollower::className(), ['user' => $this->context->user], ['sortOrder' => 40]],
31
-					]
32
-				]);
33
-				?>
24
+                echo \humhub\modules\user\widgets\ProfileSidebar::widget([
25
+                    'user' => $this->context->user,
26
+                    'widgets' => [
27
+                        [\humhub\modules\user\widgets\UserTags::className(), ['user' => $this->context->user], ['sortOrder' => 10]],
28
+                        [\humhub\modules\user\widgets\UserSpaces::className(), ['user' => $this->context->user], ['sortOrder' => 20]],
29
+                        [\humhub\modules\friendship\widgets\FriendsPanel::className(), ['user' => $this->context->user], ['sortOrder' => 30]],
30
+                        [\humhub\modules\user\widgets\UserFollower::className(), ['user' => $this->context->user], ['sortOrder' => 40]],
31
+                    ]
32
+                ]);
33
+                ?>
34 34
 			</div>
35 35
 		<?php endif; ?>
36 36
 	</div>
Please login to merge, or discard this 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/user/widgets/profileHeader.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -66,10 +66,10 @@  discard block
 block discarded – undo
66 66
                             class="fa fa-cloud-upload"></i></a>
67 67
                     <a id="banner-image-upload-edit-button"
68 68
                        style="<?php
69
-                       if (!$user->getProfileBannerImage()->hasImage()) {
70
-                           echo 'display: none;';
71
-                       }
72
-                       ?>"
69
+                        if (!$user->getProfileBannerImage()->hasImage()) {
70
+                            echo 'display: none;';
71
+                        }
72
+                        ?>"
73 73
                        href="<?php echo Url::to(['/user/account/crop-banner-image', 'userGuid' => $user->guid]); ?>"
74 74
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
75 75
                             class="fa fa-edit"></i></a>
@@ -128,10 +128,10 @@  discard block
 block discarded – undo
128 128
                             class="fa fa-cloud-upload"></i></a>
129 129
                     <a id="profile-image-upload-edit-button"
130 130
                        style="<?php
131
-                       if (!$user->getProfileImage()->hasImage()) {
132
-                           echo 'display: none;';
133
-                       }
134
-                       ?>"
131
+                        if (!$user->getProfileImage()->hasImage()) {
132
+                            echo 'display: none;';
133
+                        }
134
+                        ?>"
135 135
                        href="<?php echo Url::to(['/user/account/crop-profile-image', 'userGuid' => $user->guid]); ?>"
136 136
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
137 137
                             class="fa fa-edit"></i></a>
Please login to merge, or discard this 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/user/widgets/accountTopMenu.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		<?php foreach ($this->context->getItems() as $item): ?>
18 18
 			<?php if ($item['label'] == '---'): ?>
19 19
 			<?php else: ?>
20
-				<li><a href="<?php echo $item['url']; ?>" class="waves"><?php echo $item['icon'] . ' ' .$item['label']; ?></a></li>
20
+				<li><a href="<?php echo $item['url']; ?>" class="waves"><?php echo $item['icon'] . ' ' . $item['label']; ?></a></li>
21 21
 			<?php endif; ?>
22 22
 		<?php endforeach; ?>
23 23
 <?php endif; ?>
24 24
\ No newline at end of file
Please login to merge, or discard this 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.