Merge branch 'master' into similar

Alexey Boroda
2 parents f28d611c 5a86b6e8
Showing 75 changed files with 325 additions and 173 deletions Show diff stats
.gitignore
backend/controllers/BrandController.php
backend/views/brand/_form.php
common/modules/product/models/Brand.php
console/migrations/m170202_140836_add_description_column_to_brand_table.php
frontend/views/catalog/brand.php
frontend/web/css/css_header.css
frontend/web/images/actioned/abg.png
frontend/web/images/arrows_blocks.png
frontend/web/images/bg.png
frontend/web/images/btn_cart_angle.png
frontend/web/images/cart-icon.png
frontend/web/images/cats_menu_divider.png
frontend/web/images/footer/bact2.png
frontend/web/images/footer/bfacebook.png
frontend/web/images/footer/bgoogle.png
frontend/web/images/footer/bsalesbox.png
frontend/web/images/footer/bsalesn2.png
frontend/web/images/footer/bvk.png
frontend/web/images/footer/nbkp2.png
@@ -44,7 +44,6 @@ storage2.zip
 /frontend/web/assets/
 /frontend/web/upload/
 /frontend/web/css/node_modules/
-/frontend/web/images/
 /frontend/views/вертска
 composer.lock
  
@@ -102,7 +102,7 @@ class BrandController extends Controller
  
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
  
-            return $this->redirect(['view', 'id' => $model->brand_id]);
+            return $this->redirect(['brand/view', 'id' => $model->brand_id]);
         } else {
             return $this->render('update', [
                 'model' => $model,
 <?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model common\modules\product\models\Brand */
-/* @var $form yii\widgets\ActiveForm */
+    
+    use mihaildev\ckeditor\CKEditor;
+    use mihaildev\elfinder\ElFinder;
+    use yii\helpers\Html;
+    use yii\widgets\ActiveForm;
+    
+    /* @var $this yii\web\View */
+    /* @var $model common\modules\product\models\Brand */
+    /* @var $form yii\widgets\ActiveForm */
 ?>
  
 <div class="brand-form">
+    
+    <?php $form = ActiveForm::begin(
+        [
+            'enableClientValidation' => false,
+            'options'                => [ 'enctype' => 'multipart/form-data' ],
+        ]
+    ); ?>
+    
+    <?= $form->field($model, 'name')
+             ->textInput() ?>
+    
+    <?= $form->field($model, 'alias')
+             ->textInput([ 'maxlength' => true ]) ?>
+    
+    <?= $form->field($model, 'image')
+             ->widget(
+                 \kartik\file\FileInput::classname(),
+                 [
+                     'language'      => 'ru',
+                     'options'       => [
+                         'accept'   => 'image/*',
+                         'multiple' => false,
+                     ],
+                     'pluginOptions' => [
+                         'allowedFileExtensions' => [
+                             'jpg',
+                             'gif',
+                             'png',
+                         ],
+                         'initialPreview'        => !empty($model->imageUrl) ? \common\components\artboximage\ArtboxImageHelper::getImage(
+                             $model->imageUrl,
+                             'list'
+                         ) : '',
+                         'overwriteInitial'      => true,
+                         'showRemove'            => false,
+                         'showUpload'            => false,
+                         'previewFileType'       => 'image',
+                     ],
+                 ]
+             ); ?>
+    
+    <?= $form->field($model, 'description')
+             ->widget(
+                 CKEditor::className(),
+                 [
+                     'editorOptions' => ElFinder::ckeditorOptions(
+                         'elfinder',
+                         [
+                             'preset'               => 'full',
+                             //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать
+                             'inline'               => false,
+                             //по умолчанию false]),
+                             'filebrowserUploadUrl' => Yii::$app->getUrlManager()
+                                                                ->createUrl('file/uploader/images-upload'),
+                         ]
+                     ),
+                 ]
+             ) ?>
+    
+    <?= $form->field($model, 'meta_title')
+             ->textInput([ 'maxlength' => true ]) ?>
+    
+    <?= $form->field($model, 'meta_desc')
+             ->textarea([ 'rows' => 6 ]) ?>
+    
+    <?= $form->field($model, 'meta_robots')
+             ->textInput([ 'maxlength' => true ]) ?>
+    
+    <?= $form->field($model, 'seo_text')
+             ->textarea([ 'rows' => 6 ]) ?>
+    
+    <?= $form->field($model, 'in_menu')
+             ->checkbox() ?>
  
-    <?php $form = ActiveForm::begin([
-        'enableClientValidation' => false,
-        'options' => ['enctype' => 'multipart/form-data']
-    ]); ?>
-
-    <?= $form->field($model, 'name')->textInput() ?>
-
-    <?= $form->field($model, 'alias')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'image')->widget(\kartik\file\FileInput::classname(), [
-        'language' => 'ru',
-        'options' => [
-            'accept' => 'image/*',
-            'multiple' => false,
-        ],
-        'pluginOptions' => [
-            'allowedFileExtensions' => ['jpg', 'gif', 'png'],
-            'initialPreview' => !empty($model->imageUrl) ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'list') : '',
-            'overwriteInitial' => true,
-            'showRemove' => false,
-            'showUpload' => false,
-            'previewFileType' => 'image',
-        ],
-    ]); ?>
-
-    <?= $form->field($model, 'meta_title')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'meta_desc')->textarea(['rows' => 6]) ?>
-
-    <?= $form->field($model, 'meta_robots')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'seo_text')->textarea(['rows' => 6]) ?>
-
-    <?= $form->field($model, 'in_menu')->checkbox()?>
-
-    <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
-        <?php if ($model->isNewRecord) :?>
-            <?= Html::submitButton(Yii::t('product', 'Create and continue'), ['name' => 'create_and_new', 'class' =>  'btn btn-primary']) ?>
-        <?php endif?>
-    </div>
-
+  <div class="form-group">
+      <?= Html::submitButton(
+          $model->isNewRecord ? Yii::t('product', 'Create') : Yii::t('product', 'Update'),
+          [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary' ]
+      ) ?>
+      <?php if ($model->isNewRecord) : ?>
+          <?= Html::submitButton(
+              Yii::t('product', 'Create and continue'),
+              [
+                  'name'  => 'create_and_new',
+                  'class' => 'btn btn-primary',
+              ]
+          ) ?>
+      <?php endif ?>
+  </div>
+    
     <?php ActiveForm::end(); ?>
  
 </div>
 <?php
-
-namespace common\modules\product\models;
-
-use common\behaviors\SaveImgBehavior;
-use common\behaviors\Slug;
-use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
-use yii\web\UploadedFile;
-use Yii;
-
-/**
- * This is the model class for table "brand".
- *
- * @property integer $brand_id
-
- * @property integer $brand_name_id
- * @property string $alias
- * @property string $image
- * @property string $meta_title
- * @property string $meta_desc
- * @property string $meta_robots
- * @property string $seo_text
- * @property string $name
- *
- * @property BrandName $brandName
- * @property BrandName[] $brandNames
- * @property Product[] $products
- */
-class Brand extends \yii\db\ActiveRecord
-{
-    public $imageUpload;
-
-    public $_items_count = 0;
-
+    
+    namespace common\modules\product\models;
+    
+    use common\behaviors\SaveImgBehavior;
+    use yii\db\ActiveRecord;
+    use Yii;
+    
     /**
-     * @inheritdoc
+     * This is the model class for table "brand".
+     *
+     * @property integer   $brand_id
+     * @property integer   $brand_name_id
+     * @property string    $alias
+     * @property string    $image
+     * @property string    $meta_title
+     * @property string    $meta_desc
+     * @property string    $meta_robots
+     * @property string    $seo_text
+     * @property string    $name
+     * @property string    $description
+     * @property Product[] $products
      */
-    public static function tableName()
+    class Brand extends ActiveRecord
     {
-        return 'brand';
+        public $imageUpload;
+        
+        public $_items_count = 0;
+        
+        /**
+         * @inheritdoc
+         */
+        public static function tableName()
+        {
+            return 'brand';
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        
+        public function behaviors()
+        {
+            return [
+                [
+                    'class'  => SaveImgBehavior::className(),
+                    'fields' => [
+                        [
+                            'name'      => 'image',
+                            'directory' => 'brands',
+                        ],
+                    ],
+                ],
+                'slug' => [
+                    'class'         => 'common\behaviors\Slug',
+                    'in_attribute'  => 'name',
+                    'out_attribute' => 'alias',
+                    'translit'      => true,
+                ],
+            ];
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [
+                        'name',
+                        'description',
+                    ],
+                    'string',
+                ],
+                [
+                    [ 'brand_name_id' ],
+                    'integer',
+                ],
+                [
+                    [ 'in_menu' ],
+                    'boolean',
+                ],
+                [
+                    [
+                        'meta_desc',
+                        'seo_text',
+                    ],
+                    'string',
+                ],
+                [
+                    [
+                        'alias',
+                        'name',
+                    ],
+                    'string',
+                    'max' => 250,
+                ],
+                [
+                    [
+                        'meta_title',
+                        'image',
+                    ],
+                    'string',
+                    'max' => 255,
+                ],
+                [
+                    [ 'meta_robots' ],
+                    'string',
+                    'max' => 50,
+                ],
+                [
+                    [ 'imageUpload' ],
+                    'safe',
+                ],
+                [
+                    [ 'imageUpload' ],
+                    'file',
+                    'extensions' => 'jpg, gif, png',
+                ],
+            ];
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function attributeLabels()
+        {
+            return [
+                'name'          => Yii::t('product', 'Name of the brand'),
+                'brand_id'      => Yii::t('product', 'Brand ID'),
+                'brand_name_id' => Yii::t('product', 'Brand Name ID'),
+                'alias'         => Yii::t('product', 'Alias'),
+                'image'         => Yii::t('product', 'Image'),
+                'imageUrl'      => Yii::t('product', 'Image'),
+                'meta_title'    => Yii::t('product', 'Meta Title'),
+                'meta_desc'     => Yii::t('product', 'Meta Desc'),
+                'meta_robots'   => Yii::t('product', 'Meta Robots'),
+                'seo_text'      => Yii::t('product', 'Seo Text'),
+                'in_menu'       => Yii::t('product', 'Выводить в меню'),
+                'description'   => Yii::t('product', 'Описание'),
+            ];
+        }
+        
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getProducts()
+        {
+            return $this->hasMany(Product::className(), [ 'brand_id' => 'brand_id' ]);
+        }
+        
+        public function getImageFile()
+        {
+            return empty($this->image) ? NULL : '/storage/brands/' . $this->image;
+        }
+        
+        public function getImageUrl()
+        {
+            return empty($this->image) ? NULL : '/storage/brands/' . $this->image;
+        }
+        
     }
-
-
-    /**
-     * @inheritdoc
-     */
-
-    public function behaviors()
-    {
-        return [
-            [
-                'class'     => SaveImgBehavior::className(),
-                'fields' => [
-                    ['name'=>'image','directory' => 'brands' ]
-                ]
-            ],
-            'slug' => [
-                'class' => 'common\behaviors\Slug',
-                'in_attribute' => 'name',
-                'out_attribute' => 'alias',
-                'translit' => true
-            ],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['name'], 'string'],
-            [['brand_name_id'], 'integer'],
-            [['in_menu'], 'boolean'],
-            [['meta_desc', 'seo_text'], 'string'],
-            [['alias', 'name'], 'string', 'max' => 250],
-            [['meta_title', 'image'], 'string', 'max' => 255],
-            [['meta_robots'], 'string', 'max' => 50],
-            [['imageUpload'], 'safe'],
-            [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'name' => Yii::t('product', 'Name of the brand'),
-            'brand_id' => Yii::t('product', 'Brand ID'),
-            'brand_name_id' => Yii::t('product', 'Brand Name ID'),
-            'alias' => Yii::t('product', 'Alias'),
-            'image' => Yii::t('product', 'Image'),
-            'imageUrl' => Yii::t('product', 'Image'),
-            'meta_title' => Yii::t('product', 'Meta Title'),
-            'meta_desc' => Yii::t('product', 'Meta Desc'),
-            'meta_robots' => Yii::t('product', 'Meta Robots'),
-            'seo_text' => Yii::t('product', 'Seo Text'),
-            'in_menu' => Yii::t('product', 'Выводить в меню'),
-        ];
-    }
-
-
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getProducts()
-    {
-        return $this->hasMany(Product::className(), ['brand_id' => 'brand_id']);
-    }
-
-    public function getImageFile() {
-        return empty($this->image) ? null : '/storage/brands/'. $this->image;
-    }
-
-    public function getImageUrl() {
-        return empty($this->image) ? null : '/storage/brands/'. $this->image;
-    }
-
-}
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles adding description to table `brand`.
+ */
+class m170202_140836_add_description_column_to_brand_table extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function up()
+    {
+        $this->addColumn('brand', 'description', $this->text());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function down()
+    {
+        $this->dropColumn('brand', 'description');
+    }
+}
@@ -45,8 +45,15 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $brand-&gt;name;
  
         <h1 class="title"><?= Seo::widget(['row' => 'h1']) ?></h1>
  
+      <div class="brand-seo-text">
+        <?php
+            if(!empty($brand->description)) echo $brand->description;
+          ?>
+      </div>
+      <div class="clearfix"></div>
  
-        <div class="list_filters_links">
+
+      <div class="list_filters_links">
             <div class="sort_block">
                 <span>Сортировка:</span>
                 <?= \yii\widgets\LinkSorter::widget([
@@ -20,6 +20,32 @@
     width: auto!important
 }
  
+/* Arrows in sorter styling */
+ul.sorter {
+    list-style-type: none;
+}
+
+ul.sorter li a:after {
+    display: inline-block;
+    margin-left: 4px;
+    margin-bottom: 2px;
+    content: '';
+    width: 0;
+    height: 0;
+}
+
+ul.sorter li a.asc:after {
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+    border-bottom: 5px solid black;
+}
+
+ul.sorter li a.desc:after {
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+    border-top: 5px solid black;
+}
+
 html {
     font-family: sans-serif;
     -ms-text-size-adjust: 100%;
@@ -6549,6 +6575,11 @@ header a#logo img {
     width: 100%
 }
  
+.brand-seo-text {
+    margin-bottom: 20px;
+    padding: 0px 5px;
+}
+
 #brand_bar {
     float: left;
     width: 100%;
@@ -10155,7 +10186,7 @@ footer .vacancies p {
     border-right: none
 }
  
-#myItemCarousel .product_item .info .title,,.prodview .product_item .title {
+#myItemCarousel .product_item .info .title,.prodview .product_item .title {
                                                 font-size: 13px;
                                                 min-height: 45px;
                                                 padding: 5px 10px 0 0
@@ -11479,7 +11510,7 @@ a.preview {
 }
  
 .modal-body input:-webkit-autofill,.modal-body textarea:-webkit-autofill,.modal-body select:-webkit-autofill {
-    -webkit-text-fill-color: $ textColor;
+    /*-webkit-text-fill-color: $ textColor;*/
     -webkit-box-shadow: 0 0 0 1000px #eaeaea inset;
     background-color: #eaeaea
 }
@@ -23456,7 +23487,7 @@ border-right: none
 border-right: none
 }
  
-#myItemCarousel .product_item .info .title,,.prodview .product_item .title {
+#myItemCarousel .product_item .info .title,.prodview .product_item .title {
 font-size: 13px;
 min-height: 45px;
 padding: 5px 10px 0 0
@@ -24780,7 +24811,7 @@ border-color: #dbdbdb
 }
  
 .modal-body input:-webkit-autofill,.modal-body textarea:-webkit-autofill,.modal-body select:-webkit-autofill {
--webkit-text-fill-color: $ textColor;
+/*-webkit-text-fill-color: $ textColor;*/
 -webkit-box-shadow: 0 0 0 1000px #eaeaea inset;
 background-color: #eaeaea
 }