@@ -19,7 +19,7 @@ |
||
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 |
@@ -3,6 +3,9 @@ |
||
3 | 3 | <?php foreach ($userMessages as $userMessage) : ?> |
4 | 4 | <?php echo $this->render('_messagePreview', array('userMessage' => $userMessage)); ?> |
5 | 5 | <?php endforeach; ?> |
6 | -<?php else: ?> |
|
7 | - <li class="placeholder"> <?php echo Yii::t('MailModule.views_mail_list', 'There are no messages yet.'); ?></li> |
|
6 | +<?php else { |
|
7 | + : ?> |
|
8 | + <li class="placeholder"> <?php echo Yii::t('MailModule.views_mail_list', 'There are no messages yet.'); |
|
9 | +} |
|
10 | +?></li> |
|
8 | 11 | <?php endif; ?> |
9 | 12 | \ No newline at end of file |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | use yii\helpers\Html; |
3 | 3 | if ($messageId != "") { |
4 | - $this->registerJs('loadMessage(' . Html::encode($messageId) . ');'); |
|
4 | + $this->registerJs('loadMessage(' . Html::encode($messageId) . ');'); |
|
5 | 5 | } |
6 | 6 | ?> |
7 | 7 | <div class="row"> |
@@ -18,8 +18,11 @@ |
||
18 | 18 | <?php foreach ($userMessages as $userMessage) : ?> |
19 | 19 | <?php echo $this->render('_messagePreview', array('userMessage' => $userMessage)); ?> |
20 | 20 | <?php endforeach; ?> |
21 | - <?php else: ?> |
|
22 | - <li class="placeholder"><?php echo Yii::t('MailModule.views_mail_index', 'There are no messages yet.'); ?></li> |
|
21 | + <?php else { |
|
22 | + : ?> |
|
23 | + <li class="placeholder"><?php echo Yii::t('MailModule.views_mail_index', 'There are no messages yet.'); |
|
24 | +} |
|
25 | +?></li> |
|
23 | 26 | <?php endif; ?> |
24 | 27 | </ul> |
25 | 28 | </div> |
@@ -21,12 +21,12 @@ |
||
21 | 21 | </nav> |
22 | 22 | </div> |
23 | 23 | <?php |
24 | - echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [ |
|
25 | - [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]], |
|
26 | - [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]], |
|
27 | - [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]] |
|
28 | - ]]); |
|
29 | - ?> |
|
24 | + echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [ |
|
25 | + [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]], |
|
26 | + [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]], |
|
27 | + [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]] |
|
28 | + ]]); |
|
29 | + ?> |
|
30 | 30 | </div> |
31 | 31 | </div> |
32 | 32 | <div class="col-sm-8"> |
@@ -23,12 +23,12 @@ |
||
23 | 23 | </div> |
24 | 24 | <div class="col-md-3 layout-sidebar-container"> |
25 | 25 | <?php |
26 | - echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [ |
|
27 | - [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]], |
|
28 | - [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]], |
|
29 | - [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]] |
|
30 | - ]]); |
|
31 | - ?> |
|
26 | + echo \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [ |
|
27 | + [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]], |
|
28 | + [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]], |
|
29 | + [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]] |
|
30 | + ]]); |
|
31 | + ?> |
|
32 | 32 | </div> |
33 | 33 | <?php endif; ?> |
34 | 34 | </div> |
@@ -15,9 +15,12 @@ |
||
15 | 15 | <div class="col-md-10 layout-content-container"> |
16 | 16 | <?php echo $content; ?> |
17 | 17 | </div> |
18 | - <?php else: ?> |
|
18 | + <?php else { |
|
19 | + : ?> |
|
19 | 20 | <div class="col-md-7 layout-content-container"> |
20 | - <?php echo $content; ?> |
|
21 | + <?php echo $content; |
|
22 | +} |
|
23 | +?> |
|
21 | 24 | </div> |
22 | 25 | <div class="col-md-3 layout-sidebar-container"> |
23 | 26 | <?php |
@@ -12,19 +12,19 @@ discard block |
||
12 | 12 | <!-- start: Show space image and name if chosen --> |
13 | 13 | <?php if ($currentSpace) { ?> |
14 | 14 | <?php echo \humhub\modules\space\widgets\Image::widget([ |
15 | - 'space' => $currentSpace, |
|
16 | - 'width' => 24, |
|
17 | - 'htmlOptions' => [ |
|
18 | - 'class' => 'current-space-image', |
|
19 | - ] |
|
20 | - ]); ?> |
|
15 | + 'space' => $currentSpace, |
|
16 | + 'width' => 24, |
|
17 | + 'htmlOptions' => [ |
|
18 | + 'class' => 'current-space-image', |
|
19 | + ] |
|
20 | + ]); ?> |
|
21 | 21 | <?php } ?> |
22 | 22 | |
23 | 23 | <?php |
24 | - if (!$currentSpace) { |
|
25 | - echo '<i class="material-icons">assignment_turned_in</i>'; |
|
26 | - } |
|
27 | - ?> |
|
24 | + if (!$currentSpace) { |
|
25 | + echo '<i class="material-icons">assignment_turned_in</i>'; |
|
26 | + } |
|
27 | + ?> |
|
28 | 28 | <!-- end: Show space image and name if chosen --> |
29 | 29 | </a> |
30 | 30 | <ul class="dropdown-menu" id="space-menu-dropdownXXX"> |
@@ -52,12 +52,12 @@ discard block |
||
52 | 52 | <div class="media"> |
53 | 53 | <!-- Show space image --> |
54 | 54 | <?php echo \humhub\modules\space\widgets\Image::widget([ |
55 | - 'space' => $membership->space, |
|
56 | - 'width' => 24, |
|
57 | - 'htmlOptions' => [ |
|
58 | - 'class' => 'pull-left', |
|
59 | - ] |
|
60 | - ]); ?> |
|
55 | + 'space' => $membership->space, |
|
56 | + 'width' => 24, |
|
57 | + 'htmlOptions' => [ |
|
58 | + 'class' => 'pull-left', |
|
59 | + ] |
|
60 | + ]); ?> |
|
61 | 61 | <div class="media-body"> |
62 | 62 | <strong><?php echo Html::encode($membership->space->name); ?></strong> |
63 | 63 | <?php if ($newItems != 0): ?> |
@@ -67,10 +67,10 @@ discard block |
||
67 | 67 | class="fa fa-cloud-upload"></i></a> |
68 | 68 | <a id="banner-image-upload-edit-button" |
69 | 69 | style="<?php |
70 | - if (!$space->getProfileBannerImage()->hasImage()) { |
|
71 | - echo 'display: none;'; |
|
72 | - } |
|
73 | - ?>" |
|
70 | + if (!$space->getProfileBannerImage()->hasImage()) { |
|
71 | + echo 'display: none;'; |
|
72 | + } |
|
73 | + ?>" |
|
74 | 74 | href="<?php echo $space->createUrl('/space/manage/image/crop-banner'); ?>" |
75 | 75 | class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i |
76 | 76 | class="fa fa-edit"></i></a> |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | class="fa fa-cloud-upload"></i></a> |
128 | 128 | <a id="profile-image-upload-edit-button" |
129 | 129 | style="<?php |
130 | - if (!$space->getProfileImage()->hasImage()) { |
|
131 | - echo 'display: none;'; |
|
132 | - } |
|
133 | - ?>" |
|
130 | + if (!$space->getProfileImage()->hasImage()) { |
|
131 | + echo 'display: none;'; |
|
132 | + } |
|
133 | + ?>" |
|
134 | 134 | href="<?php echo $space->createUrl('/space/manage/image/crop'); ?>" |
135 | 135 | class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i |
136 | 136 | class="fa fa-edit"></i></a> |
@@ -102,8 +102,11 @@ |
||
102 | 102 | data-footer='<button type="button" class="btn btn-primary" data-dismiss="modal"><?php echo Yii::t('SpaceModule.widgets_views_profileHeader', 'Close'); ?></button>'> |
103 | 103 | <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?> |
104 | 104 | </a> |
105 | - <?php else : ?> |
|
106 | - <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?> |
|
105 | + <?php else { |
|
106 | + : ?> |
|
107 | + <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); |
|
108 | +} |
|
109 | +?> |
|
107 | 110 | <?php endif; ?> |
108 | 111 | |
109 | 112 | <!-- check if the current user is the profile owner and can change the images --> |
@@ -38,7 +38,7 @@ |
||
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;')); ?> |
@@ -5,11 +5,11 @@ discard block |
||
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 |
||
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 |