Completed
Pull Request — dev (#76)
by Sarah
07:34
created
views/notification/widgets/overview.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 use yii\helpers\Url;
4 4
 
5 5
 $this->registerJsConfig('notification', [
6
-    'icon' => $this->theme->getBaseUrl().'/ico/notification-o.png',
6
+    'icon' => $this->theme->getBaseUrl() . '/ico/notification-o.png',
7 7
     'loadEntriesUrl' => Url::to(['/notification/list']),
8 8
     'sendDesktopNotifications' => boolval(Yii::$app->notification->getDesktopNoficationSettings(Yii::$app->user->getIdentity())),
9 9
     'text' =>  [
Please login to merge, or discard this patch.
views/post/post/edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 
10 10
     <!-- create contenteditable div for HEditorWidget to place the data -->
11 11
         <?= humhub\widgets\RichtextField::widget([
12
-            'id' => 'post_input_'. $post->id,
12
+            'id' => 'post_input_' . $post->id,
13 13
             'placeholder' => Yii::t('PostModule.views_edit', 'Edit your post...'),
14 14
             'model' => $post,
15 15
             'attribute' => 'message'
Please login to merge, or discard this patch.
views/post/widgets/form.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?= humhub\widgets\RichtextField::widget([
2
-   'id' =>  'contentForm_message',
3
-   'placeholder' => Yii::t("PostModule.widgets_views_postForm", "What's on your mind?"),
2
+    'id' =>  'contentForm_message',
3
+    'placeholder' => Yii::t("PostModule.widgets_views_postForm", "What's on your mind?"),
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."),
Please login to merge, or discard this 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
-]);?>
8 7
\ No newline at end of file
8
+]); ?>
9 9
\ No newline at end of file
Please login to merge, or discard this patch.
views/search/search/index.php 2 patches
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.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 use yii\helpers\Url;
4 4
 use yii\helpers\Html;
5 5
 use yii\bootstrap\ActiveForm;
6
-
7 6
 use humhub\modules\search\models\forms\SearchForm;
8 7
 use humhub\modules\content\components\ContentActiveRecord;
9 8
 use humhub\modules\content\components\ContentContainerActiveRecord;
Please login to merge, or discard this patch.
views/notification/widgets/notificationSettingsForm.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 
12 12
 <?php if($showSpaces) : ?>
13 13
     <?=
14
-     humhub\modules\space\widgets\SpacePickerField::widget([
14
+        humhub\modules\space\widgets\SpacePickerField::widget([
15 15
         'form' => $form,
16 16
         'model' => $model,
17 17
         'attribute' => 'spaceGuids',
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 <br>
10 10
 <?= $form->field($model, 'desktopNotifications')->checkbox(); ?>
11 11
 
12
-<?php if($showSpaces) : ?>
12
+<?php if ($showSpaces) : ?>
13 13
     <?=
14 14
      humhub\modules\space\widgets\SpacePickerField::widget([
15 15
         'form' => $form,
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
         'defaultResults' => $defaultSpaces,
19 19
         'maxSelection' => 10
20 20
     ])?>
21
-<?php endif;?>
21
+<?php endif; ?>
22 22
 
23 23
 <div class="grid-view table-responsive permission-grid-editor" style="padding-top:0px;">
24 24
     <table class="table table-middle table-hover">
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
@@ -9,14 +9,17 @@
 block discarded – undo
9 9
     <?php if (Yii::$app->user->isGuest): ?>
10 10
 
11 11
         <?= Html::a(Yii::t('LikeModule.widgets_views_likeLink', 'Like'), Yii::$app->user->loginUrl, ['data-target' => '#globalModal']); ?>
12
-    <?php else: ?>
12
+    <?php else {
13
+    : ?>
13 14
         <a href="#" data-action-click="like.toggleLike" data-action-url="<?= $likeUrl ?>" class="like likeAnchor" style="<?= (!$currentUserLiked) ? '' : 'display:none'?>">
14 15
             <?= Yii::t('LikeModule.widgets_views_likeLink', 'Like') ?>
15 16
         </a>
16 17
         <a href="#" data-action-click="like.toggleLike" data-action-url="<?= $unlikeUrl ?>" class="unlike likeAnchor" style="<?= ($currentUserLiked) ? '' : 'display:none'?>">
17 18
             <?= Yii::t('LikeModule.widgets_views_likeLink', 'Unlike') ?>
18 19
         </a>
19
-    <?php endif; ?>
20
+    <?php endif;
21
+}
22
+?>
20 23
 
21 24
     <?php if (count($likes) > 0) { ?>
22 25
         <!-- Create link to show all users, who liked this -->
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
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 /* @var $toggleLink string */
6 6
 ?>
7 7
 <li>
8
-    <?php if($content->isPrivate()) :?>
8
+    <?php if ($content->isPrivate()) :?>
9 9
         <a href="#"  class="makePublicLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
10 10
             <i class="fa fa-unlock makePublic"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make public') ?>
11 11
         </a>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,9 +9,12 @@
 block discarded – undo
9 9
         <a href="#"  class="makePublicLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
10 10
             <i class="fa fa-unlock makePublic"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make public') ?>
11 11
         </a>
12
-    <?php else: ?>
12
+    <?php else {
13
+    : ?>
13 14
         <a href="#" class="makePriavteLink" data-action-click="toggleVisibility" data-action-url="<?= $toggleLink ?>">
14 15
             <i class="fa fa-lock makePrivate"></i> <?= Yii::t('ContentModule.widgets_views_contentForm', 'Make private') ?>
15 16
         </a>
16
-    <?php endif; ?>
17
+    <?php endif;
18
+}
19
+?>
17 20
 </li>
18 21
\ No newline at end of file
Please login to merge, or discard this patch.
views/content/widgets/editLink.php 1 patch
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($mode === WallEntry::EDIT_MODE_INLINE) : ?>
9
+    <?php if ($mode === WallEntry::EDIT_MODE_INLINE) : ?>
10 10
             <a href="#" class="stream-entry-edit-link" data-action-click="edit" data-action-url="<?= $editUrl ?>">
11 11
                 <i class="fa fa-pencil"></i> <?= Yii::t('ContentModule.widgets_views_editLink', 'Edit') ?>
12 12
             </a>
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>
21 24
\ No newline at end of file
Please login to merge, or discard this patch.