@@ -14,13 +14,13 @@ discard block |
||
14 | 14 | $this->title = __('User list'); |
15 | 15 | |
16 | 16 | if ($id === 'all') { |
17 | - $this->title .= ': ' . __('All'); |
|
17 | + $this->title .= ': '.__('All'); |
|
18 | 18 | } elseif ($id === 'rating') { |
19 | - $this->title .= ': ' . __('Rating'); |
|
19 | + $this->title .= ': '.__('Rating'); |
|
20 | 20 | } elseif ($id === 'city') { |
21 | - $this->title .= ': ' . __('City') . ' ' . \App::$Security->strip_tags($add); |
|
21 | + $this->title .= ': '.__('City').' '.\App::$Security->strip_tags($add); |
|
22 | 22 | } elseif ($id === 'hobby') { |
23 | - $this->title .= ': ' . __('Hobby') . ' ' . \App::$Security->strip_tags($add); |
|
23 | + $this->title .= ': '.__('Hobby').' '.\App::$Security->strip_tags($add); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | $this->breadcrumbs = [ |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | |
36 | 36 | <?php |
37 | 37 | if ($records === null || $records->count() < 1) { |
38 | - echo '<div class="alert alert-danger">' . __('Users are not founded!') . '</div>'; |
|
38 | + echo '<div class="alert alert-danger">'.__('Users are not founded!').'</div>'; |
|
39 | 39 | return; |
40 | 40 | } |
41 | 41 | ?> |
@@ -50,13 +50,13 @@ discard block |
||
50 | 50 | <h3> |
51 | 51 | <?= Url::link( |
52 | 52 | ['profile/show', $profile->user_id], |
53 | - (Str::likeEmpty($profile->nick) ? __('No name') . '(id' . $profile->user_id . ')' : $profile->nick), |
|
54 | - ['style' => 'color: ' . $profile->user->role->color] |
|
53 | + (Str::likeEmpty($profile->nick) ? __('No name').'(id'.$profile->user_id.')' : $profile->nick), |
|
54 | + ['style' => 'color: '.$profile->user->role->color] |
|
55 | 55 | ) ?> |
56 | 56 | </h3> |
57 | 57 | <p><?= __('Registered') ?>: <?= Date::convertToDatetime($profile->created_at, Date::FORMAT_TO_DAY) ?></p> |
58 | 58 | <?php if (\App::$User->identity() !== null && $profile->user_id !== \App::$User->identity()->getId()): ?> |
59 | - <?= Url::link(['profile/messages', null, null, ['newdialog' => $profile->user_id]], '<i class="glyphicon glyphicon-envelope"></i> ' . __('New message'), ['class' => 'btn btn-info']) ?> |
|
59 | + <?= Url::link(['profile/messages', null, null, ['newdialog' => $profile->user_id]], '<i class="glyphicon glyphicon-envelope"></i> '.__('New message'), ['class' => 'btn btn-info']) ?> |
|
60 | 60 | <?php endif; ?> |
61 | 61 | </div> |
62 | 62 | <div class="col-md-2"> |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | // $user is a target profile depended object(not current user!!!) |
23 | 23 | |
24 | 24 | $name = $user->profile->getNickname(); |
25 | -$this->title = __('Profile') . ': ' . $name; |
|
25 | +$this->title = __('Profile').': '.$name; |
|
26 | 26 | |
27 | 27 | $this->breadcrumbs = [ |
28 | 28 | Url::to('/') => __('Home'), |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | <?php |
46 | 46 | if ($ratingOn): |
47 | 47 | $rateClass = 'btn-default'; |
48 | - $rateValue = (int)$user->profile->rating; |
|
48 | + $rateValue = (int) $user->profile->rating; |
|
49 | 49 | if ($user->profile->rating > 0) { |
50 | 50 | $rateClass = 'btn-info'; |
51 | 51 | } elseif ($user->profile->rating < 0) { |
@@ -83,20 +83,20 @@ discard block |
||
83 | 83 | $userMenu = null; |
84 | 84 | if (true === $isSelf) { |
85 | 85 | $userMenu = [ |
86 | - ['type' => 'link', 'link' => ['profile/feed'], 'text' => '<i class="glyphicon glyphicon-fire"></i> ' . __('Feed'), 'html' => true], |
|
87 | - ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="glyphicon glyphicon-camera"></i> ' . __('Avatar'), 'html' => true], |
|
88 | - ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="glyphicon glyphicon-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true], |
|
89 | - ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="glyphicon glyphicon-cog"></i> ' . __('Settings'), 'html' => true] |
|
86 | + ['type' => 'link', 'link' => ['profile/feed'], 'text' => '<i class="glyphicon glyphicon-fire"></i> '.__('Feed'), 'html' => true], |
|
87 | + ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="glyphicon glyphicon-camera"></i> '.__('Avatar'), 'html' => true], |
|
88 | + ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="glyphicon glyphicon-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true], |
|
89 | + ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="glyphicon glyphicon-cog"></i> '.__('Settings'), 'html' => true] |
|
90 | 90 | ]; |
91 | 91 | } elseif (\App::$User->isAuth()) { |
92 | 92 | $userMenu = [ |
93 | 93 | [ |
94 | 94 | 'type' => 'link', 'link' => Url::to('profile/messages', null, null, ['newdialog' => $user->id]), |
95 | - 'text' => '<i class="glyphicon glyphicon-envelope"></i> ' . __('Write message'), 'html' => true |
|
95 | + 'text' => '<i class="glyphicon glyphicon-envelope"></i> '.__('Write message'), 'html' => true |
|
96 | 96 | ], |
97 | 97 | [ |
98 | 98 | 'type' => 'link', 'link' => Url::to('profile/ignore', null, null, ['id' => $user->id]), |
99 | - 'text' => '<i class="glyphicon glyphicon-ban-circle"></i> ' . __('Block'), 'html' => true, 'property' => ['class' => 'alert-danger'] |
|
99 | + 'text' => '<i class="glyphicon glyphicon-ban-circle"></i> '.__('Block'), 'html' => true, 'property' => ['class' => 'alert-danger'] |
|
100 | 100 | ] |
101 | 101 | ]; |
102 | 102 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | foreach ($hobbyArray as $item) { |
177 | 177 | $item = \App::$Security->strip_tags($item); |
178 | 178 | if (!Str::likeEmpty($item)) { |
179 | - echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']) . ' '; |
|
179 | + echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']).' '; |
|
180 | 180 | } |
181 | 181 | } |
182 | 182 | ?> |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | <div class="text-right"><?= $form->submitButton(__('Send'), ['class' => 'btn btn-default']); ?></div> |
224 | 224 | <?= Ffcms\Widgets\Ckeditor\Ckeditor::widget(['targetClass' => 'wysiwyg', 'config' => 'config-small', 'jsConfig' => ['height' => '80']]); ?> |
225 | 225 | <?= $form->finish(); ?> |
226 | - <?php \App::$Alias->addPlainCode('js', "$('#" . $wall->getFormName() . "').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?> |
|
226 | + <?php \App::$Alias->addPlainCode('js', "$('#".$wall->getFormName()."').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?> |
|
227 | 227 | <?php endif; ?> |
228 | 228 | <?php |
229 | 229 | if ($wallRecords !== null): |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | <div class="col-xs-8 col-md-10"> |
240 | 240 | <h5 style="margin-top: 0;margin-bottom: 5px;"> |
241 | 241 | <i class="glyphicon glyphicon-user"></i> |
242 | - <?= Url::link(['profile/show', $post->sender_id], $post->senderUser->profile->getNickname(), ['style' => 'color: ' . $post->senderUser->role->color]) ?> |
|
242 | + <?= Url::link(['profile/show', $post->sender_id], $post->senderUser->profile->getNickname(), ['style' => 'color: '.$post->senderUser->role->color]) ?> |
|
243 | 243 | <small class="pull-right"><?= Date::humanize($post->updated_at); ?></small> |
244 | 244 | </h5> |
245 | 245 | <div class="object-text"> |
@@ -24,7 +24,7 @@ |
||
24 | 24 | <div class="row object-lightborder" id="wall-post-<?= $post->id ?>"> |
25 | 25 | <div class="col-xs-4 col-md-2"> |
26 | 26 | <div class="text-center"> |
27 | - <?= Url::link(['profile/show', $post->sender_id], $post->senderUser->profile->getNickname(), ['style' => 'color: ' . $post->senderUser->role->color]) ?> |
|
27 | + <?= Url::link(['profile/show', $post->sender_id], $post->senderUser->profile->getNickname(), ['style' => 'color: '.$post->senderUser->role->color]) ?> |
|
28 | 28 | <img class="img-responsive img-rounded" alt="Avatar of <?= $post->senderUser->profile->getNickname() ?>" src="<?= $post->senderUser->profile->getAvatarUrl('small') ?>" /> |
29 | 29 | <small><?= Date::humanize($post->updated_at); ?></small> |
30 | 30 | </div> |
@@ -33,7 +33,7 @@ |
||
33 | 33 | <?= $form->field('url', 'text', ['class' => 'form-control'], __('If you have your own homepage - enter url there')) ?> |
34 | 34 | <?php |
35 | 35 | foreach (ProfileField::all() as $custom) { |
36 | - echo $form->field('custom_data.' . $custom->id, 'text', ['class' => 'form-control']); |
|
36 | + echo $form->field('custom_data.'.$custom->id, 'text', ['class' => 'form-control']); |
|
37 | 37 | } |
38 | 38 | ?> |
39 | 39 |
@@ -32,7 +32,7 @@ |
||
32 | 32 | </div> |
33 | 33 | <?php |
34 | 34 | if ($model->items === null || count($model->items) < 1) { |
35 | - echo '<p class="alert alert-warning">' . __('No notifications available') . '</p>'; |
|
35 | + echo '<p class="alert alert-warning">'.__('No notifications available').'</p>'; |
|
36 | 36 | return; |
37 | 37 | } |
38 | 38 | ?> |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | <?php |
29 | 29 | if ($records === null || $records->count() < 1) { |
30 | - echo '<p class="alert alert-warning">' . __('Answers is not founded') . '</p>'; |
|
30 | + echo '<p class="alert alert-warning">'.__('Answers is not founded').'</p>'; |
|
31 | 31 | return; |
32 | 32 | } |
33 | 33 | $items = []; |
@@ -35,21 +35,21 @@ discard block |
||
35 | 35 | foreach ($records as $item) { |
36 | 36 | $commentObject = $item->getCommentPost(); |
37 | 37 | $message = Text::cut(\App::$Security->strip_tags($item->message), 0, 75); |
38 | - $moderate = (bool)$item->moderate; |
|
38 | + $moderate = (bool) $item->moderate; |
|
39 | 39 | if ($moderate) { |
40 | 40 | $moderateIsFound = true; |
41 | 41 | } |
42 | 42 | |
43 | 43 | $items[] = [ |
44 | 44 | 1 => ['text' => $item->id], |
45 | - 2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null) . Url::link(['comments/read', $commentObject->id, null, ['#' => '#answer-' . $item->id]], $message), 'html' => true], |
|
46 | - 3 => ['text' => Simplify::parseUserLink((int)$item->user_id, $item->guest_name, 'user/update'), 'html' => true], |
|
47 | - 4 => ['text' => '<a href="' . App::$Alias->scriptUrl . $commentObject->pathway . '" target="_blank">' . Str::sub($commentObject->pathway, 0, 20) . '...</a>', 'html' => true], |
|
45 | + 2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null).Url::link(['comments/read', $commentObject->id, null, ['#' => '#answer-'.$item->id]], $message), 'html' => true], |
|
46 | + 3 => ['text' => Simplify::parseUserLink((int) $item->user_id, $item->guest_name, 'user/update'), 'html' => true], |
|
47 | + 4 => ['text' => '<a href="'.App::$Alias->scriptUrl.$commentObject->pathway.'" target="_blank">'.Str::sub($commentObject->pathway, 0, 20).'...</a>', 'html' => true], |
|
48 | 48 | 5 => ['text' => Date::convertToDatetime($item->created_at, Date::FORMAT_TO_HOUR)], |
49 | - 6 => ['text' => Url::link(['comments/read', $commentObject->id], '<i class="fa fa-list fa-lg"></i>') . |
|
50 | - ' ' . Url::link(['comments/delete', 'answer', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'), |
|
49 | + 6 => ['text' => Url::link(['comments/read', $commentObject->id], '<i class="fa fa-list fa-lg"></i>'). |
|
50 | + ' '.Url::link(['comments/delete', 'answer', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'), |
|
51 | 51 | 'html' => true, 'property' => ['class' => 'text-center']], |
52 | - 'property' => ['class' => 'checkbox-row' . ($moderate !== false ? ' alert-warning' : null)] |
|
52 | + 'property' => ['class' => 'checkbox-row'.($moderate !== false ? ' alert-warning' : null)] |
|
53 | 53 | ]; |
54 | 54 | } |
55 | 55 |
@@ -11,4 +11,4 @@ |
||
11 | 11 | ['type' => 'link', 'text' => __('Answers list'), 'link' => ['comments/answerlist']], |
12 | 12 | ['type' => 'link', 'text' => __('Settings'), 'link' => ['comments/settings']] |
13 | 13 | ] |
14 | -]);?> |
|
15 | 14 | \ No newline at end of file |
15 | +]); ?> |
|
16 | 16 | \ No newline at end of file |
@@ -34,9 +34,9 @@ discard block |
||
34 | 34 | <span class="sr-only">Toggle Dropdown</span> |
35 | 35 | </button> |
36 | 36 | <ul class="dropdown-menu" role="menu"> |
37 | - <li><?= Url::link(['content/index', null, null, ['type' => 'all']], '<i class="fa fa-list"></i> ' . __('All')) ?></li> |
|
38 | - <li><?= Url::link(['content/index', null, null, ['type' => 'moderate']], '<i class="fa fa-exclamation"></i> ' . __('Moderate')) ?></li> |
|
39 | - <li><?= Url::link(['content/index', null, null, ['type' => 'trash']], '<i class="fa fa-trash"></i> ' . __('Trash')) ?></li> |
|
37 | + <li><?= Url::link(['content/index', null, null, ['type' => 'all']], '<i class="fa fa-list"></i> '.__('All')) ?></li> |
|
38 | + <li><?= Url::link(['content/index', null, null, ['type' => 'moderate']], '<i class="fa fa-exclamation"></i> '.__('Moderate')) ?></li> |
|
39 | + <li><?= Url::link(['content/index', null, null, ['type' => 'trash']], '<i class="fa fa-trash"></i> '.__('Trash')) ?></li> |
|
40 | 40 | <li> |
41 | 41 | <a class="trigger right-caret"><i class="fa fa-table"></i> <?= __('Categories') ?></a> |
42 | 42 | <ul class="dropdown-menu sub-menu"> |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | </div> |
51 | 51 | <?php |
52 | 52 | if ($type === 'trash') { |
53 | - echo Url::link(['content/clear'], '<i class="fa fa-minus"></i> ' . __('Remove all'), ['class' => 'btn btn-danger pull-right']); |
|
53 | + echo Url::link(['content/clear'], '<i class="fa fa-minus"></i> '.__('Remove all'), ['class' => 'btn btn-danger pull-right']); |
|
54 | 54 | } else { |
55 | - echo Url::link(['content/update', 0], '<i class="fa fa-plus"></i> ' . __('Add content'), ['class' => 'btn btn-primary pull-right']); |
|
55 | + echo Url::link(['content/update', 0], '<i class="fa fa-plus"></i> '.__('Add content'), ['class' => 'btn btn-primary pull-right']); |
|
56 | 56 | } |
57 | 57 | ?> |
58 | 58 | </div> |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | <?php |
62 | 62 | |
63 | 63 | if ($records->count() < 1) { |
64 | - echo '<p class="alert alert-warning">' . __('Content is not found') . '</p>'; |
|
64 | + echo '<p class="alert alert-warning">'.__('Content is not found').'</p>'; |
|
65 | 65 | return; |
66 | 66 | } |
67 | 67 | |
@@ -72,16 +72,16 @@ discard block |
||
72 | 72 | if ($content->getCategory() === null) { |
73 | 73 | continue; |
74 | 74 | } |
75 | - $frontLink = \App::$Alias->scriptUrl . '/content/read'; |
|
75 | + $frontLink = \App::$Alias->scriptUrl.'/content/read'; |
|
76 | 76 | $frontPath = null; |
77 | 77 | if (!Str::likeEmpty($content->getCategory()->path)) { |
78 | - $frontLink .= '/' . $content->getCategory()->path; |
|
79 | - $frontPath .= '/' . $content->getCategory()->path; |
|
78 | + $frontLink .= '/'.$content->getCategory()->path; |
|
79 | + $frontPath .= '/'.$content->getCategory()->path; |
|
80 | 80 | } |
81 | - $frontLink .= '/' . $content->path; |
|
82 | - $frontPath .= '/' . $content->path; |
|
81 | + $frontLink .= '/'.$content->path; |
|
82 | + $frontPath .= '/'.$content->path; |
|
83 | 83 | $frontPath = Str::sub($frontPath, 0, 30); |
84 | - $actionIcons = '<a href="' . $frontLink . '" target="_blank"><i class="fa fa-eye fa-lg"></i></a> '; |
|
84 | + $actionIcons = '<a href="'.$frontLink.'" target="_blank"><i class="fa fa-eye fa-lg"></i></a> '; |
|
85 | 85 | $actionIcons .= Url::link(['content/update', $content->id], '<i class="fa fa-pencil fa-lg"></i> '); |
86 | 86 | if ($type === 'trash') { |
87 | 87 | $actionIcons .= Url::link(['content/restore', $content->id], '<i class="fa fa-refresh fa-lg"></i>'); |
@@ -89,19 +89,19 @@ discard block |
||
89 | 89 | $actionIcons .= Url::link(['content/delete', $content->id], '<i class="fa fa-trash-o fa-lg"></i>'); |
90 | 90 | } |
91 | 91 | |
92 | - if (!(bool)$content->display) { |
|
92 | + if (!(bool) $content->display) { |
|
93 | 93 | $moderate = true; |
94 | 94 | } |
95 | 95 | |
96 | 96 | $items[] = [ |
97 | - 'property' => ['class' => 'checkbox-row' . (!(bool)$content->display ? ' alert-warning' : null)], |
|
97 | + 'property' => ['class' => 'checkbox-row'.(!(bool) $content->display ? ' alert-warning' : null)], |
|
98 | 98 | 1 => ['text' => $content->id, 'html' => true, '!secure' => true], |
99 | - 2 => ['text' => (!(bool)$content->display ? '<i class="fa fa-exclamation text-warning"></i> ' : null) . |
|
100 | - Url::link(['content/update', $content->id], $content->getLocaled('title')) . |
|
101 | - ((bool)$content->important ? ' <i class="glyphicon glyphicon-fire"></i>' : null), |
|
99 | + 2 => ['text' => (!(bool) $content->display ? '<i class="fa fa-exclamation text-warning"></i> ' : null). |
|
100 | + Url::link(['content/update', $content->id], $content->getLocaled('title')). |
|
101 | + ((bool) $content->important ? ' <i class="glyphicon glyphicon-fire"></i>' : null), |
|
102 | 102 | 'html' => true], |
103 | 103 | 3 => ['text' => $content->getCategory()->getLocaled('title')], |
104 | - 4 =>['text' => '<a href="' . $frontLink . '" target="_blank">' . $frontPath . '</a>', 'html' => true], |
|
104 | + 4 =>['text' => '<a href="'.$frontLink.'" target="_blank">'.$frontPath.'</a>', 'html' => true], |
|
105 | 105 | 5 => ['text' => Date::convertToDatetime($content->updated_at, Date::FORMAT_TO_SECONDS)], |
106 | 106 | 6 => ['text' => $actionIcons, 'html' => true, 'property' => ['class' => 'text-center']] |
107 | 107 | ]; |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | <hr /> |
24 | 24 | <div class="row"> |
25 | 25 | <div class="col-md-12"> |
26 | - <?= Url::link(['content/categoryupdate', 0], '<i class="fa fa-plus"></i> ' . __('Add category'), ['class' => 'btn btn-primary pull-right']) ?> |
|
26 | + <?= Url::link(['content/categoryupdate', 0], '<i class="fa fa-plus"></i> '.__('Add category'), ['class' => 'btn btn-primary pull-right']) ?> |
|
27 | 27 | </div> |
28 | 28 | </div> |
29 | 29 | <div class="table-responsive"> |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | <tr> |
55 | 55 | <td> |
56 | 56 | <div class="row"> |
57 | - <div class="col-md-<?= $offset ?> col-xs-<?= $offset+2 ?>" style="padding-top: 8px;border-bottom: 2px solid #8a8a8a"></div> |
|
58 | - <div class="col-md-<?= $set ?> col-xs-<?= $set-2 ?>"> |
|
57 | + <div class="col-md-<?= $offset ?> col-xs-<?= $offset + 2 ?>" style="padding-top: 8px;border-bottom: 2px solid #8a8a8a"></div> |
|
58 | + <div class="col-md-<?= $set ?> col-xs-<?= $set - 2 ?>"> |
|
59 | 59 | <?= $row->getLocaled('title') ?> |
60 | 60 | <sup>id: <?= $row->id ?></sup> |
61 | 61 | <span class="label label-info">/<?= $row->path ?></span> |