Completed
Pull Request — dev (#71)
by Sarah
02:19
created
views/space/widgets/header.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,11 @@
 block discarded – undo
99 99
                 <a data-ui-gallery="spaceHeader" href="<?= $space->profileImage->getUrl('_org'); ?>">
100 100
                        <?= \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?>
101 101
                 </a>
102
-            <?php else : ?>
103
-                <?= \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?>
102
+            <?php else {
103
+    : ?>
104
+                <?= \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]);
105
+}
106
+?>
104 107
             <?php endif; ?>
105 108
 
106 109
             <!-- check if the current user is the profile owner and can change the images -->
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -66,15 +66,15 @@  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 (!$space->getProfileBannerImage()->hasImage()) {
70
-                           echo 'display: none;';
71
-                       }
72
-                       ?>"
69
+                        if (!$space->getProfileBannerImage()->hasImage()) {
70
+                            echo 'display: none;';
71
+                        }
72
+                        ?>"
73 73
                        href="<?= $space->createUrl('/space/manage/image/crop-banner'); ?>"
74 74
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
75 75
                             class="fa fa-edit"></i></a>
76 76
                         <?=
77
-                           humhub\widgets\ModalConfirm::widget(array(
77
+                            humhub\widgets\ModalConfirm::widget(array(
78 78
                             'uniqueID' => 'modal_bannerimagedelete',
79 79
                             'linkOutput' => 'a',
80 80
                             'title' => Yii::t('SpaceModule.widgets_views_deleteBanner', '<strong>Confirm</strong> image deleting'),
@@ -125,15 +125,15 @@  discard block
 block discarded – undo
125 125
                             class="fa fa-cloud-upload"></i></a>
126 126
                     <a id="profile-image-upload-edit-button"
127 127
                        style="<?php
128
-                       if (!$space->getProfileImage()->hasImage()) {
129
-                           echo 'display: none;';
130
-                       }
131
-                       ?>"
128
+                        if (!$space->getProfileImage()->hasImage()) {
129
+                            echo 'display: none;';
130
+                        }
131
+                        ?>"
132 132
                        href="<?= $space->createUrl('/space/manage/image/crop'); ?>"
133 133
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
134 134
                             class="fa fa-edit"></i></a>
135 135
                         <?=
136
-                           humhub\widgets\ModalConfirm::widget(array(
136
+                            humhub\widgets\ModalConfirm::widget(array(
137 137
                             'uniqueID' => 'modal_profileimagedelete',
138 138
                             'linkOutput' => 'a',
139 139
                             'title' => Yii::t('SpaceModule.widgets_views_deleteImage', '<strong>Confirm</strong> image deleting'),
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 
193 193
                     <div class="controls controls-header pull-right">
194 194
                         <?=
195
-                           humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
195
+                            humhub\modules\space\widgets\HeaderControls::widget(['widgets' => [
196 196
                                 [\humhub\modules\space\widgets\InviteButton::className(), ['space' => $space], ['sortOrder' => 10]],
197 197
                                 [\humhub\modules\space\widgets\MembershipButton::className(), ['space' => $space], ['sortOrder' => 20]],
198 198
                                 [\humhub\modules\space\widgets\FollowButton::className(), [
Please login to merge, or discard this patch.
views/post/widgets/form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,4 +4,4 @@
 block discarded – undo
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."),
7
-]);?>
7
+]); ?>
Please login to merge, or discard this patch.
views/like/widgets/likeLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,14 +10,17 @@
 block discarded – undo
10 10
     <?php if (Yii::$app->user->isGuest): ?>
11 11
 
12 12
         <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', 'Like'), Yii::$app->user->loginUrl, ['data-target' => '#globalModal']); ?>
13
-    <?php else: ?>
13
+    <?php else {
14
+    : ?>
14 15
         <a href="#" data-action-click="like.toggleLike" data-action-url="<?php echo $likeUrl ?>" class="like likeAnchor" style="<?php echo (!$currentUserLiked) ? '' : 'display:none'?>">
15 16
             <?php echo Yii::t('LikeModule.widgets_views_likeLink', 'Like') ?>
16 17
         </a>
17 18
         <a href="#" data-action-click="like.toggleLike" data-action-url="<?php echo $unlikeUrl ?>" class="unlike likeAnchor" style="<?php echo ($currentUserLiked) ? '' : 'display:none'?>">
18 19
             <?php echo Yii::t('LikeModule.widgets_views_likeLink', 'Unlike') ?>
19 20
         </a>
20
-    <?php endif; ?>
21
+    <?php endif;
22
+}
23
+?>
21 24
 
22 25
     <?php if (count($likes) > 0) { ?>
23 26
         <!-- Create link to show all users, who liked this -->
Please login to merge, or discard this patch.
views/user/widgets/profileHeader.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
                        class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i
137 137
                             class="fa fa-edit"></i></a>
138 138
                         <?=
139
-                   \humhub\widgets\ModalConfirm::widget(array(
139
+                    \humhub\widgets\ModalConfirm::widget(array(
140 140
                             'uniqueID' => 'modal_profileimagedelete',
141 141
                             'linkOutput' => 'a',
142 142
                             'title' => Yii::t('UserModule.widgets_views_deleteImage', '<strong>Confirm</strong> image deleting'),
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 
202 202
                     <div class="controls controls-header pull-right">
203 203
                         <?=
204
-                 \humhub\modules\user\widgets\ProfileHeaderControls::widget(
204
+                    \humhub\modules\user\widgets\ProfileHeaderControls::widget(
205 205
                                 array(
206 206
                                     'user' => $user,
207 207
                                     'widgets' => array(
Please login to merge, or discard this patch.
views/search/search/index.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -109,16 +109,22 @@
 block discarded – undo
109 109
                                 <?= humhub\modules\stream\actions\Stream::renderEntry($result) ?>
110 110
                             <?php elseif ($result instanceof ContentContainerActiveRecord) : ?>
111 111
                                  <?= $result->getWallOut(); ?>
112
-                            <?php else: ?>
113
-                                No Output for Class <?= get_class($result); ?>
112
+                            <?php else {
113
+    : ?>
114
+                                No Output for Class <?= get_class($result);
115
+}
116
+?>
114 117
                             <?php endif; ?>
115 118
                         <?php endforeach; ?>
116
-                    <?php else: ?>
119
+                    <?php else {
120
+    : ?>
117 121
 
118 122
 
119 123
                         <div class="panel panel-default">
120 124
                             <div class="panel-body">
121
-                                <p><strong><?= Yii::t('SearchModule.views_search_index', 'Your search returned no matches.'); ?></strong></p>
125
+                                <p><strong><?= Yii::t('SearchModule.views_search_index', 'Your search returned no matches.');
126
+}
127
+?></strong></p>
122 128
                             </div>
123 129
                         </div>
124 130
                     <?php endif; ?>
Please login to merge, or discard this patch.
views/admin/group/members.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
     <div class="form-group">
14 14
         <div class="input-group select2-humhub-append">
15 15
             <?=
16
-               humhub\modules\user\widgets\UserPickerField::widget([
16
+                humhub\modules\user\widgets\UserPickerField::widget([
17 17
                 'model' => $addGroupMemberForm,
18 18
                 'attribute' => 'userGuids',
19 19
                 'url' => Url::to(['/admin/group/new-member-search', 'id' => $group->id]),
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
                         'visible' => $isManagerApprovalSetting,
54 54
                         'label' => Yii::t('AdminModule.views_user_index', 'Group Manager'),
55 55
                         'format' => 'raw',
56
-                        'value' => function ($data) use ($group, $actionUrl) {
56
+                        'value' => function($data) use ($group, $actionUrl) {
57 57
                             $isManager = $group->isManager($data);
58 58
                             $yesSelected = ($isManager) ? 'selected' : '';
59 59
                             $noSelected = ($isManager) ? '' : 'selected';
60
-                            $result = '<select class="editableCell form-control" data-action-change="admin.group.setManagerRole" data-action-url="'.$actionUrl.'" data-userid="' . $data->id . '"  data-groupid="' . $group->id . '">';
60
+                            $result = '<select class="editableCell form-control" data-action-change="admin.group.setManagerRole" data-action-url="' . $actionUrl . '" data-userid="' . $data->id . '"  data-groupid="' . $group->id . '">';
61 61
                             $result .= '<option value="0" ' . $noSelected . '>' . Yii::t('AdminModule.views_group_manageGroupUser', 'No') . '</option>';
62 62
                             $result .= '<option value="1" ' . $yesSelected . '>' . Yii::t('AdminModule.views_group_manageGroupUser', 'Yes') . '</option>';
63 63
                             return $result;
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
                     ],
86 86
                 ],
87 87
             ]
88
-        );?>
88
+        ); ?>
89 89
     </div>
90 90
 </div>
91 91
 <script>		
Please login to merge, or discard this patch.