@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | <?= Html::hiddenInput('contentId', $contentId); ?> |
12 | 12 | |
13 | 13 | <?= |
14 | - humhub\widgets\RichtextField::widget([ |
|
14 | + humhub\widgets\RichtextField::widget([ |
|
15 | 15 | 'id' => 'comment_input_'.$comment->id, |
16 | 16 | 'placeholder' => Yii::t('CommentModule.views_edit', 'Edit your comment...'), |
17 | 17 | 'model' => $comment, |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | <div id="comment_upload_progress_<?= $comment->id ?>" style="display:none; margin:10px 0;"></div> |
47 | 47 | |
48 | 48 | <?= |
49 | - \humhub\modules\file\widgets\FilePreview::widget([ |
|
49 | + \humhub\modules\file\widgets\FilePreview::widget([ |
|
50 | 50 | 'id' => 'comment_upload_preview_'.$comment->id, |
51 | 51 | 'options' => ['style' => 'margin-top:10px'], |
52 | 52 | 'model' => $comment, |
@@ -12,7 +12,7 @@ discard block |
||
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 |
||
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 |
||
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 |
@@ -27,11 +27,17 @@ |
||
27 | 27 | |
28 | 28 | <?php if (AuthChoice::hasClients()): ?> |
29 | 29 | <?= AuthChoice::widget([]) ?> |
30 | - <?php else: ?> |
|
30 | + <?php else { |
|
31 | + : ?> |
|
31 | 32 | <?php if ($canRegister) : ?> |
32 | - <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p> |
|
33 | - <?php else: ?> |
|
34 | - <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); ?></p> |
|
33 | + <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); |
|
34 | +} |
|
35 | +?></p> |
|
36 | + <?php else { |
|
37 | + : ?> |
|
38 | + <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); |
|
39 | +} |
|
40 | +?></p> |
|
35 | 41 | <?php endif; ?> |
36 | 42 | <?php endif; ?> |
37 | 43 |
@@ -36,11 +36,17 @@ |
||
36 | 36 | |
37 | 37 | <?php if (AuthChoice::hasClients()): ?> |
38 | 38 | <?= AuthChoice::widget([]) ?> |
39 | - <?php else: ?> |
|
39 | + <?php else { |
|
40 | + : ?> |
|
40 | 41 | <?php if ($canRegister) : ?> |
41 | - <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p> |
|
42 | - <?php else: ?> |
|
43 | - <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); ?></p> |
|
42 | + <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); |
|
43 | +} |
|
44 | +?></p> |
|
45 | + <?php else { |
|
46 | + : ?> |
|
47 | + <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); |
|
48 | +} |
|
49 | +?></p> |
|
44 | 50 | <?php endif; ?> <?php endif; ?> |
45 | 51 | |
46 | 52 | <?php $form = ActiveForm::begin(['enableClientValidation' => false]); ?> |
@@ -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="<?= 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="<?= 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> |
@@ -101,9 +101,12 @@ |
||
101 | 101 | src="<?= $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="<?= $user->getProfileImage()->getUrl(); ?>" |
|
107 | + src="<?= $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 |
@@ -8,18 +8,24 @@ discard block |
||
8 | 8 | <a href="#" class="btn btn-enter" data-action-click="ui.modal.load" data-action-url="<?= Url::toRoute('/user/auth/login'); ?>"> |
9 | 9 | <?php if (Yii::$app->getModule('user')->settings->get('auth.anonymousRegistration')): ?> |
10 | 10 | <?= Yii::t('UserModule.base', 'Sign in / up'); ?> |
11 | - <?php else: ?> |
|
12 | - <?= Yii::t('UserModule.base', 'Sign in'); ?> |
|
11 | + <?php else { |
|
12 | + : ?> |
|
13 | + <?= Yii::t('UserModule.base', 'Sign in'); |
|
14 | +} |
|
15 | +?> |
|
13 | 16 | <?php endif; ?> |
14 | 17 | </a> |
15 | -<?php else: ?> |
|
18 | +<?php else { |
|
19 | + : ?> |
|
16 | 20 | <ul class="nav"> |
17 | 21 | <li class="dropdown account"> |
18 | 22 | <a href="#" id="account-dropdown-link" class="dropdown-toggle" data-toggle="dropdown"> |
19 | 23 | |
20 | 24 | <?php if ($this->context->showUserName): ?> |
21 | 25 | <div class="user-title pull-left hidden-xs"> |
22 | - <strong><?= Html::encode(Yii::$app->user->getIdentity()->displayName); ?></strong><br/><span class="truncate"><?= Html::encode(Yii::$app->user->getIdentity()->profile->title); ?></span> |
|
26 | + <strong><?= Html::encode(Yii::$app->user->getIdentity()->displayName); |
|
27 | +} |
|
28 | +?></strong><br/><span class="truncate"><?= Html::encode(Yii::$app->user->getIdentity()->profile->title); ?></span> |
|
23 | 29 | </div> |
24 | 30 | <?php endif; ?> |
25 | 31 | |
@@ -34,9 +40,12 @@ discard block |
||
34 | 40 | <?php foreach ($this->context->getItems() as $item): ?> |
35 | 41 | <?php if ($item['label'] == '---'): ?> |
36 | 42 | <li class="divider"></li> |
37 | - <?php else: ?> |
|
43 | + <?php else { |
|
44 | + : ?> |
|
38 | 45 | <li> |
39 | - <a <?= isset($item['id']) ? 'id="' . $item['id'] . '"' : '' ?> href="<?= $item['url']; ?>" <?= isset($item['pjax']) && $item['pjax'] === false ? 'data-pjax-prevent' : '' ?>> |
|
46 | + <a <?= isset($item['id']) ? 'id="' . $item['id'] . '"' : '' ?> href="<?= $item['url']; |
|
47 | +} |
|
48 | +?>" <?= isset($item['pjax']) && $item['pjax'] === false ? 'data-pjax-prevent' : '' ?>> |
|
40 | 49 | <?= $item['icon'] . ' ' . $item['label']; ?> |
41 | 50 | </a> |
42 | 51 | </li> |
@@ -18,8 +18,11 @@ |
||
18 | 18 | <p><?= Yii::t('UserModule.views_auth_createAccount_success', 'After activating your account by the administrator, you will receive a notification by email.'); ?></p> |
19 | 19 | <br> |
20 | 20 | <a href="<?= Url::home() ?>" class="btn btn-primary" data-ui-loader><?= Yii::t('UserModule.views_auth_createAccount_success', 'back to home') ?></a> |
21 | - <?php else: ?> |
|
22 | - <p><?= Yii::t('UserModule.views_auth_createAccount_success', 'To log in with your new account, click the button below.'); ?></p> |
|
21 | + <?php else { |
|
22 | + : ?> |
|
23 | + <p><?= Yii::t('UserModule.views_auth_createAccount_success', 'To log in with your new account, click the button below.'); |
|
24 | +} |
|
25 | +?></p> |
|
23 | 26 | <br> |
24 | 27 | <a href="<?= Url::home() ?>" |
25 | 28 | class="btn btn-primary" data-ui-loader><?= Yii::t('UserModule.views_auth_createAccount_success', 'Go to login page') ?></a> |
@@ -8,8 +8,11 @@ discard block |
||
8 | 8 | <?php $this->beginContent('@user/views/account/_userProfileLayout.php') ?> |
9 | 9 | <?php if ($isSpaceOwner) : ?> |
10 | 10 | <?= 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.'); ?> |
11 | -<?php else: ?> |
|
12 | - <?= Yii::t('UserModule.views_account_delete', 'Are you sure, that you want to delete your account?<br />All your published content will be removed! '); ?> |
|
11 | +<?php else { |
|
12 | + : ?> |
|
13 | + <?= Yii::t('UserModule.views_account_delete', 'Are you sure, that you want to delete your account?<br />All your published content will be removed! '); |
|
14 | +} |
|
15 | +?> |
|
13 | 16 | <br /> |
14 | 17 | <br /> |
15 | 18 | |
@@ -17,8 +20,11 @@ discard block |
||
17 | 20 | |
18 | 21 | <?php if ($model->isAttributeRequired('currentPassword')): ?> |
19 | 22 | <?= $form->field($model, 'currentPassword')->passwordInput(['maxlength' => 45, 'placeholder' => Yii::t('UserModule.views_account_delete', 'Enter your password to continue')])->label(false); ?> |
20 | - <?php else: ?> |
|
21 | - <?= $form->field($model, 'currentPassword')->hiddenInput()->label(false); ?> |
|
23 | + <?php else { |
|
24 | + : ?> |
|
25 | + <?= $form->field($model, 'currentPassword')->hiddenInput()->label(false); |
|
26 | +} |
|
27 | +?> |
|
22 | 28 | <?php endif; ?> |
23 | 29 | |
24 | 30 | <?= Html::submitButton(Yii::t('UserModule.views_account_delete', 'Delete account'), array('class' => 'btn btn-danger', 'data-ui-loader' => '')); ?> |
@@ -27,8 +27,11 @@ |
||
27 | 27 | <?= 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 | <?= 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 | - <?= 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 | + <?= 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> |
@@ -38,14 +38,20 @@ |
||
38 | 38 | <div class="col-sm-9"> |
39 | 39 | <p class="form-control-static"><?= RichText::widget(['text' => $field->getUserValue($user, true)]); ?></p> |
40 | 40 | </div> |
41 | - <?php else: ?> |
|
41 | + <?php else { |
|
42 | + : ?> |
|
42 | 43 | <div class="col-sm-9"> |
43 | 44 | <?php if ($field->field_type_class == MarkdownEditor::className()): ?> |
44 | 45 | <p class="form-control-static" style="min-height: 0 !important;padding-top:0;"> |
45 | - <?= MarkdownView::widget(['markdown' => $field->getUserValue($user, false)]); ?> |
|
46 | + <?= MarkdownView::widget(['markdown' => $field->getUserValue($user, false)]); |
|
47 | +} |
|
48 | +?> |
|
46 | 49 | </p> |
47 | - <?php else: ?> |
|
48 | - <p class="form-control-static"><?= $field->getUserValue($user, false); ?></p> |
|
50 | + <?php else { |
|
51 | + : ?> |
|
52 | + <p class="form-control-static"><?= $field->getUserValue($user, false); |
|
53 | +} |
|
54 | +?></p> |
|
49 | 55 | <?php endif; ?> |
50 | 56 | </div> |
51 | 57 | <?php endif; ?> |