@@ -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> |
@@ -27,8 +27,11 @@ |
||
27 | 27 | <?php echo Html::a(Yii::t('UserModule.base', 'Currently in use'), '#', ['class' => 'btn btn-default btn-sm', 'data-method' => 'POST', 'disabled' => 'disabled']); ?> |
28 | 28 | <?php elseif (in_array($client->getId(), $activeAuthClientIds)) : ?> |
29 | 29 | <?php echo Html::a(Yii::t('UserModule.base', 'Disconnect account'), ['connected-accounts', 'disconnect' => $client->getId()], ['class' => 'btn btn-danger btn-sm', 'data-method' => 'POST']); ?> |
30 | - <?php else: ?> |
|
31 | - <?php echo Html::a(Yii::t('UserModule.base', 'Connect account'), Url::to(['/user/auth/external', 'authclient' => $client->getId()]), ['class' => 'btn btn-success btn-sm']); ?> |
|
30 | + <?php else { |
|
31 | + : ?> |
|
32 | + <?php echo Html::a(Yii::t('UserModule.base', 'Connect account'), Url::to(['/user/auth/external', 'authclient' => $client->getId()]), ['class' => 'btn btn-success btn-sm']); |
|
33 | +} |
|
34 | +?> |
|
32 | 35 | <?php endif; ?> |
33 | 36 | </td> |
34 | 37 | </tr> |
@@ -7,8 +7,11 @@ discard block |
||
7 | 7 | <?php $this->beginContent('@user/views/account/_userProfileLayout.php') ?> |
8 | 8 | <?php if ($isSpaceOwner) : ?> |
9 | 9 | <?php echo Yii::t('UserModule.views_account_delete', 'Sorry, as an owner of a workspace you are not able to delete your account!<br />Please assign another owner or delete them.'); ?> |
10 | -<?php else: ?> |
|
11 | - <?php echo Yii::t('UserModule.views_account_delete', 'Are you sure, that you want to delete your account?<br />All your published content will be removed! '); ?> |
|
10 | +<?php else { |
|
11 | + : ?> |
|
12 | + <?php echo Yii::t('UserModule.views_account_delete', 'Are you sure, that you want to delete your account?<br />All your published content will be removed! '); |
|
13 | +} |
|
14 | +?> |
|
12 | 15 | <br /> |
13 | 16 | <br /> |
14 | 17 | |
@@ -16,8 +19,11 @@ discard block |
||
16 | 19 | |
17 | 20 | <?php if ($model->isAttributeRequired('currentPassword')): ?> |
18 | 21 | <?php echo $form->field($model, 'currentPassword')->passwordInput(['maxlength' => 45, 'placeholder' => Yii::t('UserModule.views_account_delete', 'Enter your password to continue')])->label(false); ?> |
19 | - <?php else: ?> |
|
20 | - <?php echo $form->field($model, 'currentPassword')->hiddenInput()->label(false); ?> |
|
22 | + <?php else { |
|
23 | + : ?> |
|
24 | + <?php echo $form->field($model, 'currentPassword')->hiddenInput()->label(false); |
|
25 | +} |
|
26 | +?> |
|
21 | 27 | <?php endif; ?> |
22 | 28 | |
23 | 29 | <?php echo Html::submitButton(Yii::t('UserModule.views_account_delete', 'Delete account'), array('class' => 'btn btn-danger', 'data-ui-loader' => '')); ?> |
@@ -5,10 +5,8 @@ |
||
5 | 5 | 'contentContainer' => $user, |
6 | 6 | 'streamAction' => '//user/profile/stream', |
7 | 7 | 'messageStreamEmpty' => ($user->permissionManager->can(new \humhub\modules\post\permissions\CreatePost())) ? |
8 | - Yii::t('UserModule.views_profile_index', '<b>Your profile stream is still empty</b><br>Get started and post something...') : |
|
9 | - Yii::t('UserModule.views_profile_index', '<b>This profile stream is still empty!</b>'), |
|
8 | + Yii::t('UserModule.views_profile_index', '<b>Your profile stream is still empty</b><br>Get started and post something...') : Yii::t('UserModule.views_profile_index', '<b>This profile stream is still empty!</b>'), |
|
10 | 9 | 'messageStreamEmptyCss' => ($user->permissionManager->can(new \humhub\modules\post\permissions\CreatePost())) ? |
11 | - 'placeholder-empty-stream' : |
|
12 | - '', |
|
10 | + 'placeholder-empty-stream' : '', |
|
13 | 11 | )); |
14 | 12 | ?> |
@@ -101,9 +101,12 @@ |
||
101 | 101 | src="<?php echo $user->getProfileImage()->getUrl(); ?>" |
102 | 102 | data-src="holder.js/140x140" alt="140x140" style="width: 140px; height: 140px;"/> |
103 | 103 | </a> |
104 | - <?php else : ?> |
|
104 | + <?php else { |
|
105 | + : ?> |
|
105 | 106 | <img class="img-rounded profile-user-photo" id="user-profile-image" |
106 | - src="<?php echo $user->getProfileImage()->getUrl(); ?>" |
|
107 | + src="<?php echo $user->getProfileImage()->getUrl(); |
|
108 | +} |
|
109 | +?>" |
|
107 | 110 | data-src="holder.js/140x140" alt="140x140" style="width: 140px; height: 140px;"/> |
108 | 111 | <?php endif; ?> |
109 | 112 |
@@ -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 (!$user->getProfileBannerImage()->hasImage()) { |
|
71 | - echo 'display: none;'; |
|
72 | - } |
|
73 | - ?>" |
|
70 | + if (!$user->getProfileBannerImage()->hasImage()) { |
|
71 | + echo 'display: none;'; |
|
72 | + } |
|
73 | + ?>" |
|
74 | 74 | href="<?php echo Url::to(['/user/image/crop', 'userGuid' => $user->guid, 'type' => ImageController::TYPE_PROFILE_BANNER_IMAGE]); ?>" |
75 | 75 | class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i |
76 | 76 | class="fa fa-edit"></i></a> |
@@ -128,10 +128,10 @@ discard block |
||
128 | 128 | class="fa fa-cloud-upload"></i></a> |
129 | 129 | <a id="profile-image-upload-edit-button" |
130 | 130 | style="<?php |
131 | - if (!$user->getProfileImage()->hasImage()) { |
|
132 | - echo 'display: none;'; |
|
133 | - } |
|
134 | - ?>" |
|
131 | + if (!$user->getProfileImage()->hasImage()) { |
|
132 | + echo 'display: none;'; |
|
133 | + } |
|
134 | + ?>" |
|
135 | 135 | href="<?php echo Url::to(['/user/image/crop', 'userGuid' => $user->guid, 'type' => ImageController::TYPE_PROFILE_IMAGE]); ?>" |
136 | 136 | class="btn btn-info btn-sm" data-target="#globalModal" data-backdrop="static"><i |
137 | 137 | class="fa fa-edit"></i></a> |
@@ -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"> |
@@ -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> |
@@ -101,8 +101,11 @@ |
||
101 | 101 | <a data-ui-gallery="spaceHeader" href="<?= $space->profileImage->getUrl('_org'); ?>"> |
102 | 102 | <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?> |
103 | 103 | </a> |
104 | - <?php else : ?> |
|
105 | - <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); ?> |
|
104 | + <?php else { |
|
105 | + : ?> |
|
106 | + <?php echo \humhub\modules\space\widgets\Image::widget(['space' => $space, 'width' => 140]); |
|
107 | +} |
|
108 | +?> |
|
106 | 109 | <?php endif; ?> |
107 | 110 | |
108 | 111 | <!-- check if the current user is the profile owner and can change the images --> |