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/file/widgets/showFiles.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,8 +32,9 @@
 block discarded – undo
32 32
     <ul class="files" style="list-style: none; margin: 0;" id="files-<?php echo $object->getPrimaryKey(); ?>">
33 33
         <?php foreach ($files as $file) : ?>
34 34
             <?php
35
-            if ($file->getMimeBaseType() == "image" && $hideImageFileInfo)
36
-                continue;
35
+            if ($file->getMimeBaseType() == "image" && $hideImageFileInfo) {
36
+                            continue;
37
+            }
37 38
             ?>
38 39
             <li class="mime <?php echo \humhub\libs\MimeHelper::getMimeIconClassByExtension($file->getExtension()); ?>"><a
39 40
                     href="<?php echo $file->getUrl(); ?>" target="_blank"><span
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/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 2 patches
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.
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/dashboard/dashboard/index_guest.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@
 block discarded – undo
1 1
 <div class="row">
2 2
 	<div class="col-md-8">
3 3
 		<?php
4
-		echo \humhub\modules\content\widgets\Stream::widget([
5
-			'streamAction' => '//dashboard/dashboard/stream',
6
-			'showFilters' => false,
7
-			'messageStreamEmpty' => Yii::t('DashboardModule.views_dashboard_index_guest', '<b>No public contents to display found!</b>'),
8
-		]);
9
-		?>
4
+        echo \humhub\modules\content\widgets\Stream::widget([
5
+            'streamAction' => '//dashboard/dashboard/stream',
6
+            'showFilters' => false,
7
+            'messageStreamEmpty' => Yii::t('DashboardModule.views_dashboard_index_guest', '<b>No public contents to display found!</b>'),
8
+        ]);
9
+        ?>
10 10
 	</div>
11 11
 	<div class="col-md-4">
12 12
 		<?php
13
-		echo \humhub\modules\dashboard\widgets\Sidebar::widget(['widgets' => [
14
-			[\humhub\modules\directory\widgets\NewMembers::className(), ['showMoreButton' => true], ['sortOrder' => 300]],
15
-			[\humhub\modules\directory\widgets\NewSpaces::className(), ['showMoreButton' => true], ['sortOrder' => 400]],
16
-		]]);
17
-		?>
13
+        echo \humhub\modules\dashboard\widgets\Sidebar::widget(['widgets' => [
14
+            [\humhub\modules\directory\widgets\NewMembers::className(), ['showMoreButton' => true], ['sortOrder' => 300]],
15
+            [\humhub\modules\directory\widgets\NewSpaces::className(), ['showMoreButton' => true], ['sortOrder' => 400]],
16
+        ]]);
17
+        ?>
18 18
 	</div>
19 19
 </div>
Please login to merge, or discard this patch.
views/dashboard/dashboard/index.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,23 +1,23 @@
 block discarded – undo
1 1
 <div class="row">
2 2
 	<div class="col-sm-8">
3 3
 		<?php
4
-		if ($showProfilePostForm) {
5
-			echo \humhub\modules\post\widgets\Form::widget(['contentContainer' => \Yii::$app->user->getIdentity()]);
6
-		}
7
-		?>
4
+        if ($showProfilePostForm) {
5
+            echo \humhub\modules\post\widgets\Form::widget(['contentContainer' => \Yii::$app->user->getIdentity()]);
6
+        }
7
+        ?>
8 8
 		<?php
9
-		echo \humhub\modules\content\widgets\Stream::widget([
10
-			'streamAction' => '//dashboard/dashboard/stream',
11
-			'showFilters' => true,
12
-			'messageStreamEmpty' => Yii::t('DashboardModule.views_dashboard_index', '<b>Your dashboard is empty!</b><br>Post something on your profile or join some spaces!'),
13
-		]);
14
-		?>
9
+        echo \humhub\modules\content\widgets\Stream::widget([
10
+            'streamAction' => '//dashboard/dashboard/stream',
11
+            'showFilters' => true,
12
+            'messageStreamEmpty' => Yii::t('DashboardModule.views_dashboard_index', '<b>Your dashboard is empty!</b><br>Post something on your profile or join some spaces!'),
13
+        ]);
14
+        ?>
15 15
 	</div>
16 16
 	<div class="col-sm-4">
17 17
 		<?php
18
-		echo \humhub\modules\dashboard\widgets\Sidebar::widget(['widgets' => [
19
-			[\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/dashboard/dashboard/stream'], ['sortOrder' => 150]]
20
-		]]);
21
-		?>
18
+        echo \humhub\modules\dashboard\widgets\Sidebar::widget(['widgets' => [
19
+            [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/dashboard/dashboard/stream'], ['sortOrder' => 150]]
20
+        ]]);
21
+        ?>
22 22
 	</div>
23 23
 </div>
Please login to merge, or discard this patch.
views/user/auth/login_modal.php 2 patches
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.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,8 +36,11 @@
 block discarded – undo
36 36
 
37 37
                     <?php if(AuthChoice::hasClients()): ?>
38 38
                         <?= AuthChoice::widget([]) ?>
39
-                    <?php else: ?>
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>
39
+                    <?php else {
40
+    : ?>
41
+                        <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password.");
42
+}
43
+?></p>
41 44
                     <?php endif; ?>
42 45
 
43 46
                     <?php $form = ActiveForm::begin(); ?>
Please login to merge, or discard this patch.
views/user/auth/login.php 2 patches
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.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,11 @@
 block discarded – undo
27 27
 
28 28
             <?php if(AuthChoice::hasClients()): ?>
29 29
                 <?= AuthChoice::widget([]) ?>
30
-            <?php else: ?>
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>
30
+            <?php else {
31
+    : ?>
32
+                <p><?php echo Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password.");
33
+}
34
+?></p>
32 35
             <?php endif; ?>
33 36
             
34 37
             <?php $form = ActiveForm::begin(['id' => 'account-login-form', 'enableClientValidation' => false]); ?>
Please login to merge, or discard this patch.