Completed
Pull Request — dev (#76)
by Sarah
02:56 queued 32s
created
views/space/widgets/inviteButton.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,4 +2,4 @@
 block discarded – undo
2 2
 
3 3
 use yii\helpers\Html;
4 4
 
5
-echo Html::a('<i class="fa fa-plus"></i> '. Yii::t('SpaceModule.widgets_views_inviteButton', 'Invite'), $space->createUrl('/space/membership/invite'), array('class' => 'btn btn-primary', 'data-target' => '#globalModal'));
5
+echo Html::a('<i class="fa fa-plus"></i> ' . Yii::t('SpaceModule.widgets_views_inviteButton', 'Invite'), $space->createUrl('/space/membership/invite'), array('class' => 'btn btn-primary', 'data-target' => '#globalModal'));
Please login to merge, or discard this patch.
views/space/membership/statusInvite.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -7,12 +7,15 @@
 block discarded – undo
7 7
         <div class="modal-header">
8 8
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
9 9
             <h4 class="modal-title" id="myModalLabel"><?php
10
-                if ($status == Membership::STATUS_INVITED)
11
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has been invited.');
12
-                if ($status == Membership::STATUS_MEMBER)
13
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has become a member.');
14
-                if (!$status)
15
-                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has not been invited.');
10
+                if ($status == Membership::STATUS_INVITED) {
11
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has been invited.');
12
+                }
13
+                if ($status == Membership::STATUS_MEMBER) {
14
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has become a member.');
15
+                }
16
+                if (!$status) {
17
+                                    echo Yii::t('SpaceModule.views_space_statusInvite', 'User has not been invited.');
18
+                }
16 19
                 ?></h4>
17 20
         </div>
18 21
         <div class="modal-body text-center">
Please login to merge, or discard this patch.
views/space/create/modules.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
                                         'url' => $space->createUrl('/space/manage/module/enable', ['moduleId' => $moduleId]),
57 57
                                     ],
58 58
                                     'htmlOptions' => [
59
-                                        'class' => 'btn btn-sm btn-primary '. $enable,
59
+                                        'class' => 'btn btn-sm btn-primary ' . $enable,
60 60
                                         'id' => 'btn-enable-module-' . $moduleId
61 61
                                     ]
62 62
                                 ]);
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
                                         'url' => $space->createUrl('/space/manage/module/disable', ['moduleId' => $moduleId]),
77 77
                                     ],
78 78
                                     'htmlOptions' => [
79
-                                        'class' => 'btn btn-sm btn-info '. $disable,
79
+                                        'class' => 'btn btn-sm btn-info ' . $disable,
80 80
                                         'id' => 'btn-disable-module-' . $moduleId
81 81
                                     ]
82 82
                                 ]);
Please login to merge, or discard this patch.
views/widgets/modalConfirm.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 <?php if ($linkOutput == 'button') { ?>
31 31
 
32 32
     <!-- create button element -->
33
-    <button class="<?php echo $class; ?> <?php if ($tooltip != "") : ?>tt<?php endif;?>" style="<?php echo $style; ?>"
33
+    <button class="<?php echo $class; ?> <?php if ($tooltip != "") : ?>tt<?php endif; ?>" style="<?php echo $style; ?>"
34 34
             data-toggle="modal" data-target="#confirmModal_<?php echo $uniqueID; ?>" <?php echo $tooltip; ?>>
35 35
                 <?php echo $linkContent; ?>
36 36
     </button>
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 <?php } else if ($linkOutput == 'a') { ?>
39 39
 
40 40
     <!-- create normal link element -->
41
-    <a id="deleteLinkPost_<?php echo $uniqueID; ?>" class="<?php echo $class; ?> <?php if ($tooltip != "") : ?>tt<?php endif;?>" style="<?php echo $style; ?>" href="#"
41
+    <a id="deleteLinkPost_<?php echo $uniqueID; ?>" class="<?php echo $class; ?> <?php if ($tooltip != "") : ?>tt<?php endif; ?>" style="<?php echo $style; ?>" href="#"
42 42
        data-toggle="modal" data-target="#confirmModal_<?php echo $uniqueID; ?>" <?php echo $tooltip; ?>>
43 43
            <?php echo $linkContent; ?>
44 44
     </a>
Please login to merge, or discard this patch.
views/widgets/reorderContent.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@
 block discarded – undo
19 19
 			var sortable = ui.item.closest('.<?php echo $containerClassName; ?>');
20 20
 			var items = sortable.find('.<?php echo $sortableItemClassName; ?>');
21 21
 			<?php foreach($additionalAjaxParams as $name => $value) {
22
-			if($name != null && $name != '' && $value != null && $value != '') { ?>
22
+            if($name != null && $name != '' && $value != null && $value != '') { ?>
23 23
 			data.<?php echo $name ?> = '<?php echo $value ?>';	
24 24
 			<?php } } ?>
25 25
 			data.items = [];
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@
 block discarded – undo
18 18
 			var data = {};
19 19
 			var sortable = ui.item.closest('.<?php echo $containerClassName; ?>');
20 20
 			var items = sortable.find('.<?php echo $sortableItemClassName; ?>');
21
-			<?php foreach($additionalAjaxParams as $name => $value) {
22
-			if($name != null && $name != '' && $value != null && $value != '') { ?>
21
+			<?php foreach ($additionalAjaxParams as $name => $value) {
22
+			if ($name != null && $name != '' && $value != null && $value != '') { ?>
23 23
 			data.<?php echo $name ?> = '<?php echo $value ?>';	
24 24
 			<?php } } ?>
25 25
 			data.items = [];
Please login to merge, or discard this patch.
views/widgets/leftNavigation.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
         <div class="list-group">
21 21
             <?php foreach ($items as $item) : ?>
22 22
                 <?php $item['htmlOptions']['class'] .= " list-group-item"; ?>
23
-                <?php echo \yii\helpers\Html::a($item['icon']."<span>".$item['label']."</span>", $item['url'], $item['htmlOptions']); ?>
23
+                <?php echo \yii\helpers\Html::a($item['icon'] . "<span>" . $item['label'] . "</span>", $item['url'], $item['htmlOptions']); ?>
24 24
             <?php endforeach; ?>
25 25
         </div>
26 26
     <?php endforeach; ?>
Please login to merge, or discard this patch.
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,10 @@
 block discarded – undo
12 12
     <?php foreach ($this->context->getItemGroups() as $group) : ?>
13 13
 
14 14
         <?php $items = $this->context->getItems($group['id']); ?>
15
-        <?php if (count($items) == 0) continue; ?>
15
+        <?php if (count($items) == 0) {
16
+    continue;
17
+}
18
+?>
16 19
 
17 20
         <?php if ($group['label'] != "") : ?>
18 21
             <div class="panel-heading"><?php echo $group['label']; ?></div>
Please login to merge, or discard this patch.
views/widgets/dropdownNavigation.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,10 @@
 block discarded – undo
9 9
 <?php foreach ($this->context->getItemGroups() as $group) : ?>
10 10
 
11 11
     <?php $items = $this->context->getItems($group['id']); ?>
12
-    <?php if (count($items) == 0) continue; ?>
12
+    <?php if (count($items) == 0) {
13
+    continue;
14
+}
15
+?>
13 16
 
14 17
     <div class="btn-group dropdown-navigation">
15 18
         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
Please login to merge, or discard this patch.
views/friendship/manage/requests.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@
 block discarded – undo
21 21
                 'header' => 'Actions',
22 22
                 'class' => 'yii\grid\ActionColumn',
23 23
                 'buttons' => [
24
-                    'update' => function ($url, $model) {
24
+                    'update' => function($url, $model) {
25 25
                         return Html::a('Accept', ['/friendship/request/add', 'userId' => $model->id], ['class' => 'btn btn-success btn-sm', 'data-method' => 'POST']);
26 26
                     },
27
-                            'view' => function () {
27
+                            'view' => function() {
28 28
                         return;
29 29
                     },
30 30
                             'delete' => function($url, $model) {
Please login to merge, or discard this patch.
views/friendship/manage/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@
 block discarded – undo
22 22
                 'header' => 'Actions',
23 23
                 'class' => 'yii\grid\ActionColumn',
24 24
                 'buttons' => [
25
-                    'update' => function () {
25
+                    'update' => function() {
26 26
                         return;
27 27
                     },
28
-                    'view' => function () {
28
+                    'view' => function() {
29 29
                         return;
30 30
                     },
31 31
                     'delete' => function($url, $model) {
Please login to merge, or discard this patch.