Completed
Push — master ( f0f3ac...801072 )
by Sarah
05:52 queued 03:24
created
views/post/post/edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
                 'type' => 'POST',
34 34
                 'beforeSend' => new yii\web\JsExpression('function(html){  $("#post_input_' . $post->id . '_contenteditable").hide(); showLoader("' . $post->id . '"); }'),
35 35
                 'success' => new yii\web\JsExpression('function(html){ $(".wall_' . $post->getUniqueId() . '").replaceWith(html); }'),
36
-                'statusCode' => ['400' => new yii\web\JsExpression('function(xhr) { $("#post_edit_'. $post->id.'").replaceWith(xhr.responseText); }')],
36
+                'statusCode' => ['400' => new yii\web\JsExpression('function(xhr) { $("#post_edit_' . $post->id . '").replaceWith(xhr.responseText); }')],
37 37
                 'url' => $post->content->container->createUrl('/post/post/edit', ['id' => $post->id]),
38 38
             ],
39 39
             'htmlOptions' => [
Please login to merge, or discard this patch.
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/user/auth/login_modal.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@
 block discarded – undo
34 34
             <div class="tab-content">
35 35
                 <div class="tab-pane <?php echo (!isset($_POST['Invite'])) ? "active" : ""; ?>" id="login">
36 36
 
37
-                    <?php if(AuthChoice::hasClients()): ?>
37
+                    <?php if (AuthChoice::hasClients()): ?>
38 38
                         <?= AuthChoice::widget([]) ?>
39 39
                     <?php else: ?>
40 40
                         <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p>
Please login to merge, or discard this patch.
views/user/auth/login.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
                 </div>
26 26
             <?php endif; ?>
27 27
 
28
-            <?php if(AuthChoice::hasClients()): ?>
28
+            <?php if (AuthChoice::hasClients()): ?>
29 29
                 <?= AuthChoice::widget([]) ?>
30 30
             <?php else: ?>
31 31
                 <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p>
Please login to merge, or discard this patch.
views/user/account/editSettings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
 
11 11
     <?php echo $form->field($model, 'tags'); ?>
12 12
 
13
-    <?php if(count($languages) > 1) : ?>
13
+    <?php if (count($languages) > 1) : ?>
14 14
         <?php echo $form->field($model, 'language')->dropdownList($languages); ?>
15 15
     <?php endif; ?>
16 16
 
Please login to merge, or discard this patch.
views/user/profile/home.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,10 +5,8 @@
 block discarded – undo
5 5
     'contentContainer' => $user,
6 6
     'streamAction' => '//user/profile/stream',
7 7
     'messageStreamEmpty' => ($user->permissionManager->can(new \humhub\modules\post\permissions\CreatePost())) ?
8
-            Yii::t('UserModule.views_profile_index', '<b>Your profile stream is still empty</b><br>Get started and post something...') :
9
-            Yii::t('UserModule.views_profile_index', '<b>This profile stream is still empty!</b>'),
8
+            Yii::t('UserModule.views_profile_index', '<b>Your profile stream is still empty</b><br>Get started and post something...') : Yii::t('UserModule.views_profile_index', '<b>This profile stream is still empty!</b>'),
10 9
     'messageStreamEmptyCss' => ($user->permissionManager->can(new \humhub\modules\post\permissions\CreatePost())) ?
11
-            'placeholder-empty-stream' :
12
-            '',
10
+            'placeholder-empty-stream' : '',
13 11
 ));
14 12
 ?>
Please login to merge, or discard this patch.
views/user/widgets/accountTopMenu.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		<?php foreach ($this->context->getItems() as $item): ?>
18 18
 			<?php if ($item['label'] == '---'): ?>
19 19
 			<?php else: ?>
20
-				<li><a href="<?php echo $item['url']; ?>" class="waves"><?php echo $item['icon'] . ' ' .$item['label']; ?></a></li>
20
+				<li><a href="<?php echo $item['url']; ?>" class="waves"><?php echo $item['icon'] . ' ' . $item['label']; ?></a></li>
21 21
 			<?php endif; ?>
22 22
 		<?php endforeach; ?>
23 23
 <?php endif; ?>
24 24
\ No newline at end of file
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.