Merge branch 'master' of https://github.com/liulipeng/Yii2-Project-Admin

liulipeng · Jul 12, 2016 · a2db135 · a2db135
2 parents b3b0a72 + c8a3db7
commit a2db135
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,6 @@ Yii2 高级模板，配置的后台样式
 [![Total Downloads](https://poser.pugx.org/izyue/yii2-app-advanced/downloads)](https://packagist.org/packages/izyue/yii2-app-advanced)
 [![License](https://poser.pugx.org/izyue/yii2-app-advanced/license)](https://packagist.org/packages/izyue/yii2-app-advanced)
 [![Daily Downloads](https://poser.pugx.org/izyue/yii2-app-advanced/d/daily)](https://packagist.org/packages/izyue/yii2-app-advanced)
-[![Build Status](https://travis-ci.org/liulipeng/yii2-app-advanced.svg?branch=master)](https://travis-ci.org/liulipeng/yii2-app-advanced)
 
 ### 作者博客
 
@@ -79,27 +78,27 @@ Password: @newsnow.com.cn@
 
 #### 登录
 
-![](http://www.izyue.com/yii2-admin/index/1.jpg?6)
+![](http://www.izyue.com/yii2-admin/index/1.jpg)
 
 #### 首页
 
-![](http://www.izyue.com/yii2-admin/index/2.jpg?6)
+![](http://www.izyue.com/yii2-admin/index/2.jpg)
 
 #### 权限管理
 
-![](http://www.izyue.com/yii2-admin/index/3.jpg?6)
+![](http://www.izyue.com/yii2-admin/index/3.jpg)
 
 #### 角色管理
 
-![](http://www.izyue.com/yii2-admin/index/4.jpg?6)
+![](http://www.izyue.com/yii2-admin/index/4.jpg)
 
 #### 路由管理
 
-![](http://www.izyue.com/yii2-admin/index/5.jpg?6)
+![](http://www.izyue.com/yii2-admin/index/5.jpg)
 
 #### 菜单管理
 
-![](http://www.izyue.com/yii2-admin/index/6.jpg?6)
+![](http://www.izyue.com/yii2-admin/index/6.jpg)
 
 DIRECTORY STRUCTURE
 -------------------

diff --git a/backend/assets/AppAsset.php b/backend/assets/AppAsset.php
@@ -19,8 +19,6 @@ class AppAsset extends AssetBundle
         'statics/css/style-responsive.css',
     ];
     public $js = [
-//        'statics/js/jquery.js',
-        'statics/js/bootstrap.min.js',
         'statics/js/jquery.dcjqaccordion.2.7.js',
         'statics/js/jquery.scrollTo.min.js',
         'statics/js/jquery.nicescroll.js',
@@ -31,5 +29,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
@@ -71,13 +71,6 @@
                 ],
             ],
         ],
-//        'urlManager' => [
-//            'enablePrettyUrl' => true,
-//            'showScriptName' => false,
-//            'suffix' => '.html',
-//            'rules'=>[
-//            ],
-//        ],
         /*
         'urlManager' => [
             'enablePrettyUrl' => true,
@@ -92,7 +85,6 @@
         'allowActions' => [
             'debug/*',
             'site/*',
-            'admin/*',
 //            'admin/*',
             // The actions listed here will be allowed to everyone including guests.
             // So, 'admin/*' should not appear here in the production, of course.

diff --git a/backend/web/statics/js/tree.js b/backend/web/statics/js/tree.js
@@ -119,7 +119,7 @@ var TreeView = function () {
             });
 
             var treeDataSource7 = new DataSourceTree({
-                url: window.location.href,
+                url: '/index.php?r=admin%2Fmenu%2Findex',
                 delay: 400
             });
 
@@ -151,4 +151,4 @@ var TreeView = function () {
 
     };
 
-}();
+}();
diff --git a/common/models/AdminModel.php b/common/models/AdminModel.php
@@ -8,7 +8,7 @@
 use yii\web\IdentityInterface;
 
 /**
- * User model
+ * AdminModel
  *
  * @property integer $id
  * @property string $username
@@ -36,24 +36,6 @@ public static function tableName()
         return '{{%admin}}';
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function behaviors()
-    {
-        return [
-            TimestampBehavior::className(),
-        ];
-    }
-
-//    public function scenarios()
-//    {
-//        return [
-//            'create' => ['username', 'email', 'password'],
-//            'update' => ['username', 'email', 'password'],
-//        ];
-//    }
-
     /**
      * @inheritdoc
      */
@@ -79,6 +61,9 @@ public function rules()
         ];
     }
 
+    /**
+     * @inheritdoc
+     */
     public function attributeLabels(){
         return [
             'username' => Yii::t('common', 'username'),

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "type": "project",
     "license": "BSD-3-Clause",
     "support": {
-        "source": "https://github.com/liulipeng/yii2-app-advanced"
+        "source": "https://github.com/liulipeng/Yii2-Project-Admin"
     },
     "minimum-stability": "stable",
     "require": {