@@ -37,7 +37,7 @@ |
||
37 | 37 | <div class="text-right"><strong><?= __('Profile preview') ?></strong></div> |
38 | 38 | </div> |
39 | 39 | <div class="col-md-9"> |
40 | - <a href="<?= \App::$Alias->scriptUrl . '/profile/show/' . $model->_user->id ?>" target="_blank"><?= __('View profile on website') ?></a> |
|
40 | + <a href="<?= \App::$Alias->scriptUrl.'/profile/show/'.$model->_user->id ?>" target="_blank"><?= __('View profile on website') ?></a> |
|
41 | 41 | </div> |
42 | 42 | </div> |
43 | 43 | <div class="row mt-3 mb-3"> |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | <div class="media-left"> |
175 | 175 | <a href="<?= ($comment->user ? Url::link(['user/update', [$comment->user->id]]) : '#') ?>"> |
176 | 176 | <?php |
177 | - $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg'; |
|
177 | + $commentAva = \App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg'; |
|
178 | 178 | if ($comment->user && $comment->user->id > 0) { |
179 | 179 | $commentAva = $comment->user->profile->getAvatarUrl('small'); |
180 | 180 | } |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | </li> |
252 | 252 | <li class="nav-item<?= (\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? ' active' : null ?>"> |
253 | 253 | <?= Url::a(['#system-dropdown'], |
254 | - '<i class="fa fa-fire"></i> <span class="nav-text">' . __('System') . '</span>', |
|
254 | + '<i class="fa fa-fire"></i> <span class="nav-text">'.__('System').'</span>', |
|
255 | 255 | [ |
256 | 256 | 'class' => 'nav-container', |
257 | 257 | 'data-toggle' => 'collapse', |
@@ -259,12 +259,12 @@ discard block |
||
259 | 259 | ]) |
260 | 260 | ?> |
261 | 261 | |
262 | - <?= $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? 'in show' : null), 'id' => 'system-dropdown']) |
|
263 | - ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]) |
|
264 | - ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true]) |
|
265 | - ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true]) |
|
266 | - ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true]) |
|
267 | - ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true]) |
|
262 | + <?= $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? 'in show' : null), 'id' => 'system-dropdown']) |
|
263 | + ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]) |
|
264 | + ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true]) |
|
265 | + ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true]) |
|
266 | + ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true]) |
|
267 | + ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true]) |
|
268 | 268 | ->display(); |
269 | 269 | ?> |
270 | 270 | </li> |
@@ -282,7 +282,7 @@ discard block |
||
282 | 282 | ?> |
283 | 283 | <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? ' active' : null ?>"> |
284 | 284 | <?= Url::a(['#apps-dropdown'], |
285 | - '<i class="fa fa-plug"></i> <span class="nav-text">' . __('Applications') . '</span>', |
|
285 | + '<i class="fa fa-plug"></i> <span class="nav-text">'.__('Applications').'</span>', |
|
286 | 286 | [ |
287 | 287 | 'class' => 'nav-container', |
288 | 288 | 'data-toggle' => 'collapse', |
@@ -291,18 +291,18 @@ discard block |
||
291 | 291 | ?> |
292 | 292 | |
293 | 293 | <?php |
294 | - $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? 'in show' : null), 'id' => 'apps-dropdown']); |
|
294 | + $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? 'in show' : null), 'id' => 'apps-dropdown']); |
|
295 | 295 | foreach ($apps as $app) { |
296 | 296 | /** @var \Apps\ActiveRecord\App $app */ |
297 | - $appMenu->menu(['link' => [Str::lowerCase($app->sys_name) . '/index'], 'text' => $app->getLocaleName()]); |
|
297 | + $appMenu->menu(['link' => [Str::lowerCase($app->sys_name).'/index'], 'text' => $app->getLocaleName()]); |
|
298 | 298 | } |
299 | - $appMenu->menu(['link' => 'application/index', 'text' => __('All apps') . '...']); |
|
299 | + $appMenu->menu(['link' => 'application/index', 'text' => __('All apps').'...']); |
|
300 | 300 | echo $appMenu->display(); |
301 | 301 | ?> |
302 | 302 | </li> |
303 | 303 | <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? ' active' : null ?>"> |
304 | 304 | <?= Url::a(['#widgets-dropdown'], |
305 | - '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">' . __('Widgets') . '</span>', |
|
305 | + '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">'.__('Widgets').'</span>', |
|
306 | 306 | [ |
307 | 307 | 'class' => 'nav-container', |
308 | 308 | 'data-toggle' => 'collapse', |
@@ -311,12 +311,12 @@ discard block |
||
311 | 311 | ?> |
312 | 312 | |
313 | 313 | <?php |
314 | - $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? 'in show' : null), 'id' => 'widgets-dropdown']); |
|
314 | + $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? 'in show' : null), 'id' => 'widgets-dropdown']); |
|
315 | 315 | foreach ($widgets as $widget) { |
316 | 316 | /** @var \Apps\ActiveRecord\App $widget */ |
317 | - $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name) . '/index'], 'text' => $widget->getLocaleName()]); |
|
317 | + $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name).'/index'], 'text' => $widget->getLocaleName()]); |
|
318 | 318 | } |
319 | - $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets') . '...']); |
|
319 | + $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets').'...']); |
|
320 | 320 | echo $widgetMenu->display(); |
321 | 321 | ?> |
322 | 322 | </li> |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | $index = implode('-', $this->_skip); |
63 | 63 | // try to get this slow query from cache |
64 | - $cache = App::$Cache->getItem('entity.content.search.index.' . $index); |
|
64 | + $cache = App::$Cache->getItem('entity.content.search.index.'.$index); |
|
65 | 65 | if (!$cache->isHit()) { |
66 | 66 | $cache->set($this->makeSearch()); |
67 | 67 | $cache->expiresAfter(static::CACHE_TIME); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | 'id' => $item->id, |
96 | 96 | 'title' => $item->getLocaled('title'), |
97 | 97 | 'snippet' => Text::snippet($text), |
98 | - 'uri' => '/content/read/' . $item->getPath(), |
|
98 | + 'uri' => '/content/read/'.$item->getPath(), |
|
99 | 99 | 'thumb' => $item->getPosterThumbUri() |
100 | 100 | ]; |
101 | 101 | } |