Completed
Pull Request — dev (#76)
by Sarah
02:56 queued 32s
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/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.
views/space/widgets/header.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -67,10 +67,10 @@  discard block
 block discarded – undo
67 67
                             class="fa fa-cloud-upload"></i></a>
68 68
                     <a id="banner-image-upload-edit-button"
69 69
                        style="<?php
70
-                       if (!$space->getProfileBannerImage()->hasImage()) {
71
-                           echo 'display: none;';
72
-                       }
73
-                       ?>"
70
+                        if (!$space->getProfileBannerImage()->hasImage()) {
71
+                            echo 'display: none;';
72
+                        }
73
+                        ?>"
74 74
                        href="<?php echo $space->createUrl('/space/manage/image/crop-banner'); ?>"
75 75
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
76 76
                             class="fa fa-edit"></i></a>
@@ -127,10 +127,10 @@  discard block
 block discarded – undo
127 127
                             class="fa fa-cloud-upload"></i></a>
128 128
                     <a id="profile-image-upload-edit-button"
129 129
                        style="<?php
130
-                       if (!$space->getProfileImage()->hasImage()) {
131
-                           echo 'display: none;';
132
-                       }
133
-                       ?>"
130
+                        if (!$space->getProfileImage()->hasImage()) {
131
+                            echo 'display: none;';
132
+                        }
133
+                        ?>"
134 134
                        href="<?php echo $space->createUrl('/space/manage/image/crop'); ?>"
135 135
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
136 136
                             class="fa fa-edit"></i></a>
Please login to merge, or discard this patch.
views/space/widgets/header-.php 1 patch
Indentation   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@  discard block
 block discarded – undo
4 4
 use yii\helpers\Url;
5 5
 use yii\helpers\Html;
6 6
 if ($space->isAdmin()) {
7
-	$this->registerJsFile('@web/resources/space/spaceHeaderImageUpload.js');
8
-	$this->registerJsVar('profileImageUploaderUrl', $space->createUrl('/space/manage/image/upload'));
9
-	$this->registerJsVar('profileHeaderUploaderUrl', $space->createUrl('/space/manage/image/banner-upload'));
7
+    $this->registerJsFile('@web/resources/space/spaceHeaderImageUpload.js');
8
+    $this->registerJsVar('profileImageUploaderUrl', $space->createUrl('/space/manage/image/upload'));
9
+    $this->registerJsVar('profileHeaderUploaderUrl', $space->createUrl('/space/manage/image/banner-upload'));
10 10
 }
11 11
 ?>
12 12
 
@@ -47,28 +47,28 @@  discard block
 block discarded – undo
47 47
 							class="fa fa-cloud-upload"></i></a>
48 48
 					<a id="profile-image-upload-edit-button"
49 49
 					   style="<?php
50
-					   if (!$space->getProfileImage()->hasImage()) {
51
-						   echo 'display: none;';
52
-					   }
53
-					   ?>"
50
+                        if (!$space->getProfileImage()->hasImage()) {
51
+                            echo 'display: none;';
52
+                        }
53
+                        ?>"
54 54
 					   href="<?php echo $space->createUrl('/space/manage/image/crop'); ?>"
55 55
 					   class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
56 56
 							class="fa fa-edit"></i></a>
57 57
 						<?php
58
-						echo humhub\widgets\ModalConfirm::widget(array(
59
-							'uniqueID' => 'modal_profileimagedelete',
60
-							'linkOutput' => 'a',
61
-							'title' => Yii::t('SpaceModule.widgets_views_deleteImage', '<strong>Confirm</strong> image deleting'),
62
-							'message' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Do you really want to delete your profile image?'),
63
-							'buttonTrue' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Delete'),
64
-							'buttonFalse' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Cancel'),
65
-							'linkContent' => '<i class="fa fa-times"></i>',
66
-							'cssClass' => 'btn btn-danger btn-sm',
67
-							'style' => $space->getProfileImage()->hasImage() ? '' : 'display: none;',
68
-							'linkHref' => $space->createUrl("/space/manage/image/delete", array('type' => 'profile')),
69
-							'confirmJS' => 'function(jsonResp) { resetProfileImage(jsonResp); }'
70
-						));
71
-						?>
58
+                        echo humhub\widgets\ModalConfirm::widget(array(
59
+                            'uniqueID' => 'modal_profileimagedelete',
60
+                            'linkOutput' => 'a',
61
+                            'title' => Yii::t('SpaceModule.widgets_views_deleteImage', '<strong>Confirm</strong> image deleting'),
62
+                            'message' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Do you really want to delete your profile image?'),
63
+                            'buttonTrue' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Delete'),
64
+                            'buttonFalse' => Yii::t('SpaceModule.widgets_views_deleteImage', 'Cancel'),
65
+                            'linkContent' => '<i class="fa fa-times"></i>',
66
+                            'cssClass' => 'btn btn-danger btn-sm',
67
+                            'style' => $space->getProfileImage()->hasImage() ? '' : 'display: none;',
68
+                            'linkHref' => $space->createUrl("/space/manage/image/delete", array('type' => 'profile')),
69
+                            'confirmJS' => 'function(jsonResp) { resetProfileImage(jsonResp); }'
70
+                        ));
71
+                        ?>
72 72
 				</div>
73 73
 			<?php endif; ?>
74 74
 
@@ -97,22 +97,22 @@  discard block
 block discarded – undo
97 97
 			</div>
98 98
 					<div  class="row no-margin p-v-sm b-b">
99 99
 						<?php
100
-						echo humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
101
-								[\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
102
-								[\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
103
-								[\humhub\modules\space\widgets\FollowButton::className(), [
104
-										'space' => $space,
105
-										'followOptions' => ['class' => 'btn btn-primary'],
106
-										'unfollowOptions' => ['class' => 'btn btn-info']],
107
-									['sortOrder' => 30]]
108
-						]]);
109
-						?>
100
+                        echo humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
101
+                                [\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
102
+                                [\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
103
+                                [\humhub\modules\space\widgets\FollowButton::className(), [
104
+                                        'space' => $space,
105
+                                        'followOptions' => ['class' => 'btn btn-primary'],
106
+                                        'unfollowOptions' => ['class' => 'btn btn-info']],
107
+                                    ['sortOrder' => 30]]
108
+                        ]]);
109
+                        ?>
110 110
 						<?=
111
-						humhub\modules\space\widgets\HeaderControlsMenu::widget([
112
-							'space' => $space,
113
-							'template' => '@humhub/widgets/views/dropdownNavigation'
114
-						]);
115
-						?>
111
+                        humhub\modules\space\widgets\HeaderControlsMenu::widget([
112
+                            'space' => $space,
113
+                            'template' => '@humhub/widgets/views/dropdownNavigation'
114
+                        ]);
115
+                        ?>
116 116
 					</div>
117 117
 
118 118
 
@@ -129,15 +129,15 @@  discard block
 block discarded – undo
129 129
 				</form>
130 130
 
131 131
 				<?php
132
-				// set standard padding for banner progressbar
133
-				$padding = '90px 350px';
132
+                // set standard padding for banner progressbar
133
+                $padding = '90px 350px';
134 134
 
135
-				// if the default banner image is displaying
136
-				if (!$space->getProfileBannerImage()->hasImage()) {
137
-					// change padding to the lower image height
138
-					$padding = '50px 350px';
139
-				}
140
-				?>
135
+                // if the default banner image is displaying
136
+                if (!$space->getProfileBannerImage()->hasImage()) {
137
+                    // change padding to the lower image height
138
+                    $padding = '50px 350px';
139
+                }
140
+                ?>
141 141
 
142 142
 				<div class="image-upload-loader" id="banner-image-upload-loader" style="padding: <?php echo $padding ?>;">
143 143
 					<div class="progress image-upload-progess-bar" id="banner-image-upload-bar">
@@ -155,29 +155,29 @@  discard block
 block discarded – undo
155 155
 						<i class="fa fa-cloud-upload"></i>
156 156
 					</a>
157 157
 					<a id="banner-image-upload-edit-button" style="<?php
158
-					   if (!$space->getProfileBannerImage()->hasImage()) {
159
-						   echo 'display: none;';
160
-					   }
161
-					   ?>"
158
+                        if (!$space->getProfileBannerImage()->hasImage()) {
159
+                            echo 'display: none;';
160
+                        }
161
+                        ?>"
162 162
 					   href="<?php echo $space->createUrl('/space/manage/image/crop-banner'); ?>"
163 163
 					   class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static">
164 164
 					   <i class="fa fa-edit"></i>
165 165
 					</a>
166 166
 						<?php
167
-						echo humhub\widgets\ModalConfirm::widget(array(
168
-							'uniqueID' => 'modal_bannerimagedelete',
169
-							'linkOutput' => 'a',
170
-							'title' => Yii::t('SpaceModule.widgets_views_deleteBanner', '<strong>Confirm</strong> image deleting'),
171
-							'message' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Do you really want to delete your title image?'),
172
-							'buttonTrue' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Delete'),
173
-							'buttonFalse' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Cancel'),
174
-							'linkContent' => '<i class="fa fa-times"></i>',
175
-							'cssClass' => 'btn btn-danger btn-sm',
176
-							'style' => $space->getProfileBannerImage()->hasImage() ? '' : 'display: none;',
177
-							'linkHref' => $space->createUrl("/space/manage/image/delete", ['type' => 'banner']),
178
-							'confirmJS' => 'function(jsonResp) { resetProfileImage(jsonResp); }'
179
-						));
180
-						?>
167
+                        echo humhub\widgets\ModalConfirm::widget(array(
168
+                            'uniqueID' => 'modal_bannerimagedelete',
169
+                            'linkOutput' => 'a',
170
+                            'title' => Yii::t('SpaceModule.widgets_views_deleteBanner', '<strong>Confirm</strong> image deleting'),
171
+                            'message' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Do you really want to delete your title image?'),
172
+                            'buttonTrue' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Delete'),
173
+                            'buttonFalse' => Yii::t('SpaceModule.widgets_views_deleteBanner', 'Cancel'),
174
+                            'linkContent' => '<i class="fa fa-times"></i>',
175
+                            'cssClass' => 'btn btn-danger btn-sm',
176
+                            'style' => $space->getProfileBannerImage()->hasImage() ? '' : 'display: none;',
177
+                            'linkHref' => $space->createUrl("/space/manage/image/delete", ['type' => 'banner']),
178
+                            'confirmJS' => 'function(jsonResp) { resetProfileImage(jsonResp); }'
179
+                        ));
180
+                        ?>
181 181
 				</div>
182 182
 
183 183
 			<?php } ?>
@@ -201,22 +201,22 @@  discard block
 block discarded – undo
201 201
 
202 202
 					<div class="controls controls-header pull-right">
203 203
 						<?php
204
-						echo humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
205
-								[\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
206
-								[\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
207
-								[\humhub\modules\space\widgets\FollowButton::className(), [
208
-										'space' => $space,
209
-										'followOptions' => ['class' => 'btn btn-primary'],
210
-										'unfollowOptions' => ['class' => 'btn btn-info']],
211
-									['sortOrder' => 30]]
212
-						]]);
213
-						?>
204
+                        echo humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
205
+                                [\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
206
+                                [\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
207
+                                [\humhub\modules\space\widgets\FollowButton::className(), [
208
+                                        'space' => $space,
209
+                                        'followOptions' => ['class' => 'btn btn-primary'],
210
+                                        'unfollowOptions' => ['class' => 'btn btn-info']],
211
+                                    ['sortOrder' => 30]]
212
+                        ]]);
213
+                        ?>
214 214
 						<?=
215
-						humhub\modules\space\widgets\HeaderControlsMenu::widget([
216
-							'space' => $space,
217
-							'template' => '@humhub/widgets/views/dropdownNavigation'
218
-						]);
219
-						?>
215
+                        humhub\modules\space\widgets\HeaderControlsMenu::widget([
216
+                            'space' => $space,
217
+                            'template' => '@humhub/widgets/views/dropdownNavigation'
218
+                        ]);
219
+                        ?>
220 220
 					</div>
221 221
 				</div>
222 222
 			</div>
Please login to merge, or discard this patch.
views/widgets/reorderContent.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
 			var sortable = ui.item.closest('.<?php echo $containerClassName; ?>');
20 20
 			var items = sortable.find('.<?php echo $sortableItemClassName; ?>');
21 21
 			<?php foreach($additionalAjaxParams as $name => $value) {
22
-			if($name != null && $name != '' && $value != null && $value != '') { ?>
22
+            if($name != null && $name != '' && $value != null && $value != '') { ?>
23 23
 			data.<?php echo $name ?> = '<?php echo $value ?>';	
24 24
 			<?php } } ?>
25 25
 			data.items = [];
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/post/widgets/form.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?= humhub\widgets\RichtextField::widget([
2
-   'id' =>  'contentForm_message',
3
-   'placeholder' => Yii::t("PostModule.widgets_views_postForm", "What's on your mind?"),
2
+    'id' =>  'contentForm_message',
3
+    'placeholder' => Yii::t("PostModule.widgets_views_postForm", "What's on your mind?"),
4 4
     'name' => 'message',
5 5
     'disabled' => (property_exists(Yii::$app->controller, 'contentContainer') && Yii::$app->controller->contentContainer->isArchived()),
6 6
     'disabledText' => Yii::t("PostModule.widgets_views_postForm", "This space is archived."),
Please login to merge, or discard this patch.