From a6fd26194159a4b4a3058aaf1af0687ac39b342c Mon Sep 17 00:00:00 2001
From: zhegal <zhegal@gmail.com>
Date: Fri, 9 Feb 2018 18:24:00 +0200
Subject: [PATCH] правки

---
 frontend/controllers/SiteController.php | 15 ++++++++++++++-
 frontend/views/layouts/main.php         |  8 ++++----
 frontend/views/object/index.php         |  8 +-------
 frontend/views/site/about.php           | 72 ++----------------------------------------------------------------------
 4 files changed, 21 insertions(+), 82 deletions(-)

diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php
index 7748894..5df7774 100644
--- a/frontend/controllers/SiteController.php
+++ b/frontend/controllers/SiteController.php
@@ -2,6 +2,7 @@
     
     namespace frontend\controllers;
     
+    use artbox\core\models\Page;
     use common\models\Feedback;
     use common\models\Settings;
     use common\models\Slider;
@@ -10,6 +11,7 @@
     use yii\swiftmailer\Mailer;
     use yii\web\BadRequestHttpException;
     use yii\web\Controller;
+    use yii\web\NotFoundHttpException;
     use yii\web\Response;
     use common\models\Objectkb;
     
@@ -105,7 +107,18 @@
          */
         public function actionAbout()
         {
-            return $this->render('about');
+            $page = Page::find()->with('lang')
+                ->where(['id' => 3])->one();
+
+            if ($page) {
+                return $this->render('about', [
+                    'page' => $page,
+                ]);
+
+            } else {
+                throw new NotFoundHttpException();
+            }
+
         }
         
         public function actionIndividual()
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index edbab04..5a1434a 100644
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -152,10 +152,10 @@
                                 <div class="navbar-collapse collapse" id="navigation">
                                     <?php
                                         $items = [];
-//                                        $items[] = [
-//                                            'label' => \Yii::t('app', 'Home'),
-//                                            'url'   => [ Url::home() ],
-//                                        ];
+                                        $items[] = [
+                                            'label' => \Yii::t('app', 'menu-about'),
+                                            'url'   => [ 'site/about' ],
+                                        ];
                                         $items[] = [
                                             'label' => \Yii::t('app', 'menu-individual'),
                                             'url'   => [ 'site/individual' ],
diff --git a/frontend/views/object/index.php b/frontend/views/object/index.php
index 3874466..9c1060c 100644
--- a/frontend/views/object/index.php
+++ b/frontend/views/object/index.php
@@ -32,13 +32,7 @@
                         <!--<div class="heading">
                             <h2>наши объекты</h2>
                         </div>-->
-                        <p class="lead"><?= \Yii::t('app', 'object_text1') ?><br /><br />
-                            •	<?= \Yii::t('app', 'object_list1') ?><br />
-                            •	<?= \Yii::t('app', 'object_list2') ?><br />
-                            •	<?= \Yii::t('app', 'object_list3') ?><br />
-                            •	<?= \Yii::t('app', 'object_list4') ?><br />
-                            •	<?= \Yii::t('app', 'object_list5') ?><br /><br />
-                            <?= \Yii::t('app', 'object_text1_2') ?></p>
+                        <p class="lead"><?= \Yii::t('app', 'object_text1') ?></p>
                     </div>
                 </div>
                 
diff --git a/frontend/views/site/about.php b/frontend/views/site/about.php
index 2a13435..36ac0bc 100644
--- a/frontend/views/site/about.php
+++ b/frontend/views/site/about.php
@@ -4,8 +4,7 @@
     
     /**
      * @var View $this
-     */
-    /**
+     * @var \artbox\core\models\Page $page
      * @var SeoComponent $seo
      */
     $seo = \Yii::$app->get('seo');
@@ -15,74 +14,7 @@
     <section>
         <div class="row">
             <div class="col-md-12">
-                
-                <div class="heading">
-                    <h2><?= \Yii::t('app', 'About Artbox') ?></h2>
-                </div>
-                
-                <p class="lead"><?= \Yii::t('app', 'lorem') ?></p>
-            
-            </div>
-        </div>
-        
-        <div class="row">
-            <div class="col-md-8">
-                <section>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="tabs">
-                                <ul class="nav nav-tabs nav-justified">
-                                    <li class="active">
-                                        <a href="#tab1" data-toggle="tab" aria-expanded="true"><?= \Yii::t('app', 'First tab') ?></a>
-                                    </li>
-                                    <li class=""><a href="#tab2" data-toggle="tab" aria-expanded="false"><?= \Yii::t('app', 'Second tab') ?></a>
-                                    </li>
-                                    <li class=""><a href="#tab3" data-toggle="tab" aria-expanded="false"><?= \Yii::t('app', 'Third tab') ?></a>
-                                    </li>
-                                </ul>
-                                <div class="tab-content">
-                                    <div class="tab-pane active" id="tab1">
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <img src="/img/template-easy-customize.png" alt="" class="img-responsive">
-                                            </div>
-                                            <div class="col-md-8">
-                                                <p><?= \Yii::t('app', 'lorem2') ?></p>
-                                                <p><?= \Yii::t('app', 'lorem3') ?></p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="tab-pane" id="tab2">
-                                        <div class="row">
-                                            <div class="col-md-4">
-                                                <img src="/img/template-easy-code.png" alt="" class="img-responsive">
-                                            </div>
-                                            <div class="col-md-8">
-                                                <p><?= \Yii::t('app', 'lorem2') ?></p>
-                                                <p><?= \Yii::t('app', 'lorem3') ?></p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="tab-pane" id="tab3">
-                                        <p><?= \Yii::t('app', 'lorem2') ?></p>
-                                        <p><?= \Yii::t('app', 'lorem3') ?></p>
-                                        <p><?= \Yii::t('app', 'lorem3') ?></p>
-                                    </div>
-                                </div>
-                                <!-- /.tab-content -->
-                            </div>
-                        </div>
-                    </div>
-                </section>
-            </div>
-            
-            <div class="col-md-4">
-                <div class="video">
-                    <div class="embed-responsive embed-responsive-4by3">
-                        <iframe class="embed-responsive-item" src="//www.youtube.com/embed/i9AHJkHqkpw?autoplay=0&showinfo=0&controls=0"></iframe>
-                    </div>
-                
-                </div>
+                <?=$page->lang->body?>
             </div>
         </div>
     </section>
--
libgit2 0.21.4