Completed
Pull Request — dev (#76)
by Sarah
02:56 queued 32s
created
views/mail/mail/adduser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
             </div>
20 20
 
21 21
             <?php
22
-            if(version_compare(Yii::$app->version, '1.0.0-beta.5', 'lt')) {
22
+            if (version_compare(Yii::$app->version, '1.0.0-beta.5', 'lt')) {
23 23
                 echo humhub\modules\user\widgets\UserPicker::widget(array(
24 24
                     'inputId' => 'addUserFrom_mail',
25 25
                     'model' => $inviteForm, // CForm Instanz
Please login to merge, or discard this patch.
views/mail/mail/notificationList.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,6 +3,9 @@
 block discarded – undo
3 3
     <?php foreach ($userMessages as $userMessage) : ?>
4 4
         <?php echo $this->render('_messagePreview', array('userMessage' => $userMessage)); ?>
5 5
     <?php endforeach; ?>
6
-<?php else: ?>
7
-    <li class="placeholder"> <?php echo Yii::t('MailModule.views_mail_list', 'There are no messages yet.'); ?></li>
6
+<?php else {
7
+    : ?>
8
+    <li class="placeholder"> <?php echo Yii::t('MailModule.views_mail_list', 'There are no messages yet.');
9
+}
10
+?></li>
8 11
 <?php endif; ?>
9 12
\ No newline at end of file
Please login to merge, or discard this patch.
views/mail/mail/index.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,11 @@
 block discarded – undo
18 18
 						<?php foreach ($userMessages as $userMessage) : ?>
19 19
 							<?php echo $this->render('_messagePreview', array('userMessage' => $userMessage)); ?>
20 20
 						<?php endforeach; ?>
21
-					<?php else: ?>
22
-						<li class="placeholder"><?php echo Yii::t('MailModule.views_mail_index', 'There are no messages yet.'); ?></li>
21
+					<?php else {
22
+    : ?>
23
+						<li class="placeholder"><?php echo Yii::t('MailModule.views_mail_index', 'There are no messages yet.');
24
+}
25
+?></li>
23 26
 					<?php endif; ?>
24 27
 				</ul>
25 28
 			</div>
Please login to merge, or discard this patch.
views/space/widgets/header.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -102,8 +102,11 @@
 block discarded – undo
102 102
                    data-footer='<button type="button" class="btn btn-primary" data-dismiss="modal"><?php echo Yii::t('SpaceModule.widgets_views_profileHeader', 'Close'); ?></button>'>
103 103
                        <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?>
104 104
                 </a>
105
-            <?php else : ?>
106
-                <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?>
105
+            <?php else {
106
+    : ?>
107
+                <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]);
108
+}
109
+?>
107 110
             <?php endif; ?>
108 111
 
109 112
             <!-- check if the current user is the profile owner and can change the images -->
Please login to merge, or discard this patch.
views/space/widgets/requestMembership.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
                         'success' => 'function(html){
39 39
 				jQuery("#lightbox_requestWorkspace").replaceWith(html);
40 40
 			}',
41
-                    ), array('class' => 'input_button', 'id' => 'requestSubmit'.uniqid()));
41
+                    ), array('class' => 'input_button', 'id' => 'requestSubmit' . uniqid()));
42 42
                     ?>
43 43
 
44 44
                     <?php echo CHtml::link(Yii::t('SpaceModule.widgets_views_requestMembership', 'Cancel'), '#', array('onclick'=>'RequestWorkspacebox.close()', 'class' => 'button', 'style' => 'color: #fff;')); ?>
Please login to merge, or discard this patch.
views/space/widgets/spaceNameColorInput.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,11 +5,11 @@  discard block
 block discarded – undo
5 5
     $this->registerCssFile('@web/resources/space/colorpicker/css/bootstrap-colorpicker.min.css', ['position'=>  yii\web\View::POS_BEGIN, 'depends' => [\yii\bootstrap\BootstrapPluginAsset::className()]]);
6 6
     
7 7
     $ts = time();
8
-    $inputId = $ts.'space-color-picker-edit';
9
-    $containerId = $ts.'space-color-chooser-edit';
10
-    $addonClass = $ts.'input-group-addon';
8
+    $inputId = $ts . 'space-color-picker-edit';
9
+    $containerId = $ts . 'space-color-chooser-edit';
10
+    $addonClass = $ts . 'input-group-addon';
11 11
     
12
-    if($model->color == null) {
12
+    if ($model->color == null) {
13 13
         $model->color = '#d1d1d1';
14 14
     }
15 15
 ?>
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
             {input}
26 26
         </div>
27 27
         {error}{hint}'
28
-        ])->textInput(['placeholder' => Yii::t('SpaceModule.views_create_create', 'Space name'), 'maxlength' => 45 ]) ?>
28
+        ])->textInput(['placeholder' => Yii::t('SpaceModule.views_create_create', 'Space name'), 'maxlength' => 45]) ?>
29 29
 </div>
30 30
 <script type="text/javascript">
31 31
     // prevent enter key and simulate ajax button submit click
Please login to merge, or discard this patch.
views/space/widgets/header-.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,11 @@
 block discarded – undo
22 22
 				   data-footer='<button type="button" class="btn btn-primary" data-dismiss="modal"><?php echo Yii::t('SpaceModule.widgets_views_profileHeader', 'Close'); ?></button>'>
23 23
 					   <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]); ?>
24 24
 				</a>
25
-			<?php else : ?>
26
-				<?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]); ?>
25
+			<?php else {
26
+    : ?>
27
+				<?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 64]);
28
+}
29
+?>
27 30
 			<?php endif; ?>
28 31
 
29 32
 			<!-- check if the current user is the profile owner and can change the images -->
Please login to merge, or discard this patch.
views/space/widgets/inviteButton.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,4 +2,4 @@
 block discarded – undo
2 2
 
3 3
 use yii\helpers\Html;
4 4
 
5
-echo Html::a('<i class="fa fa-plus"></i> '. Yii::t('SpaceModule.widgets_views_inviteButton', 'Invite'), $space->createUrl('/space/membership/invite'), array('class' => 'btn btn-primary', 'data-target' => '#globalModal'));
5
+echo Html::a('<i class="fa fa-plus"></i> ' . Yii::t('SpaceModule.widgets_views_inviteButton', 'Invite'), $space->createUrl('/space/membership/invite'), array('class' => 'btn btn-primary', 'data-target' => '#globalModal'));
Please login to merge, or discard this patch.
views/space/membership/statusInvite.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,12 +7,15 @@
 block discarded – undo
7 7
         <div class="modal-header">
8 8
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
9 9
             <h4 class="modal-title" id="myModalLabel"><?php
10
-                if ($status == Membership::STATUS_INVITED)
11
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has been invited.');
12
-                if ($status == Membership::STATUS_MEMBER)
13
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has become a member.');
14
-                if (!$status)
15
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has not been invited.');
10
+                if ($status == Membership::STATUS_INVITED) {
11
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has been invited.');
12
+                }
13
+                if ($status == Membership::STATUS_MEMBER) {
14
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has become a member.');
15
+                }
16
+                if (!$status) {
17
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has not been invited.');
18
+                }
16 19
                 ?></h4>
17 20
         </div>
18 21
         <div class="modal-body text-center">
Please login to merge, or discard this patch.