diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index b3c4d92..ebf99bd 100644 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -154,21 +154,11 @@ return $this->render('legal'); } // юридическое - public function actionGreen() - { - return $this->render('green'); - } // зелёный тариф - public function actionMediaAbout() { return $this->render('media-about'); } // СМИ о нас - public function actionBlog() - { - return $this->render('blog'); - } // блог - /** * Action to view robots.txt file dinamycli * diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index b136513..29c4fb0 100644 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -606,8 +606,8 @@

controller->id === $default_controller || - Yii::$app->controller->action->id === $controller->defaultAction || + (Yii::$app->controller->id === $default_controller and + Yii::$app->controller->action->id === $controller->defaultAction) || Yii::$app->controller->action->id === 'search' ){ echo (isset($this->params['h1'])) ? diff --git a/frontend/views/site/blog.php b/frontend/views/site/blog.php deleted file mode 100644 index 0295a54..0000000 --- a/frontend/views/site/blog.php +++ /dev/null @@ -1,25 +0,0 @@ -title = \Yii::t('app', 'menu-blog'); -$this->params[ 'breadcrumbs' ][] = $this->title; -?> - -
-
- -
-
\ No newline at end of file diff --git a/frontend/views/site/green.php b/frontend/views/site/green.php deleted file mode 100644 index a3c2cb1..0000000 --- a/frontend/views/site/green.php +++ /dev/null @@ -1,88 +0,0 @@ -params['h1'] = \Yii::t('app', 'menu-green'); - $this->params[ 'breadcrumbs' ][] = $this->params['h1']; -?> - -
-
- -
- -
-
-
- -


-

-
-
-
- -
-
-
-
-

-
-
-
-
- - -
-
-
-

-
-

-
-
    -
  • -
  • -
  • -
  • -
- -
-
-
- -
-
-
\ No newline at end of file -- libgit2 0.21.4