From e2eb758becd2dded1bb6ca1955387a547d6e6c85 Mon Sep 17 00:00:00 2001
From: timur <tamerlan8.05.92@gmail.com>
Date: Mon, 26 Feb 2018 12:31:18 +0200
Subject: [PATCH] 301-е ссылки заменил на 200

---
 frontend/views/layouts/main.php    | 7 +++++--
 frontend/views/site/index.php      | 6 +++---
 frontend/views/site/individual.php | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 0104cd7..b677a49 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -116,6 +116,9 @@
                                     $langs_head = artbox\core\widgets\LangLink::widget();
                                     $langs_head = str_replace(" / ".$this_lang,"",$langs_head);
                                     $langs_head = str_replace($this_lang." / ","",$langs_head);
+                                    // удаляет последний "/" в ссылке тэга, после ссылки тэг закрывается
+                                    $langs_head = str_replace("/\">", "\">", $langs_head);
+                                    
                                     echo "<span class='active_lang'>$this_lang</span>".$langs_head;
                                     ?>
                                 </div>
@@ -137,7 +140,7 @@
                             <div class="container">
                                 <div class="navbar-header">
                                     
-                                    <a class="navbar-brand home" href="<?php echo Url::to(['site/index']); ?>">
+                                    <a class="navbar-brand home" href="<?= rtrim(Url::to(['site/index']), "/") ?>">
                                         <img
                                             src="/img/logo_kb.png"
                                             alt="<?= $settings->name; ?>"
@@ -627,7 +630,7 @@
                                                 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [],
                                                 'homeLink' => [
                                                     'label' => \Yii::t('app', "Home"),
-                                                    'url' => \Yii::$app->homeUrl . \artbox\core\models\Language::getCurrent()->url
+                                                    'url' => rtrim(Url::toRoute('site/index', true), "/")
                                                 ]
                                             ]
                                         ) ?>
diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php
index 8bcd60d..ef867f0 100644
--- a/frontend/views/site/index.php
+++ b/frontend/views/site/index.php
@@ -61,10 +61,10 @@ JS;
         <div class="container">
             <div class="row">
                 <div class="col-xs-12 col-sm-12 col-md-6 lsf-left">
-                    <p><?=\Yii::t('app', 'index_ses_for')?> <a href="site/legal"><?=\Yii::t('app', 'index_ses_leg')?></a></p>
+                    <p><?=\Yii::t('app', 'index_ses_for')?> <a href="<?=Url::toRoute("site/legal")?>"><?=\Yii::t('app', 'index_ses_leg')?></a></p>
                 </div>
                 <div class="col-xs-12 col-sm-12 col-md-6 lsf-right">
-                    <p><?=\Yii::t('app', 'index_ses_for')?> <a href="site/individual"><?=\Yii::t('app', 'index_ses_fiz')?></a></p>
+                    <p><?=\Yii::t('app', 'index_ses_for')?> <a href="<?=Url::toRoute("site/individual")?>">"><?=\Yii::t('app', 'index_ses_fiz')?></a></p>
                 </div>
             </div>
         </div>
@@ -316,7 +316,7 @@ JS;
                     </div>
                     <div class="row">
                         <div class="col-md-12 col-xs-12" style="text-align:center;margin-top: 20px;margin-bottom: -35px;">
-                            <a href='object/index' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a>
+                            <a href='<?=Url::toRoute("object/index")?>' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a>
                         </div>
                     </div>
                 </div>
diff --git a/frontend/views/site/individual.php b/frontend/views/site/individual.php
index e9e6345..c8050bb 100644
--- a/frontend/views/site/individual.php
+++ b/frontend/views/site/individual.php
@@ -12,7 +12,7 @@
     use artbox\core\models\Feedback;
     use common\models\Settings;
     use yii\helpers\Html;
-    use yii\bootstrap\ActiveForm;
+    use yii\helpers\Url;
     use yii\web\View;
     use common\models\Objectkb;
 
@@ -275,7 +275,7 @@
                     </div>
                     <div class="row">
                         <div class="col-md-12 col-xs-12" style="text-align:center;margin-top: 20px;margin-bottom: -35px;">
-                            <a href='/object/index' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a>
+                            <a href='<?=Url::toRoute("object/index")?>' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a>
                         </div>
                     </div>
                 </div>
--
libgit2 0.21.4