Completed
Push — master ( f0f3ac...801072 )
by Sarah
05:52 queued 03:24
created
views/mail/mail/index.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 use yii\helpers\Html;
3 3
 if ($messageId != "") {
4
-	$this->registerJs('loadMessage(' . Html::encode($messageId) . ');');
4
+    $this->registerJs('loadMessage(' . Html::encode($messageId) . ');');
5 5
 }
6 6
 ?>
7 7
 	<div class="row">
Please login to merge, or discard this patch.
views/dashboard/dashboard/index_guest.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 <div class="row">
2 2
 	<div class="col-md-8">
3 3
 		<?php
4
-		echo \humhub\modules\content\widgets\Stream::widget([
5
-			'streamAction' => '//dashboard/dashboard/stream',
6
-			'showFilters' => false,
7
-			'messageStreamEmpty' => Yii::t('DashboardModule.views_dashboard_index_guest', '<b>No public contents to display found!</b>'),
8
-		]);
9
-		?>
4
+        echo \humhub\modules\content\widgets\Stream::widget([
5
+            'streamAction' => '//dashboard/dashboard/stream',
6
+            'showFilters' => false,
7
+            'messageStreamEmpty' => Yii::t('DashboardModule.views_dashboard_index_guest', '<b>No public contents to display found!</b>'),
8
+        ]);
9
+        ?>
10 10
 	</div>
11 11
 	<div class="col-md-4">
12 12
 		<?php
13
-		echo \humhub\modules\dashboard\widgets\Sidebar::widget(['widgets' => [
14
-			[\humhub\modules\directory\widgets\NewMembers::className(), ['showMoreButton' => true], ['sortOrder' => 300]],
15
-			[\humhub\modules\directory\widgets\NewSpaces::className(), ['showMoreButton' => true], ['sortOrder' => 400]],
16
-		]]);
17
-		?>
13
+        echo \humhub\modules\dashboard\widgets\Sidebar::widget(['widgets' => [
14
+            [\humhub\modules\directory\widgets\NewMembers::className(), ['showMoreButton' => true], ['sortOrder' => 300]],
15
+            [\humhub\modules\directory\widgets\NewSpaces::className(), ['showMoreButton' => true], ['sortOrder' => 400]],
16
+        ]]);
17
+        ?>
18 18
 	</div>
19 19
 </div>
Please login to merge, or discard this patch.
views/dashboard/dashboard/index.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1 1
 <div class="row">
2 2
 	<div class="col-sm-8">
3 3
 		<?php
4
-		if ($showProfilePostForm) {
5
-			echo \humhub\modules\post\widgets\Form::widget(['contentContainer' => \Yii::$app->user->getIdentity()]);
6
-		}
7
-		?>
4
+        if ($showProfilePostForm) {
5
+            echo \humhub\modules\post\widgets\Form::widget(['contentContainer' => \Yii::$app->user->getIdentity()]);
6
+        }
7
+        ?>
8 8
 		<?php
9
-		echo \humhub\modules\content\widgets\Stream::widget([
10
-			'streamAction' => '//dashboard/dashboard/stream',
11
-			'showFilters' => true,
12
-			'messageStreamEmpty' => Yii::t('DashboardModule.views_dashboard_index', '<b>Your dashboard is empty!</b><br>Post something on your profile or join some spaces!'),
13
-		]);
14
-		?>
9
+        echo \humhub\modules\content\widgets\Stream::widget([
10
+            'streamAction' => '//dashboard/dashboard/stream',
11
+            'showFilters' => true,
12
+            'messageStreamEmpty' => Yii::t('DashboardModule.views_dashboard_index', '<b>Your dashboard is empty!</b><br>Post something on your profile or join some spaces!'),
13
+        ]);
14
+        ?>
15 15
 	</div>
16 16
 	<div class="col-sm-4">
17 17
 		<?php
18
-		echo \humhub\modules\dashboard\widgets\Sidebar::widget(['widgets' => [
19
-			[\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/dashboard/dashboard/stream'], ['sortOrder' => 150]]
20
-		]]);
21
-		?>
18
+        echo \humhub\modules\dashboard\widgets\Sidebar::widget(['widgets' => [
19
+            [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/dashboard/dashboard/stream'], ['sortOrder' => 150]]
20
+        ]]);
21
+        ?>
22 22
 	</div>
23 23
 </div>
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/profile/_layout.php 1 patch
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.
views/user/widgets/profileHeader.php 1 patch
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.
views/space/space/_layout-x.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@
 block discarded – undo
21 21
 				</nav>
22 22
 			</div>
23 23
 			<?php
24
-			echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
25
-				[\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]],
26
-				[\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]],
27
-				[\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]]
28
-			]]);
29
-			?>
24
+            echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
25
+                [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]],
26
+                [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]],
27
+                [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]]
28
+            ]]);
29
+            ?>
30 30
 		</div>
31 31
 	</div>
32 32
 	<div class="col-sm-8">
Please login to merge, or discard this patch.
views/space/space/_layout.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -23,12 +23,12 @@
 block discarded – undo
23 23
 			</div>
24 24
 			<div class="col-md-3 layout-sidebar-container">
25 25
 				<?php
26
-				echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
27
-						[\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]],
28
-						[\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]],
29
-						[\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]]
30
-				]]);
31
-				?>
26
+                echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [
27
+                        [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]],
28
+                        [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]],
29
+                        [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]]
30
+                ]]);
31
+                ?>
32 32
 			</div>
33 33
 		<?php endif; ?>
34 34
 	</div>
Please login to merge, or discard this patch.
views/space/widgets/spaceChooser.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -12,19 +12,19 @@  discard block
 block discarded – undo
12 12
 		<!-- start: Show space image and name if chosen -->
13 13
 		<?php if ($currentSpace) { ?>
14 14
 			<?php echo \humhub\modules\space\widgets\Image::widget([
15
-				'space' => $currentSpace,
16
-				'width' => 24,
17
-				'htmlOptions' => [
18
-					'class' => 'current-space-image',
19
-				]
20
-			]); ?>
15
+                'space' => $currentSpace,
16
+                'width' => 24,
17
+                'htmlOptions' => [
18
+                    'class' => 'current-space-image',
19
+                ]
20
+            ]); ?>
21 21
 		<?php } ?>
22 22
 
23 23
 		<?php
24
-		if (!$currentSpace) {
25
-			echo '<i class="material-icons">assignment_turned_in</i>';
26
-		}
27
-		?>
24
+        if (!$currentSpace) {
25
+            echo '<i class="material-icons">assignment_turned_in</i>';
26
+        }
27
+        ?>
28 28
 		<!-- end: Show space image and name if chosen -->
29 29
 	</a>
30 30
 	<ul class="dropdown-menu" id="space-menu-dropdownXXX">
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
 							<div class="media">
53 53
 								<!-- Show space image -->
54 54
 								<?php echo \humhub\modules\space\widgets\Image::widget([
55
-									'space' => $membership->space,
56
-									'width' => 24,
57
-									'htmlOptions' => [
58
-										'class' => 'pull-left',
59
-									]
60
-								]); ?>
55
+                                    'space' => $membership->space,
56
+                                    'width' => 24,
57
+                                    'htmlOptions' => [
58
+                                        'class' => 'pull-left',
59
+                                    ]
60
+                                ]); ?>
61 61
 								<div class="media-body">
62 62
 									<strong><?php echo Html::encode($membership->space->name); ?></strong>
63 63
 									<?php if ($newItems != 0): ?>
Please login to merge, or discard this patch.