@@ -25,9 +25,9 @@ |
||
25 | 25 | |
26 | 26 | "; |
27 | 27 | ?> |
28 | - <?php echo 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]);?> |
|
29 | - <?php echo 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]);?> |
|
30 | - <?php echo 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]);?> |
|
28 | + <?php echo 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]); ?> |
|
29 | + <?php echo 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]); ?> |
|
30 | + <?php echo 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]); ?> |
|
31 | 31 | </div> |
32 | 32 | </div> |
33 | 33 | </div> |
@@ -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 |