Completed
Pull Request — dev (#76)
by Sarah
02:34
created
views/comment/widgets/link.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 
6 6
 $commentCount = $this->context->getCommentsCount();
7 7
 $hasComments = ($commentCount > 0);
8
-$commentCountSpan = Html::tag('span', ' ('.$commentCount.')', [
8
+$commentCountSpan = Html::tag('span', ' (' . $commentCount . ')', [
9 9
     'class' => 'comment-count',
10 10
     'data-count' => $commentCount,
11 11
     'style' => ($hasComments) ? null : 'display:none'
@@ -15,10 +15,10 @@  discard block
 block discarded – undo
15 15
 <?php if ($mode == \humhub\modules\comment\widgets\CommentLink::MODE_POPUP): ?>
16 16
     <?php $url = Url::to(['/comment/comment/show', 'contentModel' => $objectModel, 'contentId' => $objectId, 'mode' => 'popup']); ?>
17 17
     <a href="#" data-action-click="ui.modal.load" data-action-url="<?= $url ?>">
18
-        <?= Yii::t('CommentModule.widgets_views_link', "Comment").'('.$this->context->getCommentsCount().')' ?>
18
+        <?= Yii::t('CommentModule.widgets_views_link', "Comment") . '(' . $this->context->getCommentsCount() . ')' ?>
19 19
     </a>
20
-<?php elseif(Yii::$app->user->isGuest): ?>
21
-    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, Yii::$app->user->loginUrl, ['data-target' => '#globalModal']) ?>
20
+<?php elseif (Yii::$app->user->isGuest): ?>
21
+    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment") . $commentCountSpan, Yii::$app->user->loginUrl, ['data-target' => '#globalModal']) ?>
22 22
 <?php else : ?>
23
-    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment").$commentCountSpan, "#",['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); ?>
23
+    <?= Html::a(Yii::t('CommentModule.widgets_views_link', "Comment") . $commentCountSpan, "#", ['onClick' => "$('#comment_" . $id . "').slideToggle('fast');$('#newCommentForm_" . $id . "').focus();return false;"]); ?>
24 24
 <?php endif; ?>
25 25
\ No newline at end of file
Please login to merge, or discard this patch.
views/comment/widgets/form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
             'id' => 'comment_create_upload_' . $id,
25 25
             'progress' => '#comment_create_upload_progress_' . $id,
26 26
             'preview' => '#comment_create_upload_preview_' . $id,
27
-            'dropZone' => '#comment_create_form_'.$id,
27
+            'dropZone' => '#comment_create_form_' . $id,
28 28
             'max' => Yii::$app->getModule('content')->maxAttachedFiles
29 29
         ]);
30 30
         ?>
Please login to merge, or discard this patch.
views/comment/comment/edit.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 
13 13
     <?=
14 14
 	humhub\widgets\RichtextField::widget([
15
-        'id' => 'comment_input_'.$comment->id,
15
+        'id' => 'comment_input_' . $comment->id,
16 16
         'placeholder' => Yii::t('CommentModule.views_edit', 'Edit your comment...'),
17 17
         'model' => $comment,
18 18
         'attribute' => 'message'
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
         \humhub\modules\file\widgets\UploadButton::widget([
26 26
             'id' => 'comment_upload_' . $comment->id,
27 27
             'model' => $comment,
28
-            'dropZone' => '#comment_'.$comment->id,
29
-            'preview' => '#comment_upload_preview_'.$comment->id,
30
-            'progress' => '#comment_upload_progress_'.$comment->id,
28
+            'dropZone' => '#comment_' . $comment->id,
29
+            'preview' => '#comment_upload_preview_' . $comment->id,
30
+            'progress' => '#comment_upload_progress_' . $comment->id,
31 31
             'max' => Yii::$app->getModule('content')->maxAttachedFiles
32 32
         ]);
33 33
         ?>
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 
48 48
     <?=
49 49
 	\humhub\modules\file\widgets\FilePreview::widget([
50
-        'id' => 'comment_upload_preview_'.$comment->id,
50
+        'id' => 'comment_upload_preview_' . $comment->id,
51 51
         'options' => ['style' => 'margin-top:10px'],
52 52
         'model' => $comment,
53 53
         'edit' => true
Please login to merge, or discard this patch.
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 1 patch
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.
views/content/widgets/visibilityLink.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($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.
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.