Merge remote-tracking branch 'origin/development' into development

backend/modules/theme/controllers/CategoryController.php

@@ -63,6 +63,8 @@ class CategoryController extends Controller
     public function actionCreate()
     {
         $model = new Category();
+        $this->layout = '@backend/modules/theme/views/category/layout.php';
+      //  $model->scenario =
 
         $model->status = $model::STATUS_ACTIVE;
 

backend/modules/theme/views/category/_form.php

@@ -12,19 +12,18 @@ use trntv\filekit\widget\Upload;
 <div class="category-form">
 
     <?php $form = ActiveForm::begin(); ?>
-
-    <ul id="myTab" class="nav nav-tabs">
-        <li class="active">
-            <a href="#info" data-toggle="tab">
-                Info
-            </a>
-        </li>
-        <li>
-            <a href="#files" data-toggle="tab">
-                Files
-            </a>
-        </li>
-    </ul>
+<!--    <ul id="myTab" class="nav nav-tabs">-->
+<!--        <li class="active">-->
+<!--            <a href="#info" data-toggle="tab">-->
+<!--                Info-->
+<!--            </a>-->
+<!--        </li>-->
+<!--        <li>-->
+<!--            <a href="#files" data-toggle="tab">-->
+<!--                Files-->
+<!--            </a>-->
+<!--        </li>-->
+<!--    </ul>-->
 
     <div id="myTabContent" class="tab-content">
         <div class="tab-pane fade in active" id="info">
@@ -63,7 +62,7 @@ use trntv\filekit\widget\Upload;
                 </div>
             </div>
             <div class="row">
-                <div class="col-md-6">
+                <div class="col-md-3">
                     <?= $form->field($model, 'status')->dropDownList($model::statuses(), ['prompt' => '']) ?>
                 </div>
             </div>

backend/modules/theme/views/category/layout.php

+<?php
+use yii\widgets\Menu;
+use common\models\Category;
+
+/* @var $this yii\web\View */
+
+?>
+<?php $this->beginContent('@backend/views/layouts/main.php'); ?>
+
+<?=
+Menu::widget([
+    'items' => [
+        ['label' => 'Info', 'url' => ['category/create']],
+        ['label' => 'Files', 'url' => ['category/update', 'id' =>'' ]],
+    ],
+    'options' => [
+        'class' => 'nav nav-tabs',
+        'role' => 'tablist',
+        'id' => 'category-form-tab',
+    ],
+]);
+?>
+
+<div id="myTabContent" class="tab-content">
+    <?php echo $content ?>
+</div>
+<?php $this->endContent(); ?>