Merge pull request #1 from iiYii/forecho

基础版界面ok
iiYii · May 22, 2015 · 4bb43df · 4bb43df
2 parents c53c641 + 2528628
commit 4bb43df
Show file tree

Hide file tree

Showing 47 changed files with 138 additions and 4,158 deletions.
diff --git a/backend/assets/AdminLteAsset.php b/backend/assets/AdminLteAsset.php
@@ -11,17 +11,20 @@
 
 class AdminLteAsset extends AssetBundle
 {
-    public $sourcePath = '@vendor/bower/adminlte/dist';
+    public $sourcePath = '@vendor/bower/adminlte';
     public $css = [
-        'css/AdminLTE.min.css',
-        'css/skins/_all-skins.min.css'
+        'dist/css/AdminLTE.css',
+        'plugins/morris/morris.css',
+        'dist/css/skins/_all-skins.min.css'
     ];
     public $js = [
-        'js/app.min.js'
+        'plugins/morris/morris.js',
+        'plugins/iCheck/icheck.js',
+        'plugins/slimScroll/jquery.slimscroll.js',
+        'dist/js/app.js'
     ];
     public $depends = [
+        'backend\assets\AppAsset',
         'rmrevin\yii\fontawesome\AssetBundle',
-        'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
     ];
 }
diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php
@@ -24,6 +24,6 @@ class AppAsset extends AssetBundle
     ];
     public $depends = [
         'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
+        'yii\bootstrap\BootstrapPluginAsset',
     ];
 }
diff --git a/backend/config/main.php b/backend/config/main.php
@@ -11,24 +11,14 @@
     'basePath' => dirname(__DIR__),
     'controllerNamespace' => 'backend\controllers',
     'bootstrap' => ['log'],
-    'modules' => [
-        'rbac' => [
-            'class' => 'backend\modules\rbac\Module',
-        ],
-        'srbac' => [
-            'class' => 'backend\modules\srbac\SrbacModule',
-        ],
-    ],
+    'modules' => [],
     'components' => [
-        'authManager' => [
-            'class' => '\yii\rbac\DbManager',
-        ],
         'user' => [
             'identityClass' => 'common\models\User',
             'enableAutoLogin' => true,
         ],
         'log' => [
-            //'traceLevel' => YII_DEBUG ? 3 : 0,
+            'traceLevel' => YII_DEBUG ? 3 : 0,
             'targets' => [
                 [
                     'class' => 'yii\log\FileTarget',

diff --git a/backend/modules/rbac/Module.php b/backend/modules/rbac/Module.php
diff --git a/backend/modules/rbac/controllers/DefaultController.php b/backend/modules/rbac/controllers/DefaultController.php
diff --git a/backend/modules/rbac/views/default/index.php b/backend/modules/rbac/views/default/index.php
diff --git a/backend/modules/srbac/README.MD b/backend/modules/srbac/README.MD
diff --git a/backend/modules/srbac/SrbacModule.php b/backend/modules/srbac/SrbacModule.php
diff --git a/backend/modules/srbac/common.css b/backend/modules/srbac/common.css
diff --git a/backend/modules/srbac/config.php b/backend/modules/srbac/config.php