Completed
Push — dev ( db2df6...716f17 )
by Sarah
10s
created
views/mail/layouts/html.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@
 block discarded – undo
15 15
         <title><?php echo Html::encode(Yii::$app->name); ?></title>
16 16
         <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700' rel='stylesheet' type='text/css'>
17 17
             <style type="text/css">
18
-                <?php $defaultBackground =  Yii::$app->view->theme->variable('background-color-main', '#fff') ?>
19
-                <?php $colorPrimary =  Yii::$app->view->theme->variable('primary', '#708fa0') ?>
18
+                <?php $defaultBackground = Yii::$app->view->theme->variable('background-color-main', '#fff') ?>
19
+                <?php $colorPrimary = Yii::$app->view->theme->variable('primary', '#708fa0') ?>
20 20
                 
21 21
                 .ReadMsgBody {
22 22
                     width: 100%;
Please login to merge, or discard this patch.
views/layouts/main.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
                     <a data-toggle="modal" data-target="#aside" class="navbar-item pull-left visible-xs visible-sm waves"><i class="material-icons">menu</i></a>
86 86
                     <ul class="nav nav-sm navbar-tool pull-right">
87 87
                         <?= \humhub\widgets\TopMenuRightStack::widget(); ?>
88
-                            <?= \humhub\widgets\NotificationArea::widget([ 'widgets'=> [ [\humhub\modules\notification\widgets\Overview::className(), [], ['sortOrder' => 10]], ]]); ?>
88
+                            <?= \humhub\widgets\NotificationArea::widget(['widgets'=> [[\humhub\modules\notification\widgets\Overview::className(), [], ['sortOrder' => 10]], ]]); ?>
89 89
 
90 90
                             <?=\ humhub\modules\space\widgets\Chooser::widget(); ?>
91 91
                     </ul>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,8 +98,11 @@
 block discarded – undo
98 98
                             <!-- start: show content (and check, if exists a sublayout -->
99 99
                             <?php if (isset($this->context->subLayout) && $this->context->subLayout != "") : ?>
100 100
                             <?= $this->render($this->context->subLayout, array('content' => $content)); ?>
101
-                                <?php else: ?>
102
-                                <?= $content; ?>
101
+                                <?php else {
102
+    : ?>
103
+                                <?= $content;
104
+}
105
+?>
103 106
                                     <?php endif; ?>
104 107
                                     <!-- end: show content -->
105 108
 
Please login to merge, or discard this patch.
views/content/widgets/pinLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,9 +3,12 @@
 block discarded – undo
3 3
         <a href="#" data-action-click="unpin" data-action-url="<?= $unpinUrl ?>">
4 4
             <i class="fa fa-arrow-up"></i> <?php echo Yii::t('ContentModule.widgets_views_pinLink', 'Unpin'); ?>
5 5
         </a>
6
-       <?php else: ?>
6
+       <?php else {
7
+    : ?>
7 8
         <a href="#" data-action-click="pin" data-action-url="<?= $pinUrl ?>">
8
-            <i class="fa fa-arrow-up"></i> <?php echo Yii::t('ContentModule.widgets_views_pinLink', 'Pin to top'); ?>
9
+            <i class="fa fa-arrow-up"></i> <?php echo Yii::t('ContentModule.widgets_views_pinLink', 'Pin to top');
10
+}
11
+?>
9 12
         </a>
10 13
     <?php endif; ?>
11 14
 </li>
Please login to merge, or discard this patch.
views/content/widgets/archiveLink.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,9 +12,12 @@
 block discarded – undo
12 12
         <a href="#" data-action-click="unarchive" data-action-url="<?= $unarchiveLink ?>">
13 13
             <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Unarchive'); ?>
14 14
         </a>
15
-    <?php else: ?>
15
+    <?php else {
16
+    : ?>
16 17
         <a href="#" data-action-click="archive" data-action-url="<?= $archiveLink ?>">
17
-            <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Move to archive'); ?>
18
+            <i class="fa fa-archive"></i> <?= Yii::t('ContentModule.widgets_views_archiveLink', 'Move to archive');
19
+}
20
+?>
18 21
         </a>
19 22
     <?php endif; ?>
20 23
 </li>
Please login to merge, or discard this patch.
views/content/widgets/visibilityLink.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@
 block discarded – undo
6 6
 
7 7
 ?>
8 8
 <li>
9
-    <?php if($content->isPrivate()) :?>
9
+    <?php if ($content->isPrivate()) :?>
10 10
         <a href="#"  class="makePublicLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
11 11
             <i class="fa fa-unlock makePublic"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make public') ?>
12 12
         </a>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,9 +10,12 @@
 block discarded – undo
10 10
         <a href="#"  class="makePublicLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
11 11
             <i class="fa fa-unlock makePublic"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make public') ?>
12 12
         </a>
13
-    <?php else: ?>
13
+    <?php else {
14
+    : ?>
14 15
         <a href="#" class="makePriavteLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
15 16
             <i class="fa fa-lock makePrivate"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make private') ?>
16 17
         </a>
17
-    <?php endif; ?>
18
+    <?php endif;
19
+}
20
+?>
18 21
 </li>
Please login to merge, or discard this patch.
views/admin/setting/oembed.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
             <li><?= Html::a($providerUrl, Url::to(['oembed-edit', 'prefix' => $providerUrl]), ['data-method' => 'POST']); ?></li>
19 19
         <?php endforeach; ?>
20 20
     </ul>
21
-<?php else: ?>
22
-    <p><strong><?= Yii::t('AdminModule.views_setting_oembed', 'Currently no provider active!'); ?></strong></p>
21
+<?php else {
22
+    : ?>
23
+    <p><strong><?= Yii::t('AdminModule.views_setting_oembed', 'Currently no provider active!');
24
+}
25
+?></strong></p>
23 26
 <?php endif; ?>
24 27
 
25 28
 <?php $this->endContent(); ?>
Please login to merge, or discard this patch.
views/directory/directory/userPosts.php 1 patch
Spacing   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,11 +7,9 @@
 block discarded – undo
7 7
 echo \humhub\modules\stream\widgets\StreamViewer::widget(array(
8 8
     'streamAction' => '//directory/directory/stream',
9 9
     'messageStreamEmpty' => (!Yii::$app->user->isGuest) ?
10
-            Yii::t('DirectoryModule.base', '<b>Nobody wrote something yet.</b><br>Make the beginning and post something...') :
11
-            Yii::t('DirectoryModule.base', '<b>There are no profile posts yet!</b>'),
10
+            Yii::t('DirectoryModule.base', '<b>Nobody wrote something yet.</b><br>Make the beginning and post something...') : Yii::t('DirectoryModule.base', '<b>There are no profile posts yet!</b>'),
12 11
     'messageStreamEmptyCss' => (!Yii::$app->user->isGuest) ?
13
-            'placeholder-empty-stream' :
14
-            '',
12
+            'placeholder-empty-stream' : '',
15 13
 ));
16 14
 ?>
17 15
 
Please login to merge, or discard this patch.
views/notification/widgets/notificationSettingsForm.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 <br />
9 9
 <?= $form->field($model, 'desktopNotifications')->checkbox(); ?>
10 10
 
11
-<?php if($showSpaces) : ?>
11
+<?php if ($showSpaces) : ?>
12 12
     <?= humhub\modules\space\widgets\SpacePickerField::widget([
13 13
         'form' => $form,
14 14
         'model' => $model,
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
         'defaultResults' => $defaultSpaces,
17 17
         'maxSelection' => 10
18 18
     ])?>
19
-<?php endif;?>
19
+<?php endif; ?>
20 20
 
21 21
 <div class="grid-view table-responsive permission-grid-editor" style="padding-top:0px;">
22 22
     <table class="table table-middle table-hover">
Please login to merge, or discard this patch.
views/notification/mails/wrapper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php if(!empty($headline)) :?>
1
+<?php if (!empty($headline)) :?>
2 2
 <tr>
3 3
     <td align="center" valign="top"  class="fix-box">
4 4
         <!-- start container width 600px -->
Please login to merge, or discard this patch.