@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | <?php if ($canWrite): ?> |
| 25 | 25 | <li> |
| 26 | 26 | <?= |
| 27 | - AjaxButton::widget([ |
|
| 27 | + AjaxButton::widget([ |
|
| 28 | 28 | 'label' => '<i class="fa fa-pencil"></i> '.Yii::t('CommentModule.widgets_views_showComment', 'Edit'), |
| 29 | 29 | 'ajaxOptions' => [ |
| 30 | 30 | 'type' => 'POST', |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | <!-- load modal confirm widget --> |
| 45 | 45 | <?= |
| 46 | - humhub\widgets\ModalConfirm::widget(array( |
|
| 46 | + humhub\widgets\ModalConfirm::widget(array( |
|
| 47 | 47 | 'uniqueID' => 'modal_commentdelete_'.$comment->id, |
| 48 | 48 | 'linkOutput' => 'a', |
| 49 | 49 | 'title' => Yii::t('CommentModule.widgets_views_showComment', '<strong>Confirm</strong> comment deleting'), |
@@ -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 | |
@@ -35,11 +35,17 @@ |
||
| 35 | 35 | |
| 36 | 36 | <?php if (AuthChoice::hasClients()): ?> |
| 37 | 37 | <?= AuthChoice::widget([]) ?> |
| 38 | - <?php else: ?> |
|
| 38 | + <?php else { |
|
| 39 | + : ?> |
|
| 39 | 40 | <?php if ($canRegister) : ?> |
| 40 | - <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); ?></p> |
|
| 41 | - <?php else: ?> |
|
| 42 | - <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); ?></p> |
|
| 41 | + <p><?= Yii::t('UserModule.views_auth_login', "If you're already a member, please login with your username/email and password."); |
|
| 42 | +} |
|
| 43 | +?></p> |
|
| 44 | + <?php else { |
|
| 45 | + : ?> |
|
| 46 | + <p><?= Yii::t('UserModule.views_auth_login', "Please login with your username/email and password."); |
|
| 47 | +} |
|
| 48 | +?></p> |
|
| 43 | 49 | <?php endif; ?> <?php endif; ?> |
| 44 | 50 | |
| 45 | 51 | <?php $form = ActiveForm::begin(['enableClientValidation' => false]); ?> |
@@ -16,9 +16,12 @@ |
||
| 16 | 16 | <div class="col-md-10 layout-content-container"> |
| 17 | 17 | <?php echo $content; ?> |
| 18 | 18 | </div> |
| 19 | - <?php else: ?> |
|
| 19 | + <?php else { |
|
| 20 | + : ?> |
|
| 20 | 21 | <div class="col-md-7 layout-content-container"> |
| 21 | - <?php echo $content; ?> |
|
| 22 | + <?php echo $content; |
|
| 23 | +} |
|
| 24 | +?> |
|
| 22 | 25 | </div> |
| 23 | 26 | <div class="col-md-3 layout-sidebar-container"> |
| 24 | 27 | <?php |
@@ -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> |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | </div> |
| 37 | 37 | <div class="col-md-3 layout-sidebar-container"> |
| 38 | 38 | <?= |
| 39 | - \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [ |
|
| 39 | + \humhub\modules\space\widgets\Sidebar::widget(['space' => $space, 'widgets' => [ |
|
| 40 | 40 | [\humhub\modules\activity\widgets\Stream::className(), ['streamAction' => '/space/space/stream', 'contentContainer' => $space], ['sortOrder' => 10]], |
| 41 | 41 | [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]], |
| 42 | 42 | [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]] |
@@ -27,7 +27,8 @@ discard block |
||
| 27 | 27 | 'content' => $content |
| 28 | 28 | ]) ?> |
| 29 | 29 | </div> |
| 30 | - <?php else: ?> |
|
| 30 | + <?php else { |
|
| 31 | + : ?> |
|
| 31 | 32 | <div class="col-md-7 layout-content-container"> |
| 32 | 33 | <?= \humhub\modules\space\widgets\SpaceContent::widget([ |
| 33 | 34 | 'contentContainer' => $space, |
@@ -41,6 +42,7 @@ discard block |
||
| 41 | 42 | [\humhub\modules\space\modules\manage\widgets\PendingApprovals::className(), ['space' => $space], ['sortOrder' => 20]], |
| 42 | 43 | [\humhub\modules\space\widgets\Members::className(), ['space' => $space], ['sortOrder' => 30]] |
| 43 | 44 | ]]); |
| 45 | +} |
|
| 44 | 46 | ?> |
| 45 | 47 | </div> |
| 46 | 48 | <?php endif; ?> |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | |
| 68 | 68 | <div class="notifications pull-right"> |
| 69 | 69 | <?= |
| 70 | - \humhub\widgets\NotificationArea::widget(['widgets' => [ |
|
| 70 | + \humhub\widgets\NotificationArea::widget(['widgets' => [ |
|
| 71 | 71 | [\humhub\modules\notification\widgets\Overview::className(), [], ['sortOrder' => 10]], |
| 72 | 72 | ]]); |
| 73 | 73 | ?> |
@@ -97,8 +97,11 @@ |
||
| 97 | 97 | <!-- start: show content (and check, if exists a sublayout --> |
| 98 | 98 | <?php if (isset($this->context->subLayout) && $this->context->subLayout != "") : ?> |
| 99 | 99 | <?= $this->render($this->context->subLayout, array('content' => $content)); ?> |
| 100 | - <?php else: ?> |
|
| 101 | - <?= $content; ?> |
|
| 100 | + <?php else { |
|
| 101 | + : ?> |
|
| 102 | + <?= $content; |
|
| 103 | +} |
|
| 104 | +?> |
|
| 102 | 105 | <?php endif; ?> |
| 103 | 106 | <!-- end: show content --> |
| 104 | 107 | |
@@ -23,7 +23,10 @@ |
||
| 23 | 23 | id="img-logo"/> |
| 24 | 24 | </a> |
| 25 | 25 | <br> |
| 26 | - <?php else: ?> |
|
| 27 | - <h1 id="app-title" class="animated fadeIn"><?= Html::encode(Yii::$app->name); ?></h1> |
|
| 26 | + <?php else { |
|
| 27 | + : ?> |
|
| 28 | + <h1 id="app-title" class="animated fadeIn"><?= Html::encode(Yii::$app->name); |
|
| 29 | +} |
|
| 30 | +?></h1> |
|
| 28 | 31 | <?php endif; ?> |
| 29 | 32 | <?php endif; ?> |
@@ -10,14 +10,17 @@ |
||
| 10 | 10 | <?php if (Yii::$app->user->isGuest): ?> |
| 11 | 11 | |
| 12 | 12 | <?php echo Html::a(Yii::t('LikeModule.widgets_views_likeLink', 'Like'), Yii::$app->user->loginUrl, ['data-target' => '#globalModal']); ?> |
| 13 | - <?php else: ?> |
|
| 13 | + <?php else { |
|
| 14 | + : ?> |
|
| 14 | 15 | <a href="#" data-action-click="like.toggleLike" data-action-url="<?= $likeUrl ?>" class="like likeAnchor" style="<?= (!$currentUserLiked) ? '' : 'display:none'?>"> |
| 15 | 16 | <?= Yii::t('LikeModule.widgets_views_likeLink', 'Like') ?> |
| 16 | 17 | </a> |
| 17 | 18 | <a href="#" data-action-click="like.toggleLike" data-action-url="<?= $unlikeUrl ?>" class="unlike likeAnchor" style="<?= ($currentUserLiked) ? '' : 'display:none'?>"> |
| 18 | 19 | <?= Yii::t('LikeModule.widgets_views_likeLink', 'Unlike') ?> |
| 19 | 20 | </a> |
| 20 | - <?php endif; ?> |
|
| 21 | + <?php endif; |
|
| 22 | +} |
|
| 23 | +?> |
|
| 21 | 24 | |
| 22 | 25 | <?php if (count($likes) > 0) { ?> |
| 23 | 26 | <!-- Create link to show all users, who liked this --> |