Completed
Push — master ( 5ff231...f0359e )
by Sarah
02:42
created
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/admin/setting/design.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@
 block discarded – undo
40 40
 
41 41
             <img class="img-rounded" id="logo-image"
42 42
                  src="<?php
43
-                 if ($logo->hasImage()) {
44
-                     echo $logo->getUrl();
45
-                 }
46
-                 ?>"
43
+                    if ($logo->hasImage()) {
44
+                        echo $logo->getUrl();
45
+                    }
46
+                    ?>"
47 47
                  data-src="holder.js/140x140"
48 48
                  alt="<?php echo Yii::t('AdminModule.views_setting_index', "You're using no logo at the moment. Upload your logo now."); ?>"
49 49
                  style="max-height: 40px;"/>
Please login to merge, or discard this patch.
views/layouts/main.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -83,10 +83,10 @@
 block discarded – undo
83 83
 		<ul class="nav nav-sm navbar-tool pull-right">
84 84
 			<?php echo \humhub\widgets\TopMenuRightStack::widget(); ?>
85 85
 			<?php
86
-			echo \humhub\widgets\NotificationArea::widget(['widgets' => [
87
-				[\humhub\modules\notification\widgets\Overview::className(), [], ['sortOrder' => 10]],
88
-			]]);
89
-			?>
86
+            echo \humhub\widgets\NotificationArea::widget(['widgets' => [
87
+                [\humhub\modules\notification\widgets\Overview::className(), [], ['sortOrder' => 10]],
88
+            ]]);
89
+            ?>
90 90
 
91 91
 					<?php echo \humhub\modules\space\widgets\Chooser::widget(); ?>
92 92
 		</ul>
Please login to merge, or discard this patch.
views/search/search/index.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,11 +32,11 @@
 block discarded – undo
32 32
 								<?php echo Yii::t('SearchModule.views_search_index', 'Search only in certain spaces:'); ?>
33 33
 								<?php echo Html::textInput('limitSpaceGuids', $limitSpaceGuids, array('placeholder' => 'Specify space', 'style' => 'width:200px', 'id' => 'space_filter')); ?>
34 34
 								<?php
35
-								echo humhub\modules\space\widgets\Picker::widget([
36
-									'inputId' => 'space_filter',
37
-									'value' => $limitSpaceGuids
38
-								]);
39
-								?>
35
+                                echo humhub\modules\space\widgets\Picker::widget([
36
+                                    'inputId' => 'space_filter',
37
+                                    'value' => $limitSpaceGuids
38
+                                ]);
39
+                                ?>
40 40
 							</div>
41 41
 							<br>
42 42
 							<?php echo Html::endForm(); ?>
Please login to merge, or discard this patch.
img/dynamic.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -1,55 +1,55 @@
 block discarded – undo
1 1
 <?php return array (
2
-  'components' => 
3
-  array (
2
+    'components' => 
3
+    array (
4 4
     'db' => 
5 5
     array (
6
-      'class' => 'yii\\db\\Connection',
7
-      'dsn' => 'mysql:host=127.0.0.1;dbname=installer',
8
-      'username' => 'root',
9
-      'password' => 'root',
10
-      'charset' => 'utf8',
6
+        'class' => 'yii\\db\\Connection',
7
+        'dsn' => 'mysql:host=127.0.0.1;dbname=installer',
8
+        'username' => 'root',
9
+        'password' => 'root',
10
+        'charset' => 'utf8',
11 11
     ),
12 12
     'user' => 
13 13
     array (
14 14
     ),
15 15
     'mailer' => 
16 16
     array (
17
-      'transport' => 
18
-      array (
17
+        'transport' => 
18
+        array (
19 19
         'class' => 'Swift_MailTransport',
20
-      ),
20
+        ),
21 21
     ),
22 22
     'view' => 
23 23
     array (
24
-      'theme' => 
25
-      array (
24
+        'theme' => 
25
+        array (
26 26
         'name' => 'HumHub',
27
-      ),
27
+        ),
28 28
     ),
29 29
     'formatter' => 
30 30
     array (
31
-      'defaultTimeZone' => 'Europe/Berlin',
31
+        'defaultTimeZone' => 'Europe/Berlin',
32 32
     ),
33 33
     'formatterApp' => 
34 34
     array (
35
-      'defaultTimeZone' => 'Europe/Berlin',
36
-      'timeZone' => 'Europe/Berlin',
35
+        'defaultTimeZone' => 'Europe/Berlin',
36
+        'timeZone' => 'Europe/Berlin',
37
+    ),
37 38
     ),
38
-  ),
39
-  'params' => 
40
-  array (
39
+    'params' => 
40
+    array (
41 41
     'installer' => 
42 42
     array (
43
-      'db' => 
44
-      array (
43
+        'db' => 
44
+        array (
45 45
         'installer_hostname' => '127.0.0.1',
46 46
         'installer_database' => 'installer',
47
-      ),
47
+        ),
48 48
     ),
49 49
     'config_created_at' => 1440430541,
50 50
     'installed' => true,
51
-  ),
52
-  'name' => 'Installer',
53
-  'language' => 'de',
54
-  'timeZone' => 'Europe/Berlin',
51
+    ),
52
+    'name' => 'Installer',
53
+    'language' => 'de',
54
+    'timeZone' => 'Europe/Berlin',
55 55
 ); ?>
Please login to merge, or discard this patch.
views/user/account/_userSettingsLayout.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.