3010

common/modules/documentation/assets/src/css/documentation.css

@@ -3,4 +3,9 @@
 }
 .faq_sec img {
     max-width: 100%;
+}
+.faq_sec p img ,
+.faq_sec li img {
+    margin-top: 20px;
+    margin-bottom: 20px
 }
\ No newline at end of file

common/modules/documentation/controllers/DocumentationListAdminController.php

@@ -26,6 +26,7 @@ class DocumentationListAdminController extends AdminController
             'View' => 'Просмотр модуля',
             'Delete' => '',
             'Createcontroller' => 'Создание контроллера',
+            'Sort' => 'Соктировка списка',
             'Deletecontroller' => '',
             'Updatecontroller' => '',
         ];
@@ -65,6 +66,59 @@ class DocumentationListAdminController extends AdminController
         ]);
     }
 
+    /**
+     * Lists all DocList models.
+     * @return mixed
+     */
+    public function actionSort($id = 0)
+    {
+        $items = yii::$app->request->post('items');
+        if ($items) {
+            $items = \yii\helpers\Json::decode($items, true);
+            $newOrder = [];
+            $models = [];
+            $transaction = Yii::$app->db->beginTransaction();
+            try {
+
+                $success = true;
+                $newOrder = [];
+                $models = [];
+                foreach ($items as $old => $new) {
+                    $models[$new] = $this->findModel($new);
+                    $newOrder[$old] = $models[$new]->position;
+                }
+                foreach ($newOrder as $modelId => $orderValue) {
+                    $models[$modelId]->position = $orderValue;
+                    if (!$models[$modelId]->save()) {
+                        $success = false;
+                    }
+                }
+                if ($success) {
+                    $transaction->commit();
+                } else {
+                    $transaction->rollBack();
+                }
+            } catch (\Exception $e) {
+                $transaction->rollBack();
+                throw $e;
+            }
+            return;
+        }
+        $searchModel = new SearchDocList();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams, 2000000);
+        $dataProvider->query->andWhere(['=', 'parent_id', $id]);
+        \yii::$app->controller->page_title = \yii::t('documentation', 'Соктировка списка');
+
+        \yii::$app->controller->breadcrumbs = [
+            \yii::t('documentation', 'Соктировка списка'),
+        ];
+
+        return $this->render('sort', [
+                    'searchModel' => $searchModel,
+                    'dataProvider' => $dataProvider,
+        ]);
+    }
+
     /**
      * Displays a single DocList model.
      * @param integer $id
@@ -132,8 +186,10 @@ class DocumentationListAdminController extends AdminController
             $transaction = Yii::$app->db->beginTransaction();
             try {
                 $model->parent_id = (int) $model->parent_id;
-                if ($model->isNewRecord)
-                    $model->position = DocList::find()->where(['=', 'parent_id', (int) $model->parent_id])->count();
+                if ($model->isNewRecord) {
+                    $last = DocList::find()->where(['=', 'parent_id', (int) $model->parent_id])->orderBy(['position' => SORT_DESC])->one();
+                    $model->position = $last ? $last->position + 1 : 0;
+                }
                 if ($model->save()) {
                     $transaction->commit();
                     return $this->redirect(\yii\helpers\Url::toRoute(['manage']));

common/modules/documentation/models/SearchDocList.php

@@ -41,7 +41,7 @@ class SearchDocList extends DocList
      *
      * @return ActiveDataProvider
      */
-    public function search($params)
+    public function search($params, $pagesize = 20)
     {
         $idList = array_keys($this->getParentList($this, 0, 0, true));
         $idListInt = [-1];
@@ -55,6 +55,9 @@ class SearchDocList extends DocList
             $query->orderBy([new \yii\db\Expression('FIELD (`doc_list`.`id`, ' . implode(',', $idListInt) . ')')]);
         $dataProvider = new ActiveDataProvider([
             'query' => $query,
+            'pagination' => [
+                'pageSize' => $pagesize,
+            ],
             'sort' => [
                 'attributes' => [
                     'id',
@@ -69,10 +72,10 @@ class SearchDocList extends DocList
         ]);
 
         $this->load($params);
-
+        
         if (!$this->validate()) {
             // uncomment the following line if you do not want to any records when validation fails
-            // $query->where('0=1');
+             $query->where('0=1');
             return $dataProvider;
         }
 

common/modules/documentation/views/documentation-list-admin/_form.php

@@ -45,7 +45,9 @@ $blocks = \common\modules\content\models\CoBlocks::find()->all();
         <?php endforeach; ?>
     </div>       
 
-    <?= $form->field($model, 'parent_id')->dropDownList($model->getParentList($model), ['class' => 'form-control', 'prompt'=>'Выберите родительский раздел']) ?>
+    <?= (yii::$app->request->get('position')) ? $form->field($model, 'position')->textInput(['class' => 'form-control']) : ''; ?>
+
+    <?= $form->field($model, 'parent_id')->dropDownList($model->getParentList($model), ['class' => 'form-control', 'prompt' => 'Выберите родительский раздел']) ?>
     <?=
     $form->field($model, 'active', [
         'template' => '{input}<a href="#" class="btn btn-xs btn-success m-l-5 disabled">Пункт меню скрыт от пользователя / Пункт меню виднен для пользователю</a>'

common/modules/documentation/views/documentation-list-admin/index.php

@@ -56,6 +56,12 @@ $parentList = $searchModel->getParentList($searchModel, 0, 0, true);
         /* 'url:url', */
         [
             'class' => 'common\components\ColorActionColumn',
+            'template' => '{sort} {view} {update} {delete}',
+            'buttons' => [
+                'sort' => function($url, $model, $key) {
+                    return Html::a('<i class="fa fa-sort fa-lg"></i>', ['/documentation/documentation-list-admin/sort', 'id' => $model->parent_id], ["title" => "Сортировать", 'data-toggle' => "tooltip", "data-pjax" => "0"]);
+                },
+            ],
             'headerOptions' => [
                 'style' => 'width: 150px;'
             ]

common/modules/documentation/views/documentation-list-admin/sort.php

+<?php
+
+use yii\helpers\Html;
+use himiklab\sortablegrid\SortableGridView
+
+/* @var $this yii\web\View */
+/* @var $searchModel common\modules\documentation\models\SearchCoCategory */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+?>
+
+
+<?=
+SortableGridView::widget([
+    'dataProvider' => $dataProvider,
+    'columns' => [
+        [
+            'header' => '<span class="glyphicon glyphicon-align-justify"></span>',
+//            'label' => '<span class="glyphicon glyphicon-align-justify"></span>',
+            'attribute' => 'id',
+            'format' => 'raw',
+            'value' => function() {
+                return '<i class="fa fa-sort fa-lg"></i>';
+            }
+        ],
+        [
+            'header' => $searchModel->getAttributeLabel('id'),
+            'attribute' => 'id',
+        ],
+        [
+            'header' => $searchModel->getAttributeLabel('position'),
+            'attribute' => 'position',
+        ],
+        [
+            'header' => $searchModel->getAttributeLabel('name'),
+            'attribute' => 'name',
+            'format' => 'raw',
+            'value' => function($model) {
+                return'<p style="white-space: nowrap;">' . $model->lang->name . '</p>';
+            }
+        ],
+        [
+            'header' => $searchModel->getAttributeLabel('parent_id'),
+            'attribute' => 'parent_id',
+            'value' => function($model) {
+                return $model->parent ? $model->parent->lang->name : null;
+            }
+        ],
+        [
+            'header' => $searchModel->getAttributeLabel('active'),
+            'attribute' => 'active',
+            'value' => function($model) {
+                $list = ['0' => 'Пункт меню скрыт от пользователя ', '1' => 'Пункт меню виднен для пользователю'];
+                return $list[$model->active];
+            }
+        ],
+    ],
+]);
+?>
+
+<style>
+    .table thead tr th:nth-child(1) ,
+    .table tbody tr td:nth-child(1) {
+        width: 0.1px;
+        padding: 10px 2px;
+        text-align: center;
+    }
+</style>
\ No newline at end of file

common/modules/documentation/views/page/view.php

@@ -18,10 +18,9 @@ $this->registerMetaTag(['property' => 'og:type', 'content' => 'article']);
 $this->registerMetaTag(['property' => 'og:title', 'content' => $modelContent->name]);
 $this->registerMetaTag(['property' => 'og:image', 'content' => 'https://task-on.com/images/taskon.png']);
 $this->registerMetaTag(['property' => 'og:description', 'content' => 'Разработка высоконагруженных сервисов, интернет порталов, корпоративных порталов.']);
-$this->registerMetaTag(['property' => 'og:url', 'content' => Url::current([],true)]);
+$this->registerMetaTag(['property' => 'og:url', 'content' => Url::current([], true)]);
 //$this->registerMetaTag(['property' => 'og:url', 'content' => Url::base(true)]);
 $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Проект']);
-
 ?>
 
 
@@ -36,9 +35,9 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
                 <div class="col-sm-12">
                     <ul>
                         <li class="active">
-                            <a href="faq.html">
+                            <a href="/faq">
                                 <span class="icon_info_2">
-                                </span>Документация </a>
+                                </span>Руководство пользователя </a>
                         </li>
                     </ul>
                 </div>
@@ -50,7 +49,10 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
             <div class="col-sm-12">
                 <div class="way">
                     <a href="/">Главная</a>
-                    <span>|</span>    Документация
+                    <span>|</span>    
+                    <a href="/faq/">Руководство пользователя</a>
+                    <span>|</span>    
+                    <a href="/yii-dokumentaciya/">Документаци для разраотчиков</a>
                     <span>|</span>   <?php echo $modelContent->name ?><br> <br>
                 </div>
             </div>