From 64aac2e6acdbc009a3b87da32cede2c5c6d7b17d Mon Sep 17 00:00:00 2001 From: andryeyev Date: Thu, 3 Dec 2015 13:19:02 +0200 Subject: [PATCH] + fix после восстановления git файлов Ярика --- frontend/controllers/SiteController.php | 6 +++--- frontend/views/layouts/main.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 1f38241..0c5eb12 100644 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -261,7 +261,7 @@ class SiteController extends Controller 'model' => $model, ]); } -<<<<<<< 1fd2bdb43fc5cfdcf100cac8b72e67fd81e7f0fa + public function actionOptions() { $option_model = new Options(); $option_list = $option_model->find()->where(1)->all(); @@ -303,7 +303,7 @@ class SiteController extends Controller $data['option_values'] = $option_values; return $this->render('options', ['options' => $data, 'post' => $post]); } -======= + } public function actionFeedback() { $form[0] = Option::create(\Yii::$app->request->post(), 'Feedback', 1, [['name' => 'one_name', 'template' => 'text', 'translate' => false], ['name' => 'phone', 'template' => 'text', 'translate' => false], ['name' => 'message', 'template' => 'text', 'translate' => false]], false); @@ -312,6 +312,6 @@ class SiteController extends Controller } else { return $this->render('index'); } ->>>>>>> 0e0edb85a79343e4d020ff05378179e2323b21bd + } } diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index c03efd6..103ebc0 100644 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -35,11 +35,12 @@ AppAsset::register($this); ] ]); +/* echo Nav::widget([ 'options' => ['class' => 'navbar-nav navbar-right'], 'items' => (new MenuTree())->build('TOP') ]); -/* + $menuItems = [ ['label' => 'Home', 'url' => ['/site/index']], ['label' => 'About', 'url' => ['/site/about']], -- libgit2 0.21.4