Completed
Pull Request — dev (#76)
by Sarah
02:56 queued 32s
created
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/space/widgets/requestMembership.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
                         'success' => 'function(html){
39 39
 				jQuery("#lightbox_requestWorkspace").replaceWith(html);
40 40
 			}',
41
-                    ), array('class' => 'input_button', 'id' => 'requestSubmit'.uniqid()));
41
+                    ), array('class' => 'input_button', 'id' => 'requestSubmit' . uniqid()));
42 42
                     ?>
43 43
 
44 44
                     <?php echo CHtml::link(Yii::t('SpaceModule.widgets_views_requestMembership', 'Cancel'), '#', array('onclick'=>'RequestWorkspacebox.close()', 'class' => 'button', 'style' => 'color: #fff;')); ?>
Please login to merge, or discard this patch.
views/space/widgets/spaceNameColorInput.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,11 +5,11 @@  discard block
 block discarded – undo
5 5
     $this->registerCssFile('@web/resources/space/colorpicker/css/bootstrap-colorpicker.min.css', ['position'=>  yii\web\View::POS_BEGIN, 'depends' => [\yii\bootstrap\BootstrapPluginAsset::className()]]);
6 6
     
7 7
     $ts = time();
8
-    $inputId = $ts.'space-color-picker-edit';
9
-    $containerId = $ts.'space-color-chooser-edit';
10
-    $addonClass = $ts.'input-group-addon';
8
+    $inputId = $ts . 'space-color-picker-edit';
9
+    $containerId = $ts . 'space-color-chooser-edit';
10
+    $addonClass = $ts . 'input-group-addon';
11 11
     
12
-    if($model->color == null) {
12
+    if ($model->color == null) {
13 13
         $model->color = '#d1d1d1';
14 14
     }
15 15
 ?>
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
             {input}
26 26
         </div>
27 27
         {error}{hint}'
28
-        ])->textInput(['placeholder' => Yii::t('SpaceModule.views_create_create', 'Space name'), 'maxlength' => 45 ]) ?>
28
+        ])->textInput(['placeholder' => Yii::t('SpaceModule.views_create_create', 'Space name'), 'maxlength' => 45]) ?>
29 29
 </div>
30 30
 <script type="text/javascript">
31 31
     // prevent enter key and simulate ajax button submit click
Please login to merge, or discard this patch.
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/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 1 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 1 patch
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.
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.