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

Alex Savenko
2 parents 84cd230a d943a556
Showing 2 changed files with 18 additions and 13 deletions Show diff stats
common/messages/ru/app.php
frontend/views/layouts/main.php
@@ -90,7 +90,7 @@ return [
     'Slide Down'                =>'свернуть',
     'Save'                      =>'Сохранить',
     'Message'                   =>'Сообщение',
-    
+    'Slides'                    =>'Слайды',
  
     'Phone'                     =>'Телефон',
  
@@ -189,13 +189,13 @@
                         'url'   => Url::to([ 'alias' => $service->language->alias ]),
                     ];
                 }
-                $items[] = [
-                    'label' => \Yii::t('app', 'Prices'),
-                    'url'   => Url::to(['site/prices']),
-                    'options' => [
-                      'class' => 'active'
-                    ]
-                ];
+//                $items[] = [
+//                    'label' => \Yii::t('app', 'Prices'),
+//                    'url'   => Url::to(['site/prices']),
+//                    'options' => [
+//                      'class' => 'active'
+//                    ]
+//                ];
                 $items[] = [
                     'label' => \Yii::t('app', 'Package offerings'),
                     'url'   => Url::to(['package/index']),
@@ -206,12 +206,19 @@
                 $test=[];
                 foreach ($items as $key => $item)
                 {
-                    if(strpos($item['url'],\Yii::$app->request->url)!==false)
+
+                    if(strpos(\Yii::$app->request->url,$item['url'])!==false )
                     {
                         $test[$key]['label']=$item['label'];
                         $test[$key]['options'] = [ 'class' => 'active' ];
-                        $test[$key]['url']='/';
-                 #       die(var_dump($item));
+
+                    }
+                    elseif( \Yii::$app->request->url=='/' && $item['label']==\Yii::t('app', 'Prices'))
+                    {
+                        $test[$key]['label']=$item['label'];
+                        $test[$key]['options'] = [ 'class' => 'active' ];
+                        $test[$key]['url']= Url::to(['site/prices']);
+
                     }
                     else
                     {
@@ -222,8 +229,6 @@
                 }
  
  
-                #var_dump(\Yii::$app->request->url);
-              #  die(var_dump($test,Url::current()));
             ?>
             <?php echo Nav::widget(
                 [