| @@ -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> | 
| @@ -13,15 +13,15 @@ discard block | ||
| 13 | 13 | <div class="post-files" id="post-files-<?php echo $object->getUniqueId(); ?>"> | 
| 14 | 14 | <?php foreach ($files as $file): ?> | 
| 15 | 15 | <?php if ($previewImage->applyFile($file)): ?> | 
| 16 | - <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" href="<?= $file->getUrl(); ?>#.jpeg" title="<?= Html::encode($file->file_name) ?>"> | |
| 16 | + <a data-ui-gallery="<?= "gallery-".$object->getUniqueId(); ?>" href="<?= $file->getUrl(); ?>#.jpeg" title="<?= Html::encode($file->file_name) ?>"> | |
| 17 | 17 | <?= $previewImage->render(); ?> | 
| 18 | 18 | </a> | 
| 19 | - <?php elseif(FileHelper::getExtension($file->file_name) == 'mp4'): ?> | |
| 20 | - <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" type="video/mp4" href="<?= $file->getUrl(); ?>#.mp4" title="<?= Html::encode($file->file_name) ?>"> | |
| 19 | + <?php elseif (FileHelper::getExtension($file->file_name) == 'mp4'): ?> | |
| 20 | + <a data-ui-gallery="<?= "gallery-".$object->getUniqueId(); ?>" type="video/mp4" href="<?= $file->getUrl(); ?>#.mp4" title="<?= Html::encode($file->file_name) ?>"> | |
| 21 | 21 | <video src="<?= $file->getUrl() ?>" height="130" /> | 
| 22 | 22 | </a> | 
| 23 | - <?php elseif(FileHelper::getExtension($file->file_name) == 'ogv'): ?> | |
| 24 | - <a data-ui-gallery="<?= "gallery-" . $object->getUniqueId(); ?>" type="video/ogg" href="<?= $file->getUrl(); ?>#.ogv" title="<?= Html::encode($file->file_name) ?>"> | |
| 23 | + <?php elseif (FileHelper::getExtension($file->file_name) == 'ogv'): ?> | |
| 24 | + <a data-ui-gallery="<?= "gallery-".$object->getUniqueId(); ?>" type="video/ogg" href="<?= $file->getUrl(); ?>#.ogv" title="<?= Html::encode($file->file_name) ?>"> | |
| 25 | 25 | <video src="<?= $file->getUrl() ?>" height="130" /> | 
| 26 | 26 | </a> | 
| 27 | 27 | <?php endif; ?> | 
| @@ -46,7 +46,7 @@ discard block | ||
| 46 | 46 | <?= \humhub\modules\file\widgets\FilePreview::widget([ | 
| 47 | 47 | 'hideImageFileInfo' => $hideImageFileInfo, | 
| 48 | 48 | 'model' => $object, | 
| 49 | - ]);?> | |
| 49 | + ]); ?> | |
| 50 | 50 | |
| 51 | 51 | </div> | 
| 52 | 52 | <?php endif; ?> | 
| @@ -26,9 +26,9 @@ | ||
| 26 | 26 | |
| 27 | 27 | "; | 
| 28 | 28 | ?> | 
| 29 | -		<?= Html::a('<i class="fa fa-facebook" style="font-size:16px;color:#3a5795"> </i>', 'https://www.facebook.com/sharer/sharer.php?u=' . urlencode($permalink) . '&description=' . urlencode($object->getContentDescription()),['onclick'=> $option]);?> | |
| 30 | -		<?= Html::a('<i class="fa fa-twitter" style="font-size:16px;color:#55acee"> </i> </i>', 'https://twitter.com/intent/tweet?text=' . urlencode($object->getContentDescription()) . '&url=' . urlencode($permalink),['onclick'=> $option]);?> | |
| 31 | -		<?= Html::a('<i class="fa fa-linkedin-square" style="font-size:16px;color:#0177b5"></i>', 'https://www.linkedin.com/shareArticle?summary=&mini=true&source=&title=' . urlencode($object->getContentDescription()) . '&url=' . urlencode($permalink) . '&ro=false', ['onclick'=> $option]);?> | |
| 29 | +		<?= Html::a('<i class="fa fa-facebook" style="font-size:16px;color:#3a5795"> </i>', 'https://www.facebook.com/sharer/sharer.php?u='.urlencode($permalink).'&description='.urlencode($object->getContentDescription()), ['onclick'=> $option]); ?> | |
| 30 | +		<?= Html::a('<i class="fa fa-twitter" style="font-size:16px;color:#55acee"> </i> </i>', 'https://twitter.com/intent/tweet?text='.urlencode($object->getContentDescription()).'&url='.urlencode($permalink), ['onclick'=> $option]); ?> | |
| 31 | +		<?= Html::a('<i class="fa fa-linkedin-square" style="font-size:16px;color:#0177b5"></i>', 'https://www.linkedin.com/shareArticle?summary=&mini=true&source=&title='.urlencode($object->getContentDescription()).'&url='.urlencode($permalink).'&ro=false', ['onclick'=> $option]); ?> | |
| 32 | 32 | </div> | 
| 33 | 33 | </div> | 
| 34 | 34 | </div> | 
| @@ -4,16 +4,16 @@ | ||
| 4 | 4 | <div class="panel panel-default panel-tour" id="getting-started-panel"> | 
| 5 | 5 | <?php | 
| 6 | 6 | // Temporary workaround till panel widget rewrite in 0.10 verion | 
| 7 | - $removeOptionHtml = "<li>" . \humhub\widgets\ModalConfirm::widget(array( | |
| 7 | + $removeOptionHtml = "<li>".\humhub\widgets\ModalConfirm::widget(array( | |
| 8 | 8 | 'uniqueID' => 'hide-panel-button', | 
| 9 | 9 |                  'title' => Yii::t('TourModule.widgets_views_tourPanel', '<strong>Remove</strong> tour panel'), | 
| 10 | 10 |                  'message' => Yii::t('TourModule.widgets_views_tourPanel', 'This action will remove the tour panel from your dashboard. You can reactivate it at<br>Account settings <i class="fa fa-caret-right"></i> Settings.'), | 
| 11 | 11 |                  'buttonTrue' => Yii::t('TourModule.widgets_views_tourPanel', 'Ok'), | 
| 12 | 12 |                  'buttonFalse' => Yii::t('TourModule.widgets_views_tourPanel', 'Cancel'), | 
| 13 | -                'linkContent' => '<i class="fa fa-eye-slash"></i> ' . Yii::t('TourModule.widgets_views_tourPanel', ' Remove panel'), | |
| 13 | +                'linkContent' => '<i class="fa fa-eye-slash"></i> '.Yii::t('TourModule.widgets_views_tourPanel', ' Remove panel'), | |
| 14 | 14 | 'linkHref' => Url::to(["/tour/tour/hide-panel", "ajax" => 1]), | 
| 15 | 15 |                  'confirmJS' => '$(".panel-tour").slideToggle("slow")' | 
| 16 | - ), true) . "</li>"; | |
| 16 | + ), true)."</li>"; | |
| 17 | 17 | ?> | 
| 18 | 18 | |
| 19 | 19 | <!-- Display panel menu widget --> |