gridview

yiichina · Aug 13, 2017 · b565dcb · b565dcb
1 parent 93538bd
commit b565dcb
Show file tree

Hide file tree

Showing 23 changed files with 289 additions and 128 deletions.
diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php
@@ -21,8 +21,6 @@ class AppAsset extends AssetBundle
         'yii\web\YiiAsset',
         'yii\bootstrap\BootstrapAsset',
         'yiichina\adminlte\AdminlteAsset',
-        //'yiichina\icheck\ICheckAsset',
-        //'yiichina\icheck\Select2Asset',
         'yiichina\icons\IconAsset',
     ];
 }
diff --git a/backend/assets/CheckAsset.php b/backend/assets/CheckAsset.php
diff --git a/backend/assets/SelectAsset.php b/backend/assets/SelectAsset.php
diff --git a/backend/controllers/NodeController.php b/backend/controllers/NodeController.php
@@ -83,6 +83,7 @@ public function actionUpdate($id)
         $model = $this->findModel($id);
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            Yii::$app->session->setFlash('success', Yii::t('app', 'Operation success.'));
             return $this->redirect(['index']);
         } else {
             return $this->render('update', [

diff --git a/backend/views/group/_form.php b/backend/views/group/_form.php
@@ -12,13 +12,9 @@
 
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'parent_id')->dropDownList($model->parentList) ?>
-
     <?= $form->field($model, 'name')->textInput() ?>
 
-    <?= $form->field($model, 'description')->textInput() ?>
-
-    <?= $form->field($model, 'status')->inline()->radioList($model->statusList) ?>
+    <?= $form->field($model, 'node_ids')->textInput() ?>
 
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? '新建' : '修改', ['class' => $model->isNewRecord ? 'btn btn-success btn-flat' : 'btn btn-primary btn-flat']) ?>

diff --git a/backend/views/group/index.php b/backend/views/group/index.php
@@ -9,8 +9,8 @@
 /* @var $searchModel common\models\NodeSearch */
 /* @var $dataProvider yii\data\ActiveDataProvider */
 
-$mainTitle = '栏目管理';
-$subTitle = '栏目列表';
+$mainTitle = '编辑组管理';
+$subTitle = '编辑组列表';
 $this->title = $subTitle . ' - ' . $mainTitle . ' - ' . Yii::$app->name;
 $breadcrumbs[] = ['label' => $mainTitle, 'url' => ['index']];
 $breadcrumbs[] = $subTitle;
@@ -33,7 +33,7 @@
             ['label' => '禁用', 'url' => ['disable']],
             ['label' => '启用', 'url' => ['enable']],
         ],
-        'button' => Html::a(Icon::show('plus', 'fa') . '新建栏目', ['create'], ['class' => 'btn btn-sm btn-flat btn-success']),
+        'button' => Html::a(Icon::show('plus', 'fa') . '新建编辑组', ['create'], ['class' => 'btn btn-sm btn-flat btn-success']),
         'columns' => [
             [
                 'class' => 'yii\grid\CheckboxColumn',
@@ -44,16 +44,16 @@
                 'options' => ['width' => 60],
             ],
             [
-                'attribute' => 'parent_id',
+                'attribute' => 'name',
                 'options' => ['width' => 60],
             ],
-            'name',
-            'description',
-            'status',
+            [
+                'attribute' => 'nodes',
+            ],
             [
                 'class' => 'yii\grid\ActionColumn',
                 'header' => '操作',
-                'options' => ['width' => 65],
+                'options' => ['width' => 70],
             ],
         ],
     ]); ?>

diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
@@ -8,9 +8,11 @@
 use yiichina\adminlte\Nav;
 use yiichina\adminlte\MainHeader;
 use yiichina\adminlte\SideBar;
+use yiichina\adminlte\Alert;
 use yiichina\icons\Icon;
 use yii\widgets\Breadcrumbs;
 use yii\widgets\Menu;
+use yii\widgets\Spaceless;
 use common\models\Node;
 
 AppAsset::register($this);
@@ -28,7 +30,7 @@
 </head>
 <body class="hold-transition skin-blue sidebar-mini">
 <?php $this->beginBody() ?>
-
+<?php Spaceless::begin(); ?>
 <div class="wrapper">
     <?php
     MainHeader::begin([
@@ -245,7 +247,8 @@
             ]) ?>
         </section>
         <section class="content">
-            <?php echo $content;?>
+            <?= Alert::widget() ?>
+            <?= $content ?>
         </section>
     </div>
 
@@ -446,6 +449,7 @@
   <div class="control-sidebar-bg"></div>
 </div>
 <!-- ./wrapper -->
+<?php Spaceless::end(); ?>
 <?php $this->endBody() ?>
 </body>
 </html>

diff --git a/backend/views/node/_form.php b/backend/views/node/_form.php
@@ -2,6 +2,7 @@
 
 use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
+use yiichina\icheck\ICheck;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Node */
@@ -18,12 +19,12 @@
 
     <?= $form->field($model, 'description')->textInput() ?>
 
-    <?= $form->field($model, 'type')->inline()->radioList($model->typeList) ?>
+    <?= $form->field($model, 'type')->inline()->widget(ICheck::className(), ['type' => ICheck::TYPE_RADIO_LIST, 'items' => $model->typeList]) ?>
 
-    <?= $form->field($model, 'status')->inline()->radioList($model->statusList) ?>
+    <?= $form->field($model, 'status')->inline()->widget(ICheck::className(), ['type' => ICheck::TYPE_RADIO_LIST, 'items' => $model->statusList]) ?>
 
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? '新建' : '修改', ['class' => $model->isNewRecord ? 'btn btn-success btn-flat' : 'btn btn-primary btn-flat']) ?>
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success btn-flat' : 'btn btn-primary btn-flat']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>

diff --git a/backend/views/node/_search.php b/backend/views/node/_search.php
@@ -2,7 +2,7 @@
 
 use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
-use common\models\Node;
+use yiichina\icheck\ICheck;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\NodeSearch */
@@ -15,7 +15,7 @@
         'action' => ['index'],
         'method' => 'get',
     ]); ?>
-
+    <?= ICheck::widget(['type' => ICheck::TYPE_RADIO_LIST, 'color' => ICheck::COLOR_GREEN, 'model' => $model, 'attribute' => 'status', 'items' => ['a' => 'b']]) ?>
     <div class="row">
         <div class="col-xs-3">
             <?= $form->field($model, 'parent_id', ['template' => '{input}', 'inputOptions' => ['class' => 'form-control input-sm']])->dropDownList($model->parentList, ['prompt' => '请选择父栏目']) ?>

diff --git a/backend/views/node/index.php b/backend/views/node/index.php
@@ -59,7 +59,7 @@
             [
                 'class' => 'yii\grid\ActionColumn',
                 'header' => '操作',
-                'options' => ['width' => 65],
+                'options' => ['width' => 80],
             ],
         ],
     ]); ?>

diff --git a/backend/views/post/_article.php b/backend/views/post/_article.php
@@ -22,7 +22,7 @@
     <?= $form->field($post, 'status')->textInput() ?>
 
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? '新建' : '修改', ['class' => $model->isNewRecord ? 'btn btn-success btn-flat' : 'btn btn-primary btn-flat']) ?>
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success btn-flat' : 'btn btn-primary btn-flat']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>

diff --git a/backend/views/sensitive/_form.php b/backend/views/sensitive/_form.php
@@ -12,16 +12,14 @@
 
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'parent_id')->dropDownList($model->parentList) ?>
+    <?= $form->field($model, 'node_id')->dropDownList($model->nodeList) ?>
 
-    <?= $form->field($model, 'name')->textInput() ?>
-
-    <?= $form->field($model, 'description')->textInput() ?>
+    <?= $form->field($model, 'words')->textInput() ?>
 
     <?= $form->field($model, 'status')->inline()->radioList($model->statusList) ?>
 
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? '新建' : '修改', ['class' => $model->isNewRecord ? 'btn btn-success btn-flat' : 'btn btn-primary btn-flat']) ?>
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success btn-flat' : 'btn btn-primary btn-flat']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>

diff --git a/backend/views/sensitive/index.php b/backend/views/sensitive/index.php
@@ -44,16 +44,18 @@
                 'options' => ['width' => 60],
             ],
             [
-                'attribute' => 'parent_id',
-                'options' => ['width' => 60],
+                'attribute' => 'node_id',
+                'options' => ['width' => 100],
+            ],
+            'words',
+            [
+                'attribute' => 'status',
+                'options' => ['width' => 100],
             ],
-            'name',
-            'description',
-            'status',
             [
                 'class' => 'yii\grid\ActionColumn',
                 'header' => '操作',
-                'options' => ['width' => 65],
+                'options' => ['width' => 70],
             ],
         ],
     ]); ?>

diff --git a/backend/views/site/login.php b/backend/views/site/login.php
@@ -6,6 +6,7 @@
 
 use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
+use yii\widgets\Spaceless;
 use backend\assets\AppAsset;
 
 $this->title = 'Login';
@@ -26,7 +27,7 @@
 </head>
 <body class="hold-transition login-page">
 <?php $this->beginBody() ?>
-
+<?php Spaceless::begin(); ?>
 <div class="login-box">
     <div class="login-logo"><b>Yii CMS</b> 后台管理系统</div>
     <!-- /.login-logo -->
@@ -51,6 +52,7 @@
     <!-- /.login-box-body -->
 </div>
 <!-- /.login-box -->
+<?php Spaceless::end(); ?>
 <?php $this->endBody() ?>
 </body>
 </html>

diff --git a/backend/views/user/index.php b/backend/views/user/index.php
@@ -55,11 +55,26 @@
                 'options' => ['width' => 150],
                 'format' => ['date', 'php:Y-m-d H:i:s'],
             ],
-            'status',
+            [
+                'attribute' => 'roles',
+                'options' => ['width' => 100],
+                'value' => function($data) {
+                    return $data->rolesLabel;
+                },
+                'format' => 'raw',
+            ],
+            [
+                'attribute' => 'status',
+                'options' => ['width' => 100],
+                'value' => function($data) {
+                    return $data->statusLabel;
+                },
+                'format' => 'raw',
+            ],
             [
                 'class' => 'yii\grid\ActionColumn',
                 'header' => '操作',
-                'options' => ['width' => 100],
+                'options' => ['width' => 70],
             ],
         ],
     ]); ?>

diff --git a/backend/web/css/site.css b/backend/web/css/site.css
@@ -7,3 +7,5 @@
 .btn-search.active .fa-search-plus:before { content: "\f010"; }
 .search { display: none; background: #f4f4f4; margin-bottom: 10px; padding: 10px 10px 0 10px; }
 .search .form-group { margin-bottom: 10px; }
+
+.grid-view tr td:last-child a { margin: 0 2px; }
diff --git a/backend/widgets/GridView.php b/backend/widgets/GridView.php
@@ -5,6 +5,7 @@
 use yii\bootstrap\ButtonDropdown;
 use yii\helpers\Html;
 use yiichina\icons\Icon;
+use yiichina\icheck\ICheckAsset;
 
 use Yii;
 
@@ -25,6 +26,18 @@ class GridView extends \yii\grid\GridView
     public function init()
     {
 		parent::init();
+        $view = $this->getView();
+        $asset = ICheckAsset::register($view);
+        $view->registerCssFile($asset->baseUrl . '/skins/minimal/blue.css');
+        $view->registerJs("$('input[type=\"checkbox\"]').iCheck({
+            checkboxClass: 'icheckbox_minimal-blue',
+            radioClass: 'iradio_minimal-blue',
+        });
+        $('input[name=\"selection_all\"]').on('ifToggled', function (event) {
+            var chkToggle;
+            $(this).is(':checked') ? chkToggle = \"check\" : chkToggle = \"uncheck\";
+            $('input[name=\"selection[]\"]').iCheck(chkToggle);
+        });");
         $this->pager['hideOnSinglePage'] = false;
 	}
 

diff --git a/common/models/Sensitive.php b/common/models/Sensitive.php
@@ -3,6 +3,7 @@
 namespace common\models;
 
 use Yii;
+use yii\helpers\ArrayHelper;
 
 /**
  * This is the model class for table "sensitive".
@@ -13,6 +14,9 @@
  */
 class Sensitive extends \yii\db\ActiveRecord
 {
+    const STATUS_INACTIVE = 0;
+    const STATUS_ACTIVE = 1;
+
     /**
      * @inheritdoc
      */
@@ -43,4 +47,17 @@ public function attributeLabels()
             'words' => Yii::t('app', 'Words'),
         ];
     }
+
+    public function getNodeList()
+    {
+        return ArrayHelper::map(Node::find()->all(), 'id', 'name');
+    }
+
+    public function getStatusList()
+    {
+        return [
+            self::STATUS_ACTIVE => '正常',
+            self::STATUS_INACTIVE => '禁用',
+        ];
+    }
 }