Anastasia / clinica

Commit 7aa44a45455a8f944b8b7e947ce1fd6bc915f043

Authored by Alex Savenko
2 parents 1dec6449 89f55ef8

Merge branch 'master' of gitlab.artweb.com.ua:steska/clinica

Showing 3 changed files with 8 additions and 2 deletions   Show diff stats
Inline Side-by-side
frontend/controllers/SiteController.php
  Show/Hide comments   View file @7aa44a4
@@ -258,6 +258,7 @@ @@ -258,6 +258,7 @@
258 foreach ($services as $service){ 258 foreach ($services as $service){
259 $route[] = Json::encode(['site/questions', 'service_id' => $service->id]); 259 $route[] = Json::encode(['site/questions', 'service_id' => $service->id]);
260 } 260 }
  261 + $route [] = '{"0":"site/questions"}';
261 $alias = Alias::find()->where(['route' => $route])->andWhere(['language_id' => Language::getCurrent()->id])->indexBy('route')->asArray()->all(); 262 $alias = Alias::find()->where(['route' => $route])->andWhere(['language_id' => Language::getCurrent()->id])->indexBy('route')->asArray()->all();
262 return $this->render('questions', [ 263 return $this->render('questions', [
263 'dataProvider' => $dataProvider, 264 'dataProvider' => $dataProvider,
frontend/views/layouts/main.php
  Show/Hide comments   View file @7aa44a4
@@ -12,7 +12,9 @@ @@ -12,7 +12,9 @@
12 use artbox\core\components\SeoComponent; 12 use artbox\core\components\SeoComponent;
13 use artbox\core\helpers\ImageHelper; 13 use artbox\core\helpers\ImageHelper;
14 use artbox\core\helpers\Url; 14 use artbox\core\helpers\Url;
  15 + use artbox\core\models\Alias;
15 use artbox\core\models\Feedback; 16 use artbox\core\models\Feedback;
  17 + use artbox\core\models\Language;
16 use artbox\core\models\PageCategory; 18 use artbox\core\models\PageCategory;
17 use artbox\core\models\User; 19 use artbox\core\models\User;
18 use artbox\core\seo\widgets\SeoBreadcrumbs; 20 use artbox\core\seo\widgets\SeoBreadcrumbs;
@@ -70,6 +72,7 @@ @@ -70,6 +72,7 @@
70 ] 72 ]
71 ); 73 );
72 $module = \Yii::$app->getModule('feedback'); 74 $module = \Yii::$app->getModule('feedback');
  75 + $aliases = Alias::find()->where(['route' => '{"0":"site/questions"}'])->indexBy('route')->andWhere(['language_id' => Language::getCurrent()->id])->asArray()->all();
73 ?> 76 ?>
74 77
75 <?php $this->beginPage() ?> 78 <?php $this->beginPage() ?>
@@ -155,7 +158,7 @@ @@ -155,7 +158,7 @@
155 158
156 <ul class="hidden-xs hidden-sm"> 159 <ul class="hidden-xs hidden-sm">
157 <li><a href="#" class="new"><span> <?=\Yii::t('app','Second thing')?> </span></a></li> 160 <li><a href="#" class="new"><span> <?=\Yii::t('app','Second thing')?> </span></a></li>
158 - <li><a href="<?=Url::to(['site/questions'])?>"><?=\Yii::t('app','Quest/Answer')?></a></li> 161 + <li><a href="<?=Url::to(['alias' => $aliases['{"0":"site/questions"}']])?>"><?=\Yii::t('app','Quest/Answer')?></a></li>
159 <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks')?></a></li> 162 <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks')?></a></li>
160 </ul> 163 </ul>
161 <!-- --> 164 <!-- -->
frontend/views/site/questions.php
  Show/Hide comments   View file @7aa44a4
@@ -86,7 +86,9 @@ @@ -86,7 +86,9 @@
86 <div class="col-xs-12 col-sm-12"> 86 <div class="col-xs-12 col-sm-12">
87 <ul class="answers-category-list"> 87 <ul class="answers-category-list">
88 <li <?= ( $service_id == null ? 'class="active"' : '' ) ?>> 88 <li <?= ( $service_id == null ? 'class="active"' : '' ) ?>>
89 - <a href="<?= Url::current([ 'service_id' => null ]) ?>"> 89 + <a href="<?= ( array_key_exists('{"0":"site/questions"}', $alias) ) ? Url::to(
  90 + [ 'alias' => $alias[ '{"0":"site/questions"}'] ]
  91 + ) : Url::current([ 'service_id' => null]) ?>">
90 <span><?= \Yii::t('app', 'General issues'); ?></span></a></li> 92 <span><?= \Yii::t('app', 'General issues'); ?></span></a></li>
91 <?php foreach ($services as $service) { 93 <?php foreach ($services as $service) {
92 $route = Json::encode(['site/questions', 'service_id' => $service->id]); 94 $route = Json::encode(['site/questions', 'service_id' => $service->id]);