Eugeny Galkovskiy / kbenergy_new

Commit 3431e52b91887c59316237b670e6bc360014e176

Authored by Eugeny Galkovskiy
2 parents 1b63eb32 c74c84bc

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 14 additions and 13 deletions   Show diff stats
Inline Side-by-side
frontend/config/main.php
  Show/Hide comments   View file @3431e52
1 <?php 1 <?php
  2 +
2 use artbox\core\components\LanguageRequest; 3 use artbox\core\components\LanguageRequest;
3 use artbox\core\components\SeoUrlManager; 4 use artbox\core\components\SeoUrlManager;
4 5
@@ -20,9 +21,10 @@ @@ -20,9 +21,10 @@
20 'controllerNamespace' => 'frontend\controllers', 21 'controllerNamespace' => 'frontend\controllers',
21 'components' => [ 22 'components' => [
22 'request' => [ 23 'request' => [
23 - 'class' => LanguageRequest::className(),  
24 - 'csrfParam' => '_csrf-frontend',  
25 - 'baseUrl' => '', 24 + 'class' => LanguageRequest::className(),
  25 + 'dontShowDefaulPrefix' => true,
  26 + 'csrfParam' => '_csrf-frontend',
  27 + 'baseUrl' => '',
26 ], 28 ],
27 'user' => [ 29 'user' => [
28 'identityClass' => 'common\models\User', 30 'identityClass' => 'common\models\User',
@@ -52,21 +54,20 @@ @@ -52,21 +54,20 @@
52 'errorAction' => 'site/error', 54 'errorAction' => 'site/error',
53 ], 55 ],
54 'urlManager' => [ 56 'urlManager' => [
55 - 'class' => SeoUrlManager::className(),  
56 - 'enablePrettyUrl' => true,  
57 - 'forceRedirect' => true,  
58 - 'showScriptName' => false,  
59 - // 'dontShowDefaulPrefix' => true,  
60 - 'rules' => [ 57 + 'class' => SeoUrlManager::className(),
  58 + 'enablePrettyUrl' => true,
  59 + 'forceRedirect' => true,
  60 + 'showScriptName' => false,
  61 + 'dontShowDefaulPrefix' => true,
  62 + 'rules' => [
61 '\/robots.txt' => 'site/robots', 63 '\/robots.txt' => 'site/robots',
62 ], 64 ],
63 - 'processRoutes' => [ 65 + 'processRoutes' => [
64 'object/view', 66 'object/view',
65 'blog/article', 67 'blog/article',
66 'blog/tag', 68 'blog/tag',
67 'blog/category', 69 'blog/category',
68 'page/view', 70 'page/view',
69 -  
70 'site/media-about', 71 'site/media-about',
71 'site/individual', 72 'site/individual',
72 'blog/index', 73 'blog/index',
@@ -74,7 +75,7 @@ @@ -74,7 +75,7 @@
74 'site/about', 75 'site/about',
75 'site/legal', 76 'site/legal',
76 'site/contact', 77 'site/contact',
77 - 78 +
78 ], 79 ],
79 ], 80 ],
80 'assetsAutoCompress' => [ 81 'assetsAutoCompress' => [
frontend/views/layouts/main.php
  Show/Hide comments   View file @3431e52
@@ -137,7 +137,7 @@ @@ -137,7 +137,7 @@
137 <div class="container"> 137 <div class="container">
138 <div class="navbar-header"> 138 <div class="navbar-header">
139 139
140 - <a class="navbar-brand home" href="<?php echo Url::home(); ?>"> 140 + <a class="navbar-brand home" href="<?php echo Url::to(['site/index']); ?>">
141 <img 141 <img
142 src="/img/logo_kb.png" 142 src="/img/logo_kb.png"
143 alt="<?= $settings->name; ?>" 143 alt="<?= $settings->name; ?>"