-Pages update (admin part)

Alexey Boroda
1 parent 4583f00b
Showing 587 changed files with 225 additions and 160 deletions Show diff stats
.gitignore
.htaccess
backend/assets/AdminLteAsset.php
backend/assets/FontAwesomeAsset.php
backend/controllers/ArticlesController.php
backend/controllers/BannerController.php
backend/controllers/BgController.php
backend/controllers/BrandController.php
backend/controllers/CategoryController.php
backend/controllers/CertificateController.php
backend/controllers/CustomerController.php
backend/controllers/EventController.php
backend/controllers/FeedbackController.php
backend/controllers/OrdersController.php
backend/controllers/PageController.php
backend/controllers/ProjectController.php
backend/controllers/SeoCategoryController.php
backend/controllers/SeoController.php
backend/controllers/SeoDynamicController.php
backend/controllers/ServiceController.php
@@ -96,64 +96,64 @@ AddDefaultCharset utf-8
 # кеширование в браузере на стороне пользователя
-
-<IfModule mod_expires.c>
- ExpiresActive On
- ExpiresDefault "access 7 days"
- ExpiresByType application/javascript "access plus 1 year"
- ExpiresByType text/javascript "access plus 1 year"
- ExpiresByType text/css "access plus 1 year"
- ExpiresByType text/html "access plus 7 day"
- ExpiresByType text/x-javascript "access 1 year"
- ExpiresByType image/gif "access plus 1 year"
- ExpiresByType image/jpeg "access plus 1 year"
- ExpiresByType image/png "access plus 1 year"
- ExpiresByType image/jpg "access plus 1 year"
- ExpiresByType image/x-icon "access 1 year"
- ExpiresByType application/x-shockwave-flash "access 1 year"
- </IfModule>
-<IfModule mod_deflate.c>
-AddOutputFilterByType DEFLATE text/plain
-AddOutputFilterByType DEFLATE text/html
-AddOutputFilterByType DEFLATE text/xml
-AddOutputFilterByType DEFLATE text/css
-AddOutputFilterByType DEFLATE application/xml
-AddOutputFilterByType DEFLATE application/xhtml+xml
-AddOutputFilterByType DEFLATE application/rss+xml
-AddOutputFilterByType DEFLATE application/javascript
-AddOutputFilterByType DEFLATE application/x-javascript
-BrowserMatch ^Mozilla/4 gzip-only-text/html
-BrowserMatch ^Mozilla/4\.0[678] no-gzip
-BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-Header append Vary User-Agent
-RewriteEngine On
-AddEncoding gzip .gz
-RewriteCond %{HTTP:Accept-encoding} gzip
-RewriteCond %{REQUEST_FILENAME}.gz -f
-RewriteRule ^(.*)$ $1.gz [QSA,L]
-</IfModule>
-# Cache-Control
-<ifModule mod_headers.c>
-# 30 дней
-    <filesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
-    Header set Cache-Control "max-age=2592000, public"
-    </filesMatch>
-    # 30 дней
-    <filesMatch "\.(css|js)$">
-    Header set Cache-Control "max-age=2592000, public"
-    </filesMatch>
-    # 2 дня
-    <filesMatch "\.(xml|txt)$">
-    Header set Cache-Control "max-age=172800, public, must-revalidate"
-    </filesMatch>
-    # 1 день
-    <filesMatch "\.(html|htm|php)$">
-    Header set Cache-Control "max-age=172800, private, must-revalidate"
-    </filesMatch>
-</ifModule>
-
-#Запрет отдачи HTTP-заголовков Vary браузерам семейства MSIE
-<IfModule mod_setenvif.c>
-BrowserMatch "MSIE" force-no-vary
-BrowserMatch "Mozilla/4.[0-9]{2}" force-no-vary
-</IfModule>
+#
+#<IfModule mod_expires.c>
+# ExpiresActive On
+# ExpiresDefault "access 7 days"
+# ExpiresByType application/javascript "access plus 1 year"
+# ExpiresByType text/javascript "access plus 1 year"
+# ExpiresByType text/css "access plus 1 year"
+# ExpiresByType text/html "access plus 7 day"
+# ExpiresByType text/x-javascript "access 1 year"
+# ExpiresByType image/gif "access plus 1 year"
+# ExpiresByType image/jpeg "access plus 1 year"
+# ExpiresByType image/png "access plus 1 year"
+# ExpiresByType image/jpg "access plus 1 year"
+# ExpiresByType image/x-icon "access 1 year"
+# ExpiresByType application/x-shockwave-flash "access 1 year"
+# </IfModule>
+#<IfModule mod_deflate.c>
+#AddOutputFilterByType DEFLATE text/plain
+#AddOutputFilterByType DEFLATE text/html
+#AddOutputFilterByType DEFLATE text/xml
+#AddOutputFilterByType DEFLATE text/css
+#AddOutputFilterByType DEFLATE application/xml
+#AddOutputFilterByType DEFLATE application/xhtml+xml
+#AddOutputFilterByType DEFLATE application/rss+xml
+#AddOutputFilterByType DEFLATE application/javascript
+#AddOutputFilterByType DEFLATE application/x-javascript
+#BrowserMatch ^Mozilla/4 gzip-only-text/html
+#BrowserMatch ^Mozilla/4\.0[678] no-gzip
+#BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+#Header append Vary User-Agent
+#RewriteEngine On
+#AddEncoding gzip .gz
+#RewriteCond %{HTTP:Accept-encoding} gzip
+#RewriteCond %{REQUEST_FILENAME}.gz -f
+#RewriteRule ^(.*)$ $1.gz [QSA,L]
+#</IfModule>
+## Cache-Control
+#<ifModule mod_headers.c>
+## 30 дней
+#    <filesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
+#    Header set Cache-Control "max-age=2592000, public"
+#    </filesMatch>
+#    # 30 дней
+#    <filesMatch "\.(css|js)$">
+#    Header set Cache-Control "max-age=2592000, public"
+#    </filesMatch>
+#    # 2 дня
+#    <filesMatch "\.(xml|txt)$">
+#    Header set Cache-Control "max-age=172800, public, must-revalidate"
+#    </filesMatch>
+#    # 1 день
+#    <filesMatch "\.(html|htm|php)$">
+#    Header set Cache-Control "max-age=172800, private, must-revalidate"
+#    </filesMatch>
+#</ifModule>
+#
+##Запрет отдачи HTTP-заголовков Vary браузерам семейства MSIE
+#<IfModule mod_setenvif.c>
+#BrowserMatch "MSIE" force-no-vary
+#BrowserMatch "Mozilla/4.[0-9]{2}" force-no-vary
+#</IfModule>
 <?php
-
-use yii\helpers\Html;
-use yii\grid\GridView;
-
-/* @var $this yii\web\View */
-/* @var $searchModel common\models\PageSearch */
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = \Yii::t('app', 'Pages');
-$this->params['breadcrumbs'][] = $this->title;
+    
+    use common\models\Page;
+    use yii\helpers\Html;
+    use yii\grid\GridView;
+    
+    /**
+     * @var  yii\web\View                $this
+     * @var  common\models\PageSearch    $searchModel
+     * @var  yii\data\ActiveDataProvider $dataProvider
+     */
+    
+    $this->title = \Yii::t('app', 'Pages');
+    $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="page-index">
-
+    
     <h1><?= Html::encode($this->title) ?></h1>
-
+    
     <p>
-        <?= Html::a(\Yii::t('app', 'Create Page'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(\Yii::t('app', 'Create Page'), [ 'create' ], [ 'class' => 'btn btn-success' ]) ?>
     </p>
     <?= GridView::widget([
         'dataProvider' => $dataProvider,
-        'filterModel' => $searchModel,
-        'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
+        'filterModel'  => $searchModel,
+        'columns'      => [
             'id',
-            ['class' => 'yii\grid\ActionColumn'],
+            [
+                'attribute' => 'title',
+                'value'     => 'lang.title',
+            ],
+            [
+                'attribute' => 'in_menu',
+                'value'     => function($model) {
+                    /**
+                     * @var Page $model
+                     */
+                    return ( !$model->in_menu ) ? \Yii::t('app', 'Не в меню') : \Yii::t('app', 'В меню');
+                },
+                'filter'    => [
+                    0 => \Yii::t('app', 'Не в меню'),
+                    1 => \Yii::t('app', 'В меню'),
+                ],
+            ],
+            [ 'class' => 'yii\grid\ActionColumn' ],
         ],
     ]); ?>
 </div>
@@ -11,13 +11,13 @@
      * @var PageLang[] $model_langs
      */
-    $this->title = \Yii::t('app', 'Update Page').': ' . $model->id;
+    $this->title = \Yii::t('app', 'Update Page') . ': ' . $model->lang->title;
     $this->params[ 'breadcrumbs' ][] = [
         'label' => \Yii::t('app', 'Pages'),
         'url'   => [ 'index' ],
     ];
     $this->params[ 'breadcrumbs' ][] = [
-        'label' => $model->id,
+        'label' => $model->lang->title,
         'url'   => [
             'view',
             'id' => $model->id,
@@ -3,10 +3,12 @@
     use yii\helpers\Html;
     use yii\widgets\DetailView;
-    /* @var $this yii\web\View */
-    /* @var $model common\models\Page */
+    /**
+     * @var yii\web\View        $this
+     * @var  common\models\Page $model
+     */
-    $this->title = $model->id;
+    $this->title = $model->lang->title;
     $this->params[ 'breadcrumbs' ][] = [
         'label' => \Yii::t('app', 'Pages'),
         'url'   => [ 'index' ],
@@ -35,9 +37,15 @@
     </p>
     <?= DetailView::widget([
-        'model' => $model,
+        'model'      => $model,
         'attributes' => [
             'id',
+            'lang.title',
+            [
+                'attribute' => 'in_menu',
+                'value'     => $model->in_menu ? Yii::t('app', 'В меню') : Yii::t('app', 'Не в меню'),
+            ],
+            'lang.body:html',
         ],
     ]) ?>
 <?php
     namespace common\models;
-
+    
     use common\modules\language\behaviors\LanguageBehavior;
     use yii\db\ActiveQuery;
     use yii\db\ActiveRecord;
     use yii\web\Request;
+    
     /**
      * This is the model class for table "page".
-     * @property integer $id
-     * @property bool    $in_menu
+     * @property integer    $id
+     * @property bool       $in_menu
      * * From language behavior *
-     * @property PageLang    $lang
-     * @property PageLang[]  $langs
-     * @property PageLang    $object_lang
-     * @property string         $ownerKey
-     * @property string         $langKey
+     * @property PageLang   $lang
+     * @property PageLang[] $langs
+     * @property PageLang   $object_lang
+     * @property string     $ownerKey
+     * @property string     $langKey
      * @method string           getOwnerKey()
-     * @method void             setOwnerKey(string $value)
+     * @method void             setOwnerKey( string $value )
      * @method string           getLangKey()
-     * @method void             setLangKey(string $value)
+     * @method void             setLangKey( string $value )
      * @method ActiveQuery      getLangs()
      * @method ActiveQuery      getLang( integer $language_id )
      * @method PageLang[]    generateLangs()
-     * @method void             loadLangs(Request $request, ActiveRecord[] $model_langs)
-     * @method bool             linkLangs(ActiveRecord[] $model_langs)
-     * @method bool             saveLangs(ActiveRecord[] $model_langs)
+     * @method void             loadLangs( Request $request, ActiveRecord[] $model_langs )
+     * @method bool             linkLangs( ActiveRecord[] $model_langs )
+     * @method bool             saveLangs( ActiveRecord[] $model_langs )
      * * End language behavior *
      */
-    class Page extends \yii\db\ActiveRecord
+    class Page extends ActiveRecord
     {
+        public $title;
+        
         /**
          * @inheritdoc
          */
@@ -58,6 +61,10 @@
         {
             return [
                 [
+                    [ 'title' ],
+                    'safe',
+                ],
+                [
                     [
                         'in_menu',
                     ],
@@ -72,8 +79,8 @@
         public function attributeLabels()
         {
             return [
-                'id'               => 'ID',
-                'in_menu'          => 'Show in menu',
+                'id'      => 'ID',
+                'in_menu' => 'Show in menu',
             ];
         }
     }
 <?php
-
-namespace common\models;
-
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-
-/**
- * PageSearch represents the model behind the search form about `common\models\Page`.
- */
-class PageSearch extends Page
-{
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['id'], 'integer'],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function scenarios()
-    {
-        // bypass scenarios() implementation in the parent class
-        return Model::scenarios();
-    }
-    public function behaviors()
-    {
-        return [];
-    }
+    namespace common\models;
+    
+    use yii\base\Model;
+    use yii\data\ActiveDataProvider;
     /**
-     * Creates data provider instance with search query applied
-     *
-     * @param array $params
-     *
-     * @return ActiveDataProvider
+     * PageSearch represents the model behind the search form about `common\models\Page`.
      */
-    public function search($params)
+    class PageSearch extends Page
     {
-        $query = Page::find();
-
-        // add conditions that should always apply here
-
-        $dataProvider = new ActiveDataProvider([
-            'query' => $query,
-        ]);
-
-        $this->load($params);
-
-        if (!$this->validate()) {
-            // uncomment the following line if you do not want to return any records when validation fails
-            // $query->where('0=1');
+        
+        public $title;
+        
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [ 'id' ],
+                    'integer',
+                ],
+                [
+                    [ 'title' ],
+                    'safe',
+                ],
+                [
+                    [ 'in_menu' ],
+                    'boolean',
+                ],
+            ];
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function scenarios()
+        {
+            // bypass scenarios() implementation in the parent class
+            return Model::scenarios();
+        }
+        
+        public function behaviors()
+        {
+            return [];
+        }
+        
+        /**
+         * Creates data provider instance with search query applied
+         *
+         * @param array $params
+         *
+         * @return ActiveDataProvider
+         */
+        public function search($params)
+        {
+            $query = Page::find()
+                         ->joinWith('lang');
+            
+            // add conditions that should always apply here
+            
+            $dataProvider = new ActiveDataProvider([
+                'query' => $query,
+                'sort'  => [
+                    'attributes' => [
+                        'title' => [
+                            'asc'  => [ 'page_lang.title' => SORT_ASC ],
+                            'desc' => [ 'page_lang.title' => SORT_DESC ],
+                        ],
+                        'id',
+                        'in_menu',
+                    ],
+                ],
+            ]);
+            
+            $this->load($params);
+            
+            if(!$this->validate()) {
+                // uncomment the following line if you do not want to return any records when validation fails
+                // $query->where('0=1');
+                return $dataProvider;
+            }
+            
+            // grid filtering conditions
+            $query->andFilterWhere([
+                'id'      => $this->id,
+                'in_menu' => $this->in_menu,
+            ])
+                  ->andFilterWhere([
+                      'like',
+                      'page_lang.title',
+                      $this->title,
+                  ]);
+            
             return $dataProvider;
         }
-
-        // grid filtering conditions
-        $query->andFilterWhere([
-            'id' => $this->id,
-        ]);
-
-        return $dataProvider;
     }
-}