Commit e2eb758becd2dded1bb6ca1955387a547d6e6c85
1 parent
73c460ff
301-е ссылки заменил на 200
Showing
3 changed files
with
10 additions
and
7 deletions
Show diff stats
frontend/views/layouts/main.php
@@ -116,6 +116,9 @@ | @@ -116,6 +116,9 @@ | ||
116 | $langs_head = artbox\core\widgets\LangLink::widget(); | 116 | $langs_head = artbox\core\widgets\LangLink::widget(); |
117 | $langs_head = str_replace(" / ".$this_lang,"",$langs_head); | 117 | $langs_head = str_replace(" / ".$this_lang,"",$langs_head); |
118 | $langs_head = str_replace($this_lang." / ","",$langs_head); | 118 | $langs_head = str_replace($this_lang." / ","",$langs_head); |
119 | + // удаляет последний "/" в ссылке тэга, после ссылки тэг закрывается | ||
120 | + $langs_head = str_replace("/\">", "\">", $langs_head); | ||
121 | + | ||
119 | echo "<span class='active_lang'>$this_lang</span>".$langs_head; | 122 | echo "<span class='active_lang'>$this_lang</span>".$langs_head; |
120 | ?> | 123 | ?> |
121 | </div> | 124 | </div> |
@@ -137,7 +140,7 @@ | @@ -137,7 +140,7 @@ | ||
137 | <div class="container"> | 140 | <div class="container"> |
138 | <div class="navbar-header"> | 141 | <div class="navbar-header"> |
139 | 142 | ||
140 | - <a class="navbar-brand home" href="<?php echo Url::to(['site/index']); ?>"> | 143 | + <a class="navbar-brand home" href="<?= rtrim(Url::to(['site/index']), "/") ?>"> |
141 | <img | 144 | <img |
142 | src="/img/logo_kb.png" | 145 | src="/img/logo_kb.png" |
143 | alt="<?= $settings->name; ?>" | 146 | alt="<?= $settings->name; ?>" |
@@ -627,7 +630,7 @@ | @@ -627,7 +630,7 @@ | ||
627 | 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], | 630 | 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], |
628 | 'homeLink' => [ | 631 | 'homeLink' => [ |
629 | 'label' => \Yii::t('app', "Home"), | 632 | 'label' => \Yii::t('app', "Home"), |
630 | - 'url' => \Yii::$app->homeUrl . \artbox\core\models\Language::getCurrent()->url | 633 | + 'url' => rtrim(Url::toRoute('site/index', true), "/") |
631 | ] | 634 | ] |
632 | ] | 635 | ] |
633 | ) ?> | 636 | ) ?> |
frontend/views/site/index.php
@@ -61,10 +61,10 @@ JS; | @@ -61,10 +61,10 @@ JS; | ||
61 | <div class="container"> | 61 | <div class="container"> |
62 | <div class="row"> | 62 | <div class="row"> |
63 | <div class="col-xs-12 col-sm-12 col-md-6 lsf-left"> | 63 | <div class="col-xs-12 col-sm-12 col-md-6 lsf-left"> |
64 | - <p><?=\Yii::t('app', 'index_ses_for')?> <a href="site/legal"><?=\Yii::t('app', 'index_ses_leg')?></a></p> | 64 | + <p><?=\Yii::t('app', 'index_ses_for')?> <a href="<?=Url::toRoute("site/legal")?>"><?=\Yii::t('app', 'index_ses_leg')?></a></p> |
65 | </div> | 65 | </div> |
66 | <div class="col-xs-12 col-sm-12 col-md-6 lsf-right"> | 66 | <div class="col-xs-12 col-sm-12 col-md-6 lsf-right"> |
67 | - <p><?=\Yii::t('app', 'index_ses_for')?> <a href="site/individual"><?=\Yii::t('app', 'index_ses_fiz')?></a></p> | 67 | + <p><?=\Yii::t('app', 'index_ses_for')?> <a href="<?=Url::toRoute("site/individual")?>">"><?=\Yii::t('app', 'index_ses_fiz')?></a></p> |
68 | </div> | 68 | </div> |
69 | </div> | 69 | </div> |
70 | </div> | 70 | </div> |
@@ -316,7 +316,7 @@ JS; | @@ -316,7 +316,7 @@ JS; | ||
316 | </div> | 316 | </div> |
317 | <div class="row"> | 317 | <div class="row"> |
318 | <div class="col-md-12 col-xs-12" style="text-align:center;margin-top: 20px;margin-bottom: -35px;"> | 318 | <div class="col-md-12 col-xs-12" style="text-align:center;margin-top: 20px;margin-bottom: -35px;"> |
319 | - <a href='object/index' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a> | 319 | + <a href='<?=Url::toRoute("object/index")?>' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a> |
320 | </div> | 320 | </div> |
321 | </div> | 321 | </div> |
322 | </div> | 322 | </div> |
frontend/views/site/individual.php
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | use artbox\core\models\Feedback; | 12 | use artbox\core\models\Feedback; |
13 | use common\models\Settings; | 13 | use common\models\Settings; |
14 | use yii\helpers\Html; | 14 | use yii\helpers\Html; |
15 | - use yii\bootstrap\ActiveForm; | 15 | + use yii\helpers\Url; |
16 | use yii\web\View; | 16 | use yii\web\View; |
17 | use common\models\Objectkb; | 17 | use common\models\Objectkb; |
18 | 18 | ||
@@ -275,7 +275,7 @@ | @@ -275,7 +275,7 @@ | ||
275 | </div> | 275 | </div> |
276 | <div class="row"> | 276 | <div class="row"> |
277 | <div class="col-md-12 col-xs-12" style="text-align:center;margin-top: 20px;margin-bottom: -35px;"> | 277 | <div class="col-md-12 col-xs-12" style="text-align:center;margin-top: 20px;margin-bottom: -35px;"> |
278 | - <a href='/object/index' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a> | 278 | + <a href='<?=Url::toRoute("object/index")?>' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a> |
279 | </div> | 279 | </div> |
280 | </div> | 280 | </div> |
281 | </div> | 281 | </div> |