From bdc1c743181d375a5775788badbd86552729be20 Mon Sep 17 00:00:00 2001
From: wushuiyong <wu.shuiyong@qq.com>
Date: Sun, 17 Apr 2016 23:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96PR=EF=BC=8C=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=BE=88=E5=A4=9A=EF=BC=8C=E6=98=8E=E5=A4=A9=E8=BF=98?=
 =?UTF-8?q?=E6=9C=89=E5=BE=97=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Controller.php                |  19 ++-
 components/GlobalHelper.php              |   1 +
 controllers/UserController.php           | 143 +++++++++++++++-
 controllers/UserManagementController.php | 124 --------------
 mail/accountNotice.php                   |  14 +-
 mail/passwordResetToken.php              |   3 +-
 messages/en/user-management.php          |  38 -----
 messages/en/user.php                     |  34 ++++
 messages/en/w.php                        |   2 +
 messages/zh-CN/user-management.php       |  38 -----
 messages/zh-CN/user.php                  |  40 ++++-
 messages/zh-CN/w.php                     |   6 +-
 models/User.php                          |  11 ++
 models/forms/AddUserForm.php             |   4 +-
 views/conf/edit.php                      |  46 +++---
 views/layouts/main.php                   |  31 ++++
 views/user-management/adduser.php        |  41 -----
 views/user-management/index.php          | 200 -----------------------
 views/user/add.php                       |  41 +++++
 views/user/list.php                      | 163 ++++++++++++++++++
 20 files changed, 514 insertions(+), 485 deletions(-)
 delete mode 100644 controllers/UserManagementController.php
 delete mode 100644 messages/en/user-management.php
 delete mode 100644 messages/zh-CN/user-management.php
 delete mode 100644 views/user-management/adduser.php
 delete mode 100644 views/user-management/index.php
 create mode 100644 views/user/add.php
 create mode 100644 views/user/list.php

diff --git a/components/Controller.php b/components/Controller.php
index 8f43ab83..d3a200e9 100644
--- a/components/Controller.php
+++ b/components/Controller.php
@@ -13,6 +13,16 @@
 
 class Controller extends yii\web\Controller {
 
+    /**
+     * 返回成功
+     */
+    const SUCCESS = 0;
+
+    /**
+     * 返回失败
+     */
+    const FAIL    = -1;
+
     public $uid = null;
 
     /**
@@ -35,15 +45,14 @@ public function beforeAction($action) {
      * @param string    $msg  错误信息
      * @param int       $option json_encode options
      */
-    public static function renderJson($data, $code = 0, $msg = '', $option = 0) {
+    public static function renderJson($data, $code = self::SUCCESS, $msg = '', $option = 0) {
         Yii::$app->response->format = yii\web\Response::FORMAT_JSON;
-        $ret = [
+
+        Yii::$app->response->data = [
             'code' => (int)$code,
             'msg'  => $msg,
             'data' => $data,
-        ];
-
-        Yii::$app->response->data = $ret;
+        ];;
         Yii::$app->end();
     }
 
diff --git a/components/GlobalHelper.php b/components/GlobalHelper.php
index e91fb47b..31d1b76f 100644
--- a/components/GlobalHelper.php
+++ b/components/GlobalHelper.php
@@ -100,6 +100,7 @@ public static function formatAvatar($pic) {
     public static function isValidAdmin() {
         return \Yii::$app->user
             && \Yii::$app->user->identity->role == \app\models\User::ROLE_ADMIN
+            && \Yii::$app->user->identity->is_email_verified == \app\models\User::MAIL_ACTIVE
             && \Yii::$app->user->identity->status == \app\models\User::STATUS_ACTIVE;
     }
 
diff --git a/controllers/UserController.php b/controllers/UserController.php
index d1474993..25dbebf0 100644
--- a/controllers/UserController.php
+++ b/controllers/UserController.php
@@ -9,6 +9,8 @@
 use app\models\User;
 use app\models\forms\UserResetPasswordForm;
 use yii\base\InvalidParamException;
+use app\models\forms\AddUserForm;
+use yii\data\Pagination;
 
 
 class UserController extends Controller {
@@ -26,13 +28,13 @@ public function actionIndex() {
     public function actionAvatar() {
         $fileParts = pathinfo($_FILES['avatar']['name']);
         if ($_FILES['avatar']['error']) {
-            $this->renderJson([], -1, yii::t('user', 'upload failed'));
+            $this->renderJson([], self::FAIL, yii::t('user', 'upload failed'));
         }
         if ($_FILES['avatar']['size'] > static::AVATAR_SIZE) {
-            $this->renderJson([], -1, yii::t('user', 'attached\'s size too large'));
+            $this->renderJson([], self::FAIL, yii::t('user', 'attached\'s size too large'));
         }
         if (!in_array(strtolower($fileParts['extension']), \Yii::$app->params['user.avatar.extension'])) {
-            $this->renderJson([], -1, yii::t('user', 'type not allow', [
+            $this->renderJson([], self::FAIL, yii::t('user', 'type not allow', [
                 'types' => join(', ', \Yii::$app->params['user.avatar.extension'])
             ]));
         }
@@ -62,6 +64,25 @@ public function actionAudit() {
     }
 
 
+    /**
+     * 用户管理
+     */
+    public function actionList($page = 1, $size = 10) {
+        $userList = User::find()->orderBy('id desc');
+        $kw = \Yii::$app->request->post('kw');
+        if ($kw) {
+            $userList->andFilterWhere(['like', "username", $kw])
+                ->orFilterWhere(['like', "email", $kw]);
+        }
+        $pages = new Pagination(['totalCount' => $userList->count(), 'pageSize' => $size]);
+        $userList = $userList->offset(($page - 1) * $size)->limit($size)->asArray()->all();
+
+        return $this->render('list', [
+            'userList' => $userList,
+            'pages' => $pages,
+        ]);
+    }
+
     /**
      * 删除项目管理员
      *
@@ -72,11 +93,6 @@ public function actionDeleteAdmin($id) {
         $this->validateAdmin();
         $user = $this->findModel($id);
 
-        if ($user->role != User::ROLE_ADMIN || $user->is_email_verified != 1
-            || $user->status != User::STATUS_INACTIVE) {
-            throw new \Exception(yii::t('user', 'cant\'t remove active manager'));
-        }
-
         if (!$user->delete()) throw new \Exception(yii::t('w', 'delete failed'));
         $this->renderJson([]);
     }
@@ -133,4 +149,115 @@ protected function findModel($id) {
         }
     }
 
+    /**
+     * 设置为管理员
+     *
+     * @return json
+     */
+    public function actionToAdmin($uid) {
+        $this->validateAdmin();
+        if ($uid) {
+            User::updateAll(['role' => User::ROLE_ADMIN], ['id' => $uid]);
+        }
+
+        $this->renderJson([], self::SUCCESS);
+    }
+
+    /**
+     * 设置为普通用户
+     *
+     * @return  json
+     */
+    public function actionToDev($uid) {
+        $this->validateAdmin();
+        if ($uid) {
+            User::updateAll(['role' => User::ROLE_DEV], ['id' => $uid]);
+        }
+
+        $this->renderJson([], self::SUCCESS);
+    }
+
+    /**
+     * 帐号冻结
+     *
+     * @return  json
+     */
+    public function actionBan($uid) {
+        $this->validateAdmin();
+        if ($uid) {
+            User::updateAll(['status' => User::STATUS_INVALID], ['id' => $uid]);
+        }
+
+        $this->renderJson([], self::SUCCESS);
+    }
+
+    /**
+     * 帐号解冻
+     *
+     * @return  json
+     */
+    public function actionUnBan($uid) {
+        $this->validateAdmin();
+        if ($uid) {
+            User::updateAll(['status' => User::STATUS_ACTIVE], ['id' => $uid]);
+        }
+
+        $this->renderJson([], self::SUCCESS);
+    }
+
+    /**
+     * 删除帐号
+     *
+     * @return json
+     */
+    public function actionDelete($uid) {
+        $this->validateAdmin();
+        $user = User::findOne($uid);
+        if ($user) {
+            $user->delete();
+        }
+
+        $this->renderJson([], self::SUCCESS);
+    }
+
+    /**
+     * 修改真实姓名
+     *
+     * @return   json
+     */
+    public function actionRename($realName, $uid) {
+        $this->validateAdmin();
+        if ($realName && $uid) {
+            $res = User::updateAll(['realname' => $realName], ['id' => $uid]);
+            $this->renderJson([], $res ? self::SUCCESS : self::FAIL, $res ? '' : Yii::t('w', 'update failed'));
+        }
+        $this->renderJson([], self::FAIL, Yii::t('w', 'update failed'));
+    }
+
+    /**
+     * 新增用户
+     */
+    public function actionAdd() {
+        $this->validateAdmin();
+        $model = new AddUserForm();
+
+        if ($model->load(Yii::$app->request->post()) ) {
+            if ($user = $model->signup()) {
+                Yii::$app->mail->compose('accountNotice', ['user' => $user])
+                    ->setFrom(Yii::$app->mail->messageConfig['from'])
+                    ->setTo($user->email)
+                    ->setSubject('瓦力平台 - 帐号已开通')
+                    ->send();
+
+                return $this->redirect('@web/user/list');
+            }
+            else {
+                throw new \Exception(yii::t('user', 'email exists'));
+            }
+        }
+
+        return $this->render('add', [
+            'model' => $model
+        ]);
+    }
 }
diff --git a/controllers/UserManagementController.php b/controllers/UserManagementController.php
deleted file mode 100644
index 11c9a2bf..00000000
--- a/controllers/UserManagementController.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace app\controllers;
-
-use yii;
-use yii\web\NotFoundHttpException;
-use yii\data\Pagination;
-use app\components\Controller;
-use app\components\GlobalHelper;
-use app\models\User;
-use app\models\forms\AddUserForm;
-
-class UserManagementController extends Controller {
-    
-    public function beforeAction($action) {
-        parent::beforeAction($action);
-        if (!GlobalHelper::isValidAdmin()) {
-            throw new \Exception(yii::t('conf', 'you are not active'));
-        }
-        return true;
-    }
-
-    /**
-     * 用户管理
-     */
-    public function actionIndex($page = 1, $size = 10) {
-        $data = User::find()->orderBy('id desc');
-
-        $pages = new Pagination(['totalCount' => $data->count(), 'pageSize' => $size]);
-        $userList = $data->offset(($page - 1) * $size)->limit($size)->asArray()->all();
-
-        return $this->render('index', [
-            'userList' => $userList,
-            'pages' => $pages,
-        ]);
-    }
-
-    /**
-     * 设置为管理员
-     * @return json
-     */
-    public function actionUpdateToAdmin($uid) {
-        $res = User::updateAll(['role' => 1], "id=$uid");
-
-        $this->renderJson([], $res ? 0 : -1);
-    }
-
-    /**
-     * 设置为普通用户
-     * @return  json 
-     */
-    public function actionUpdateToUser($uid) {
-        $res = User::updateAll(['role' => 10], "id=$uid");
-
-        $this->renderJson([], $res ? 0 : -1);
-    }
-
-    /**
-     * 帐号冻结
-     * @return  json 
-     */
-    public function actionBlockedAccount($uid) {
-        $res = User::updateAll(['status' => -1], "id=$uid");
-
-        $this->renderJson([], $res ? 0 : -1);
-    }
-
-    /**
-     * 帐号解冻
-     * @return  json
-     */
-    public function actionUnBlockedAccount($uid) {
-        $res = User::updateAll(['status' => 10], "id=$uid");
-
-        $this->renderJson([], $res ? 0 : -1);
-    }
-
-    /**
-     * 删除帐号
-     * @return json
-     */
-    public function actionDeleteUser($uid) {
-        $user = User::findOne($uid);
-        $res = $user->delete();
-
-        $this->renderJson([], $res ? 0 : -1);
-    }
-
-    /**
-     * 修改真实姓名
-     * @return   json
-     */
-    public function actionUpdateRealName($name, $uid) {
-        $res = User::updateAll(['realname' => $name], "id=$uid");
-
-        $this->renderJson([], $res ? 0 : -1);
-    }
-
-    /**
-     * 新增用户
-     */
-    public function actionAddUser() {
-        $model = new AddUserForm();
-
-        if ($model->load(Yii::$app->request->post()) ) {
-            if ($user = $model->signup()) {
-                Yii::$app->mail->compose('accountNotice', ['user' => $user])
-                    ->setFrom(Yii::$app->mail->messageConfig['from'])
-                    ->setTo($user->email)
-                    ->setSubject('瓦力平台 - ' . $user->realname . '帐号已开通')
-                    ->send();
-                
-                return $this->redirect('@web/user-management');
-            }
-            else {
-                throw new \Exception(yii::t('user-management', 'email exists'));
-            }
-        }
-        
-        return $this->render('adduser', [
-            'model' => $model
-        ]);
-    }
-}
\ No newline at end of file
diff --git a/mail/accountNotice.php b/mail/accountNotice.php
index a1c2742a..079a7669 100644
--- a/mail/accountNotice.php
+++ b/mail/accountNotice.php
@@ -5,9 +5,19 @@
  * @var yii\web\View $this
  * @var common\models\User $user
  */
+$confirmationLink = Yii::$app->urlManager->createAbsoluteUrl(['site/confirm-email', 'token' => $user->email_confirmation_token]);
+
 ?>
 
-<?= yii::t('user-management', 'dear') ?><strong><?= $user->realname ?></strong>:
+<?= yii::t('user', 'dear') ?>   <strong><?= $user->realname ?></strong>:
 
 <br><br>
-<span style="text-indent: 2em"><?= yii::t('user-mangement', 'notice account has been opened') ?></span>
+<span style="text-indent: 2em"><?= yii::t('user', 'notice account has been opened') ?></span>
+<br>
+<?= yii::t('user', 'email') ?> : <?= $user->email ?><br>
+<?= yii::t('user', 'password') ?> : <?= $user->password ?><br>
+<?= yii::t('user', 'role') ?> : <?= \Yii::t('w', 'user_role_' . $user->role) ?><br>
+<h3><?= Html::a(yii::t('user', 'active'), $confirmationLink) ?></h3>
+<a href="<?= $confirmationLink ?>"><?= $confirmationLink ?></a>
+
+
diff --git a/mail/passwordResetToken.php b/mail/passwordResetToken.php
index f4be53c4..2c1dd4c6 100644
--- a/mail/passwordResetToken.php
+++ b/mail/passwordResetToken.php
@@ -15,4 +15,5 @@
 
 <br><br>
 <h3><?= Html::a(yii::t('user', 'reset password'), $resetLink) ?></h3>
-
+<br>
+<a href="<?= $resetLink ?>"> <?= $resetLink ?></a>
diff --git a/messages/en/user-management.php b/messages/en/user-management.php
deleted file mode 100644
index 84903d05..00000000
--- a/messages/en/user-management.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-return [
-
-    'users' => 'User management',
-    'u_username' => 'account',
-    'u_realname' => 'realname',
-    'u_is_admin' => 'Is admin',
-    'u_status' => 'Account status',
-    'u_oprea' => 'Operation',
-    'u_update_admin' => 'Set administrator',
-    'u_update_user' => 'Unset administrator',
-    'u_delete_user' => 'Delete Account',
-    'u_blocked_account' => 'Blocked account',
-    'u_un_blocked_account' => 'Free account',
-    'u_update_real_name' => 'Upadate realname',
-    'js update to admin' => 'Set the NAME to the administrator?',
-    'js update to user' => 'Confirmation set NAME to ordinary users?',
-    'js blocked account' => 'Confirmation will be the NAME of the account is frozen?',
-    'js unblocked account' => 'Confirm it will lift its freeze the NAME of the account?',
-    'js delete user' => 'Will confirm the NAME of the account permanently delete?(irreversible)',
-    'u_title_update_real_name' => 'Update<span>NAME</span>account realname',
-    'u_notice_label_real_name' => 'Please enter realname',
-    'u_btn_submit' => 'Ok',
-    'u_btn_cancel' => 'Cancel',
-    'u_real_name_illegal' => 'Name cannot be empty and can not contain special symbols',
-
-    'add_user_title' => 'New users',
-    'adduser email' => 'Please enter the email address',
-    'adduser password' => 'Please enter the password',
-    'adduser realname' => 'Please enter the realname',
-    'adduser role' => 'Please choice the role',
-    'adduser-platform' => 'confirm',
-
-    'dear' => 'dear',
-    'notice account has been opened' => 'The account has been opened',
-    'email exists' => 'User email already exists',
-];
diff --git a/messages/en/user.php b/messages/en/user.php
index edd9a3e7..0dc4e927 100644
--- a/messages/en/user.php
+++ b/messages/en/user.php
@@ -25,4 +25,38 @@
     'active' => 'active',
     'reset password by click url' => 'visit this link to reset password:',
     'reset password' => 'reset password',
+
+
+    'users' => 'User management',
+    'email' => '邮箱',
+    'realname' => 'real name',
+    'is admin' => 'Is admin',
+    'status' => 'Account status',
+    'u_oprea' => 'Operation',
+    'u_update_admin' => 'Set administrator',
+    'u_update_user' => 'Unset administrator',
+    'u_delete_user' => 'Delete Account',
+    'u_blocked_account' => 'Blocked account',
+    'u_un_blocked_account' => 'Free account',
+    'rename' => 'Upadate realname',
+    'js update to admin' => 'Set the NAME to the administrator?',
+    'js update to user' => 'Confirmation set NAME to ordinary users?',
+    'js blocked account' => 'Confirmation will be the NAME of the account is frozen?',
+    'js unblocked account' => 'Confirm it will lift its freeze the NAME of the account?',
+    'js delete user' => 'Will confirm the NAME of the account permanently delete?(irreversible)',
+    'u_title_update_real_name' => 'Update account realname',
+    'u_notice_label_real_name' => 'Please enter realname',
+    'u_btn_submit' => 'Ok',
+    'u_btn_cancel' => 'Cancel',
+    'u_real_name_illegal' => 'Name cannot be empty and can not contain special symbols',
+
+    'add user' => 'New users',
+    'adduser email' => 'Please enter the email address',
+    'adduser password' => 'Please enter the password',
+    'adduser realname' => 'Please enter the realname',
+    'adduser role' => 'Please choice the role',
+    'adduser-platform' => 'confirm',
+
+    'notice account has been opened' => 'The account has been opened',
+    'email exists' => 'User email already exists',
 ];
\ No newline at end of file
diff --git a/messages/en/w.php b/messages/en/w.php
index 4f7b1483..a2c05865 100644
--- a/messages/en/w.php
+++ b/messages/en/w.php
@@ -41,6 +41,7 @@
     'js delete failed' => 'Delete failed: ',
 
     'you are not master of project' => 'you are not master of project：(',
+    'delete' => 'delete',
     'delete failed' => 'delete failed',
     'update failed' => 'update failed',
 
@@ -72,4 +73,5 @@
     'register password' => 'Password',
     'register role' => 'Role',
     'back' => 'Back',
+    'option' => 'option',
 ];
\ No newline at end of file
diff --git a/messages/zh-CN/user-management.php b/messages/zh-CN/user-management.php
deleted file mode 100644
index ad3c54a9..00000000
--- a/messages/zh-CN/user-management.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-return [
-    'users' => '用户管理',
-    'u_username' => '帐号',
-    'u_realname' => '姓名',
-    'u_is_admin' => '是否管理员',
-    'u_status' => '帐号状态',
-    'u_oprea' => '操作',
-    'u_update_admin' => '设为管理员',
-    'u_update_user' => '设为普通用户',
-    'u_delete_user' => '删除用户',
-    'u_blocked_account' => '冻结帐号',
-    'u_un_blocked_account' => '帐号解冻',
-    'u_update_real_name' => '修改姓名',
-    'js update to admin' => '确定将NAME设置为管理员?',
-    'js update to user' => '确定将NAME设置为普通用户?',
-    'js blocked account' => '确认将NAME的帐号冻结吗？',
-    'js unblocked account' => '确认将NAME的帐号解除冻结吗？',
-    'js delete user' => '确认将NAME的帐号永久删除吗？（不可恢复）',
-    'u_title_update_real_name' => '修改<span>NAME</span>帐号的姓名',
-    'u_notice_label_real_name' => '请输入姓名',
-    'u_btn_submit' => '确认',
-    'u_btn_cancel' => '取消',
-    'u_real_name_illegal' => '姓名不能为空，且不能包含特殊符号',
-    'u_add_user' => '新增用户',
-
-    'add_user_title' => '新增用户',
-    'adduser email' => '请输入邮箱地址',
-    'adduser password' => '请输入密码',
-    'adduser realname' => '请输入姓名',
-    'adduser role' => '请选择角色',
-    'adduser-platform' => '确认添加',
-
-    'dear' => '亲爱的',
-    'notice account has been opened' => '帐号已经开通',
-    'email exists' => '用户邮箱已经存在',
-];
diff --git a/messages/zh-CN/user.php b/messages/zh-CN/user.php
index 1342018e..b365da10 100644
--- a/messages/zh-CN/user.php
+++ b/messages/zh-CN/user.php
@@ -7,7 +7,8 @@
     'projecter audit tip' => '项目管理员可创建项目',
     'profile title' => '个人信息',
     'level' => '级别',
-    'inactive' => '（未激活）',
+    'role' => '角色',
+    'inactive' => '未激活',
     'register time' => '注册时间',
     'js pass' => '审核通过：）',
     'js pass failed' => '审核操作失败：）',
@@ -25,4 +26,41 @@
     'active' => '确认激活',
     'reset password by click url' => '点击以下链接完成重置密码，如不是本人操作，请忽略，谢谢！',
     'reset password' => 'reset password',
+
+
+    'users' => '用户管理',
+    'search placeholder' => '用户或邮箱',
+    'email' => '邮箱',
+    'realname' => '真实用户名',
+    'is admin' => '是否管理员',
+    'status' => '状态',
+    'status to opposite 2' => '解冻',
+    'status to opposite 10' => '冻结',
+    'status to opposite 0' => '冻结',
+
+    'role to opposite 1' => '设为开发者',
+    'role to opposite 2' => '设为管理员',
+    'u_oprea' => '操作',
+    'u_update_admin' => '设为管理员',
+    'u_update_user' => '设为普通用户',
+    'u_delete_user' => '删除用户',
+    'u_blocked_account' => '冻结帐号',
+    'u_un_blocked_account' => '帐号解冻',
+    'rename' => '修改用户名',
+    'label role to opposite 1' => '确定设置为普通用户？',
+    'label role to opposite 2' => '确定设置为管理员？',
+    'label status to opposite 0' => '确认帐号冻结冻结？',
+    'label status to opposite 2' => '确认帐号解除冻结？',
+    'label status to opposite 10' => '确认帐号冻结冻结？',
+
+    'js delete user' => '确认帐号永久删除吗？',
+    'label real name' => '请输入新用户名',
+    'u_btn_submit' => '确认',
+    'u_btn_cancel' => '取消',
+    'u_real_name_illegal' => '姓名不能为空，且不能包含特殊符号',
+    'add user' => '新增用户',
+
+
+    'notice account has been opened' => '帐号已经开通，账号信息如下，请点击激活链接进行认证。',
+    'email exists' => '用户邮箱已经存在',
 ];
\ No newline at end of file
diff --git a/messages/zh-CN/w.php b/messages/zh-CN/w.php
index 8e7bc186..b5152b01 100644
--- a/messages/zh-CN/w.php
+++ b/messages/zh-CN/w.php
@@ -37,10 +37,12 @@
     'submit' => '提交',
     'modal error title' => '发生了错误',
 
-    'js delete confirm' => '确定要删除该记录？',
+    'js delete confirm' => '确定要删除？',
     'js delete failed' => '删除失败：',
 
     'you are not master of project' => '不可以操作其它人的项目：(',
+    'delete' => '删除',
+    'edit' => '编辑',
     'delete failed' => '删除失败',
     'update failed' => '更新失败',
 
@@ -72,4 +74,6 @@
     'register password' => '密码',
     'register role' => '角色',
     'back' => '返回登录',
+    'option' => '操作',
+    'option' => '操作',
 ];
\ No newline at end of file
diff --git a/models/User.php b/models/User.php
index f3a3bdfa..fbc34c91 100644
--- a/models/User.php
+++ b/models/User.php
@@ -28,13 +28,24 @@
  */
 class User extends ActiveRecord implements IdentityInterface
 {
+
+    // 邮件未激活
+    const MAIL_INACTIVE = 0;
+
+    // 邮件激活
+    const MAIL_ACTIVE = 1;
+
     // 管理员未审核通过
     const STATUS_INACTIVE = 0;
 
     // 管理员审核通过
     const STATUS_ACTIVE = 10;
 
+    // 冻结
+    const STATUS_INVALID = 2;
+
     const ROLE_USER = 10;
+
     /**
      * 管理员
      */
diff --git a/models/forms/AddUserForm.php b/models/forms/AddUserForm.php
index 601bd48b..77e40ba2 100644
--- a/models/forms/AddUserForm.php
+++ b/models/forms/AddUserForm.php
@@ -46,8 +46,8 @@ public function signup() {
             $user->realname = $this->realname;
             $user->setpassword($this->password);
 
-            // 不用激活  给默认头像
-            $user->is_email_verified = 1;
+            // 需要激活  给默认头像
+            $user->status = User::STATUS_INACTIVE;
             $user->avatar = 'default.jpg';
 
             if ($user->save()) {
diff --git a/views/conf/edit.php b/views/conf/edit.php
index a1344be3..55e5c623 100644
--- a/views/conf/edit.php
+++ b/views/conf/edit.php
@@ -6,9 +6,7 @@
 use app\models\Project;
 use yii\widgets\ActiveForm;
 ?>
-<style>
-    .control-label {text-align: right;}
-</style>
+
 <div class="box">
     <?php $form = ActiveForm::begin(['id' => 'login-form']); ?>
     <div class="box-body">
@@ -16,7 +14,7 @@
             ->textInput([
                 'class'          => 'col-xs-11',
             ])
-            ->label(yii::t('conf', 'name'), ['class' => 'control-label bolder blue col-xs-1']) ?>
+            ->label(yii::t('conf', 'name'), ['class' => 'text-right bolder blue col-xs-1']) ?>
 
         <div class="clearfix"></div>
         <?= $form->field($conf, 'level')->dropDownList([
@@ -25,7 +23,7 @@
             Project::LEVEL_PROD => \Yii::t('w', 'conf_level_' . Project::LEVEL_PROD),
         ],[
             'class'          => 'col-xs-11',])
-            ->label(yii::t('conf', 'env'), ['class' => 'control-label bolder blue col-xs-1']) ?>
+            ->label(yii::t('conf', 'env'), ['class' => 'text-right bolder blue col-xs-1']) ?>
         <div class="clearfix"></div>
         <?php if (empty($_GET['projectId'])) { ?>
         <div class="widget-box transparent" id="recent-box" style="margin-top:15px">
@@ -56,7 +54,7 @@
                 'data-rel'       => 'tooltip',
                 'data-title'     => yii::t('conf', 'repo url tip'),
             ])
-            ->label(yii::t('conf', 'url'), ['class' => 'control-label bolder blue col-xs-1']) ?>
+            ->label(yii::t('conf', 'url'), ['class' => 'text-right bolder blue col-xs-1']) ?>
         <!-- 地址 配置 end-->
         <div class="clearfix"></div>
         <?php if (empty($_GET['projectId']) || $conf->repo_type == Project::REPO_SVN) { ?>
@@ -65,12 +63,12 @@
             ->textInput([
                 'class'          => 'col-xs-3',
             ])
-            ->label(yii::t('conf', 'username'), ['class' => 'control-label bolder blue col-xs-1']) ?>
+            ->label(yii::t('conf', 'username'), ['class' => 'text-right bolder blue col-xs-1']) ?>
         <?= $form->field($conf, 'repo_password')
             ->passwordInput([
                 'class'          => 'col-xs-3',
             ])
-            ->label(yii::t('conf', 'password'), ['class' => 'control-label bolder blue col-xs-1']); ?>
+            ->label(yii::t('conf', 'password'), ['class' => 'text-right bolder blue col-xs-1']); ?>
         </div>
         <div class="clearfix"></div>
 
@@ -105,7 +103,7 @@
                                   'data-title'     => yii::t('conf', 'deploy from tip'),
                               ])
                           ->label(yii::t('conf', 'deploy from').'<small><i class="light-blue icon-asterisk"></i></small>',
-                              ['class' => 'control-label bolder']) ?>
+                              ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'excludes')
                           ->textarea([
                               'placeholder'    => '.git' . PHP_EOL . 'README.md',
@@ -113,7 +111,7 @@
                               'data-rel'       => 'tooltip',
                               'data-title'     => yii::t('conf', 'excludes tip'),
                           ])
-                          ->label(yii::t('conf', 'excludes'), ['class' => 'control-label bolder']) ?>
+                          ->label(yii::t('conf', 'excludes'), ['class' => 'text-right bolder']) ?>
                   </div>
               </div>
           </div>
@@ -144,7 +142,7 @@
                               'data-title'     => yii::t('conf', 'target user tip'),
                           ])
                           ->label(yii::t('conf', 'target user').'<small><i class="light-blue icon-asterisk"></i></small>',
-                              ['class' => 'control-label bolder']) ?>
+                              ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'release_to')
                           ->textInput([
                               'placeholder'    => '/data/www/walle',
@@ -152,7 +150,7 @@
                               'data-rel'       => 'tooltip',
                               'data-title'     => yii::t('conf', 'webroot tip'),
                           ])
-                          ->label('webroot<small><i class="light-blue icon-asterisk"></i></small>', ['class' => 'control-label bolder']) ?>
+                          ->label('webroot<small><i class="light-blue icon-asterisk"></i></small>', ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'release_library')
                           ->textInput([
                               'placeholder'    => '/data/releases',
@@ -161,7 +159,7 @@
                               'data-title'     => yii::t('conf', 'releases tip'),
                           ])
                           ->label(yii::t('conf', 'releases').'<small><i class="light-blue icon-asterisk"></i></small>',
-                              ['class' => 'control-label bolder']) ?>
+                              ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'keep_version_num')
                           ->textInput([
                               'placeholder'    => '20',
@@ -170,7 +168,7 @@
                               'data-title'     => yii::t('conf', 'keep version tip'),
                           ])
                           ->label(yii::t('conf', 'keep version').'<small><i class="light-blue icon-asterisk"></i></small>',
-                              ['class' => 'control-label bolder']) ?>
+                              ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'hosts')
                           ->textarea([
                               'placeholder'    => '192.168.0.1' . PHP_EOL . '192.168.0.2:8888',
@@ -179,7 +177,7 @@
                               'data-title'     => yii::t('conf', 'servers tip'),
                           ])
                           ->label(yii::t('conf', 'servers').'<small><i class="light-blue icon-asterisk"></i></small>',
-                              ['class' => 'control-label bolder']) ?>
+                              ['class' => 'text-right bolder']) ?>
                   </div>
               </div>
           </div>
@@ -215,7 +213,7 @@
                               'onfocus'        => "window.activeobj=this;this.clock=setInterval(function(){activeobj.style.height=activeobj.scrollHeight+'px';},200);",
                               'onblur'         => "clearInterval(this.clock);",
                           ])
-                          ->label('pre_deploy', ['class' => 'control-label bolder']) ?>
+                          ->label('pre_deploy', ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'post_deploy')
                           ->textarea([
                               'data-placement' => 'top',
@@ -225,7 +223,7 @@
                               'onfocus'        => "window.activeobj=this;this.clock=setInterval(function(){activeobj.style.height=activeobj.scrollHeight+'px';},200);",
                               'onblur'         => "clearInterval(this.clock);",
                           ])
-                          ->label('post_deploy', ['class' => 'control-label bolder']) ?>
+                          ->label('post_deploy', ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'pre_release')
                           ->textarea([
                               'data-placement' => 'top',
@@ -235,7 +233,7 @@
                               'onfocus'        => "window.activeobj=this;this.clock=setInterval(function(){activeobj.style.height=activeobj.scrollHeight+'px';},200);",
                               'onblur'         => "clearInterval(this.clock);",
                           ])
-                          ->label('pre_release', ['class' => 'control-label bolder']) ?>
+                          ->label('pre_release', ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'post_release')
                           ->textarea([
                               'data-placement' => 'top',
@@ -245,7 +243,7 @@
                               'onfocus'        => "window.activeobj=this;this.clock=setInterval(function(){activeobj.style.height=activeobj.scrollHeight+'px';},200);",
                               'onblur'         => "clearInterval(this.clock);",
                           ])
-                          ->label('post_release', ['class' => 'control-label bolder']) ?>
+                          ->label('post_release', ['class' => 'text-right bolder']) ?>
                       <?= $form->field($conf, 'post_release_delay')
                           ->textInput([
                               'placeholder'    => '0',
@@ -253,7 +251,7 @@
                               'data-rel'       => 'tooltip',
                               'data-title'     => yii::t('conf', 'post_release_delay tip'),
                           ])
-                          ->label(yii::t('conf', 'post_release_delay'), ['class' => 'control-label bolder']) ?>
+                          ->label(yii::t('conf', 'post_release_delay'), ['class' => 'text-right bolder']) ?>
                   </div>
               </div>
           </div>
@@ -263,7 +261,7 @@
         <div class="hr hr-dotted"></div>
 
         <div class="form-group">
-            <label class="control-label bolder blue">
+            <label class="text-right bolder blue">
                 <?= yii::t('conf', 'branch/tag') ?>
             </label>
             <div class="radio" style="display: inline;" data-rel="tooltip" data-title="<?= yii::t('conf', 'branch tip') ?>" data-placement="right">
@@ -281,7 +279,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="control-label bolder blue" for="form-field-2">
+            <label class="text-right bolder blue" for="form-field-2">
                 <?= yii::t('conf', 'enable audit') ?>
                 <input name="Project[audit]" value="0" type="hidden">
                 <input name="Project[audit]" value="1" type="checkbox" <?= $conf->audit ? 'checked' : '' ?>
@@ -291,7 +289,7 @@ class="ace ace-switch ace-switch-5"  data-rel="tooltip" data-title="<?= yii::t('
         </div>
 
         <div class="form-group">
-            <label class="control-label bolder blue" for="form-field-2">
+            <label class="text-right bolder blue" for="form-field-2">
                 <?= yii::t('conf', 'enable ansible') ?>
                 <input name="Project[ansible]" value="0" type="hidden">
                 <input name="Project[ansible]" value="1" type="checkbox" <?= $conf->ansible ? 'checked' : '' ?>
@@ -301,7 +299,7 @@ class="ace ace-switch ace-switch-5"  data-rel="tooltip" data-title="<?= yii::t('
         </div>
 
         <div class="form-group">
-            <label class="control-label bolder blue">
+            <label class="text-right bolder blue">
                 <?= yii::t('conf', 'enable open') ?>
                 <input name="Project[status]" value="0" type="hidden">
                 <input name="Project[status]" value="1" <?= $conf->status ? 'checked' : '' ?> type="checkbox"
diff --git a/views/layouts/main.php b/views/layouts/main.php
index ad37c812..ce4f92e2 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -208,6 +208,7 @@
             </script>
 
             <ul class="nav nav-list">
+
                 <?php if (\Yii::$app->user->identity->role == app\models\User::ROLE_ADMIN) { ?>
                 <li class="<?= \Yii::$app->controller->id == 'conf' ? 'active' : '' ?>">
                     <a href="<?= Url::to('@web/conf/') ?>">
@@ -217,6 +218,30 @@
                         </span>
                     </a>
                 </li>
+                <li>
+                    <a href="#" class="dropdown-toggle">
+                        <i class="icon-group"></i>
+                        <span class="menu-text"> 用户管理 </span>
+
+                        <b class="arrow icon-angle-down"></b>
+                    </a>
+
+                    <ul class="submenu" style="display: none;">
+                        <li>
+                            <a href="<?= Url::to('@web/user/list') ?>">
+                                <i class="icon-double-angle-right"></i>
+                                用户列表
+                            </a>
+                        </li>
+
+                        <li>
+                            <a href="<?= Url::to('@web/user/add') ?>">
+                                <i class="icon-double-angle-right"></i>
+                                添加用户
+                            </a>
+                        </li>
+                    </ul>
+                </li>
                 <?php } ?>
                 <li class="<?= \Yii::$app->controller->id == 'task' && \Yii::$app->controller->action->id == 'index'
                     ? 'active' : '' ?>">
@@ -246,6 +271,12 @@
                     </a>
                 </li>
             </ul><!-- /.nav-list -->
+            <div class="sidebar-collapse" id="sidebar-collapse">
+                <i class="icon-double-angle-right" data-icon1="icon-double-angle-left" data-icon2="icon-double-angle-right"></i>
+            </div>
+            <script type="text/javascript">
+                try{ace.settings.check('sidebar' , 'collapsed')}catch(e){}
+            </script>
         </div>
 
         <div class="main-content">
diff --git a/views/user-management/adduser.php b/views/user-management/adduser.php
deleted file mode 100644
index 32a43d32..00000000
--- a/views/user-management/adduser.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * @var yii\web\View $this
- */
-$this->title = yii::t('user-management', 'add_user_title');
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-use app\models\user;
-?>
-<style type="text/css">
-    .panel {
-        padding: 30px;
-    }
-</style>
-<div class="box">
-    <div class="box-body table-responsive no-padding clearfix">
-            <div class="panel">
-                <?php $form = ActiveForm::begin(); ?>
-                <?= $form->field($model, 'email')->label(Yii::t('user-management', 'adduser email')) ?>
-                <?= $form->field($model, 'password')->label(Yii::t('user-management', 'adduser password')) ?>
-                <?= $form->field($model, 'realname')->label(Yii::t('user-management', 'adduser realname')) ?>
-                <?= $form->field($model, 'role')->label(Yii::t('user-management', 'adduser role'))->dropDownList([
-                    User::ROLE_DEV => \Yii::t('w', 'user_role_' . User::ROLE_DEV),
-                    User::ROLE_ADMIN => \Yii::t('w', 'user_role_' . User::ROLE_ADMIN),
-                ]) ?>
-                <div class="form-group">
-                    <?= Html::submitButton(yii::t('user-management','adduser-platform'), ['class' => 'btn btn-primary', 'name' => 'submit-button']) ?>
-                </div>
-                <?php ActiveForm::end(); ?>
-            </div>
-        <!-- 模态框（Modal） -->
-        <div class="modal fade" id="update-real-name" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        </div>
-    </div><!-- /.box-body -->
-</div>
-
-<script>
-    jQuery(function($) {
-        
-    });
-</script>
\ No newline at end of file
diff --git a/views/user-management/index.php b/views/user-management/index.php
deleted file mode 100644
index 485c03b3..00000000
--- a/views/user-management/index.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * @var yii\web\View $this
- */
-$this->title = yii::t('user-management', 'users');
-use yii\helpers\Url;
-use yii\widgets\LinkPager;
-?>
-<style type="text/css">
-    .box-header {
-        margin-bottom: 20px;
-    }
-</style>
-<div class="box">
-    <div class="box-header">
-        <a href="<?= Url::to('@web/user-management/add-user') ?>" class="btn btn-default btn-add-user">
-            <i class="icon icon-user"></i>
-            <?= yii::t('user-management', 'u_add_user') ?>
-        </a>
-    </div>
-    <div class="box-body table-responsive no-padding clearfix">
-        <table class="table table-striped table-bordered table-hover">
-            <thead>
-                <tr>
-                    <th><?= yii::t('user-management', 'u_username') ?></th>
-                    <th><?= yii::t('user-management', 'u_realname') ?></th>
-                    <th><?= yii::t('user-management', 'u_is_admin') ?></th>
-                    <th><?= yii::t('user-management', 'u_status') ?></th>
-                    <th><?= yii::t('user-management', 'u_oprea') ?></th>
-                </tr>
-            </thead>
-            <tbody>
-                <?php foreach ($userList as $row) {?>
-                    <tr>
-                        <td><?= $row['username'] ?></td>
-                        <td><?= $row['realname'] ?></td>
-                        <td>
-                            <?php if ($row['role'] == 1) { ?>
-                                <i class="icon icon-user-md blue"></i>
-                            <?php } else { ?>
-                                <i class="icon icon-user"></i>
-                            <?php } ?>
-                        </td>
-                        <td>
-                            <?php if ($row['status'] == 10) { ?>
-                                <i class="icon icon-unlock"></i>
-                            <?php } else { ?>
-                                <i class="icon icon-lock red"></i>
-                            <?php } ?>
-                        </td>
-                        <td>
-                            <?php if ($row['role'] != 1) { ?>
-                                <button data-user-id="<?= $row['id']?>" data-username="<?= $row['username'] ?>" class="btn btn-primary update-to-admin"><?= yii::t('user-management', 'u_update_admin') ?></button>
-                            <? } else { ?>
-                                <button data-user-id="<?= $row['id']?>" data-username="<?= $row['username'] ?>" class="btn btn-primary update-to-user"><?= yii::t('user-management', 'u_update_user') ?></button>
-                            <?php } ?>
-                            <button data-user-id="<?= $row['id']?>" data-username="<?= $row['username'] ?>" class="btn btn-primary delete-user"><?= yii::t('user-management', 'u_delete_user') ?></button>
-                            <?php if ($row['status'] == 10) { ?>
-                                <button data-user-id="<?= $row['id']?>" data-username="<?= $row['username'] ?>" class="btn btn-primary blocked-account"><?= yii::t('user-management', 'u_blocked_account') ?></button>
-                            <? } else { ?>
-                                <button data-user-id="<?= $row['id']?>" data-username="<?= $row['username'] ?>" class="btn btn-primary un-blocked-account"><?= yii::t('user-management', 'u_un_blocked_account') ?></button>
-                            <?php } ?>
-                            <button data-user-id="<?= $row['id']?>" data-username="<?= $row['username'] ?>" class="btn btn-primary update-real-name" data-toggle="modal" data-target="#update-real-name"><?= yii::t('user-management', 'u_update_real_name') ?></button>
-                        </td>
-                    </tr>
-                <?php } ?>
-            </tbody>
-        </table>
-        <?= LinkPager::widget(['pagination' => $pages]); ?>
-        <!-- 模态框（Modal） -->
-        <div class="modal fade" id="update-real-name" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-            <div class="modal-dialog modal-lg">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h4 class="modal-title"><?= yii::t('user-management', 'u_title_update_real_name') ?></h4>
-                    </div>
-                    <div class="modal-body">
-                        <div class="form-group">
-                            <label for="real-name" class="control-label"><?= yii::t('user-management', 'u_notice_label_real_name') ?>:</label>
-                            <input type="text" class="form-control" id="real-name">
-                          </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal"><?= yii::t('user-management', 'u_btn_cancel') ?></button>
-                        <button type="button" class="btn btn-primary"><?= yii::t('user-management', 'u_btn_submit') ?></button>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div><!-- /.box-body -->
-</div>
-
-<script>
-    jQuery(function($) {
-        var handlerList = {
-            // 改为管理员
-            '.update-to-admin': {
-                url: '<?= Url::to('@web/user-management/update-to-admin') ?>',
-                notice: '<?= yii::t('user-management', 'js update to admin') ?>',
-                username: 'data-username',
-                params: {
-                    uid: 'data-user-id'
-                }
-            },
-            // 改为普通用户
-            '.update-to-user': {
-                url: '<?= Url::to('@web/user-management/update-to-user') ?>',
-                notice: '<?= yii::t('user-management', 'js update to user') ?>',
-                username: 'data-username',
-                params: {
-                    uid: 'data-user-id'
-                }
-            },
-            // 冻结帐号
-            '.blocked-account': {
-                url: '<?= Url::to('@web/user-management/blocked-account') ?>',
-                notice: '<?= yii::t('user-management', 'js blocked account') ?>',
-                username: 'data-username',
-                params: {
-                    uid: 'data-user-id'
-                }
-            },
-            // 帐号解冻
-            '.un-blocked-account': {
-                url: '<?= Url::to('@web/user-management/un-blocked-account') ?>',
-                notice: '<?= yii::t('user-management', 'js unblocked account') ?>',
-                username: 'data-username',
-                params: {
-                    uid: 'data-user-id'
-                }
-            },
-            // 删除帐号
-            '.delete-user': {
-                url: '<?= Url::to('@web/user-management/delete-user') ?>',
-                notice: '<?= yii::t('user-management', 'js delete user') ?>',
-                username: 'data-username',
-                params: {
-                    uid: 'data-user-id'
-                }
-            }
-        };
-
-        for (var i in handlerList) {
-            !function () {
-                var tmp = handlerList[i];
-                $(i).unbind().click(function () {
-                    var me = $(this),
-                        notice = tmp.notice.replace(/NAME/, me.attr(tmp.username)),
-                        url = tmp.url + '?',
-                        params = [];
-
-                    for (var j in tmp.params) {
-                        params.push(j + '=' + me.attr(tmp.params[j]));
-                    }
-                    url += params.join('&');
-                    
-                    if (confirm(notice)) {
-                        $.getJSON(url, function (o) {
-                            if (o.code === 0) {
-                                window.location.reload();
-                            }
-                            else {
-                                alert(o.message);
-                            }
-                        });
-                    }
-                });
-            }();
-        };
-
-        $('#update-real-name').on('show.bs.modal', function (e) {
-            var me = $(this),
-                srcTar = $(e.relatedTarget),
-                modalTit = me.find('h4'),
-                uid = srcTar.attr('data-user-id'),
-                subBtn = me.find('.btn-primary'),
-                name = me.find('#real-name');
-
-            var title = modalTit.html().replace(/<span>(.*?)<\/span>/, '<span>' + srcTar.attr('data-username') + '</span>');
-            modalTit.html(title);
-
-            subBtn.click(function () {
-                if (name.val().length == 0 || !/^([\u4E00-\uFA29]|[\uE7C7-\uE7F3]|[\w])*$/.test(name.val())) {
-                    alert('<?= yii::t('user-management', 'u_real_name_illegal') ?>');
-                    return false;
-                }
-
-                $.getJSON('<?= Url::to('@web/user-management/update-real-name') ?>?uid=' + uid + '&name=' + name.val(), function (o) {
-                    if (o.code === 0) {
-                        window.location.reload();
-                    }
-                    else {
-                        alert(o.message);
-                    }
-                })
-            });
-        });
-    });
-</script>
\ No newline at end of file
diff --git a/views/user/add.php b/views/user/add.php
new file mode 100644
index 00000000..0171f0ea
--- /dev/null
+++ b/views/user/add.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @var yii\web\View $this
+ */
+$this->title = yii::t('user', 'add user');
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use app\models\user;
+?>
+
+<div class="box col-xs-8">
+    <?php $form = ActiveForm::begin(); ?>
+    <div class="box-body">
+        <?= $form->field($model, 'email')
+            ->textInput(['class' => 'col-xs-5',])
+            ->label(Yii::t('user', 'email'), ['class' => 'control-label bolder blue col-xs-2']) ?>
+        <div class="clearfix"></div>
+        <?= $form->field($model, 'password')
+            ->passwordInput(['class' => 'col-xs-5',])
+            ->label(Yii::t('user', 'password'), ['class' => 'control-label bolder blue col-xs-2']) ?>
+        <div class="clearfix"></div>
+
+        <?= $form->field($model, 'realname')
+            ->textInput(['class' => 'col-xs-5',])
+            ->label(Yii::t('user', 'realname'), ['class' => 'control-label bolder blue col-xs-2']) ?>
+        <div class="clearfix"></div>
+        <?= $form->field($model, 'role')->label(Yii::t('user', 'role'), ['class' => 'control-label bolder blue col-xs-2'])
+            ->dropDownList([
+            User::ROLE_DEV => \Yii::t('w', 'user_role_' . User::ROLE_DEV),
+            User::ROLE_ADMIN => \Yii::t('w', 'user_role_' . User::ROLE_ADMIN),
+        ], ['class' => 'col-xs-5',]) ?>
+        <div class="clearfix"></div>
+        <div class="box-footer">
+        <div class="col-xs-2"></div>
+        <div class="form-group" style="margin-top:40px">
+            <?= Html::submitButton(yii::t('user','add user'), ['class' => 'btn btn-primary', 'name' => 'submit-button']) ?>
+        </div>
+            </div>
+    </div><!-- /.box-body -->
+    <?php ActiveForm::end(); ?>
+</div>
diff --git a/views/user/list.php b/views/user/list.php
new file mode 100644
index 00000000..e0db088b
--- /dev/null
+++ b/views/user/list.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * @var yii\web\View $this
+ */
+$this->title = yii::t('user', 'users');
+use yii\helpers\Url;
+use yii\widgets\LinkPager;
+use app\models\User;
+?>
+<div class="box">
+    <div class="box-header">
+        <form action="<?= Url::to('@web/user/list') ?>" method="POST">
+            <input type="hidden" value="<?= \Yii::$app->request->getCsrfToken(); ?>" name="_csrf">
+            <div class="col-xs-12 col-sm-8" style="padding-left: 0;margin-bottom: 10px;">
+                <div class="input-group">
+                    <input type="text" name="kw" class="form-control search-query" placeholder="<?= yii::t('user', 'search placeholder') ?>">
+                    <span class="input-group-btn">
+                        <button type="submit"
+                                class="btn btn-default btn-sm">
+                            Search
+                            <i class="icon-search icon-on-right bigger-110"></i>
+                        </button>
+                    </span>
+                </div>
+            </div>
+        </form>
+        <a class="btn btn-default btn-sm" href="<?= Url::to('@web/user/add') ?>">
+            <i class="icon-pencil align-top bigger-125"></i>
+            <?= yii::t('user', 'add user') ?>
+        </a>
+    </div><!-- /.box-header -->
+
+    <div class="box-body table-responsive no-padding clearfix">
+        <table class="table table-striped table-bordered table-hover">
+            <tbody>
+                <tr>
+                    <th><?= yii::t('user', 'realname') ?></th>
+                    <th><?= yii::t('user', 'email') ?></th>
+                    <th><?= yii::t('user', 'status') ?></th>
+                    <th><?= yii::t('user', 'u_oprea') ?></th>
+                </tr>
+                <?php foreach ($userList as $row) {?>
+                    <tr>
+                        <td><?= $row['realname'] ?></td>
+                        <td><?= $row['email'] ?></td>
+                        <td>
+                            <?php if ($row['role'] == User::ROLE_ADMIN) { ?>
+                                <i class="icon icon-user-md green" data-placement="top" data-rel="tooltip" data-title="<?= yii::t('w', 'user_role_' . User::ROLE_ADMIN) ?>"></i>
+                            <?php } else { ?>
+                                <i class="icon icon-user" data-placement="top" data-rel="tooltip" data-title="<?= yii::t('w', 'user_role_' . User::ROLE_DEV) ?>"></i>
+                            <?php } ?>
+
+                            <?php if ($row['status'] == User::STATUS_INVALID) { ?>
+                                <i class="icon icon-ban-circle red" data-placement="top" data-rel="tooltip" data-title="<?= yii::t('user', 'status to opposite 10') ?>"></i>
+                            <?php } ?>
+                            <?php if ($row['status'] == User::STATUS_INACTIVE) { ?>
+                                <i class="icon icon-envelope red" data-placement="top" data-rel="tooltip" data-title="<?= yii::t('user', 'inactive') ?>"></i>
+                            <?php } ?>
+                        </td>
+                        <td>
+                            <div class="nav">
+                                <li>
+                                    <a data-toggle="dropdown" class="dropdown-toggle" href="javascript:void();">
+                                        <i class="icon-cog"></i>&nbsp;<?= yii::t('w', 'option') ?>
+                                        <i class="icon-caret-down bigger-110 width-auto"></i>
+                                    </a>
+                                    <ul class="dropdown-menu data-user"
+                                        data-user-id="<?= $row['id']?>"
+                                        data-user-realname="<?= $row['realname']?>"
+                                        data-user-email="<?= $row['email']?>"
+                                        data-rename-url="<?= Url::to('@web/user/rename') ?>"
+                                        data-status-url="<?= $row['status'] == User::STATUS_INVALID ? Url::to('@web/user/un-ban') : Url::to('@web/user/ban') ?>"
+                                        data-role-url="<?= $row['role'] == User::ROLE_ADMIN ? Url::to('@web/user/to-dev') : Url::to('@web/user/to-admin') ?>"
+                                        data-delete-url="<?= Url::to('@web/user/delete') ?>"
+                                        >
+                                        <li><a href="###" data-toggle="modal" data-target="#update-real-name" ><i class="icon-pencil"></i> <?= yii::t('w', 'edit') ?></a></li>
+                                        <li><a href="###" class="cnt-user-option" data-url-key="status-url" data-confirm="<?= yii::t('user', 'label status to opposite ' . $row['status']) ?>"><i class="<?= $row['status'] == User::STATUS_INVALID ? 'icon-ok-circle' : 'icon-ban-circle' ?>"></i> <?= yii::t('user', 'status to opposite ' . $row['status']) ?> </a></li>
+                                        <li><a href="###" class="cnt-user-option" data-url-key="delete-url" data-confirm="<?= yii::t('user', 'js delete user') ?>"><i class="icon-trash"></i> <?= yii::t('w', 'delete') ?></a></li>
+                                        <li class="divider"></li>
+                                        <li><a href="###" class="cnt-user-option" data-url-key="role-url" data-confirm="<?= yii::t('user', 'label role to opposite ' . $row['role']) ?>"><i class="i"></i> <?= yii::t('user', 'role to opposite ' . $row['role']) ?></a></li>
+                                    </ul>
+                                </li>
+
+                            </div>
+                        </td>
+                    </tr>
+                <?php } ?>
+            </tbody>
+        </table>
+        <?= LinkPager::widget(['pagination' => $pages]); ?>
+        <!-- 模态框（Modal） -->
+        <div class="modal fade" id="update-real-name" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h4 class="modal-title"><?= yii::t('user', 'rename') ?></h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="form-group">
+                            <label for="real-name" class="control-label"><?= yii::t('user', 'label real name') ?>:</label>
+                            <input type="text" class="form-control" id="real-name">
+                          </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal"><?= yii::t('user', 'u_btn_cancel') ?></button>
+                        <button type="button" class="btn btn-primary btn-submit"><?= yii::t('user', 'u_btn_submit') ?></button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </div><!-- /.box-body -->
+</div>
+
+<script>
+    jQuery(function($) {
+
+        $('[data-rel=tooltip]').tooltip({container:'body'});
+        $('[data-rel=popover]').popover({container:'body'});
+
+        $('.cnt-user-option').click(function(e) {
+            var uid = $(this).parents('.data-user').data('user-id');
+            var urlKey = $(this).data('url-key')
+            var url = $(this).parents('.data-user').data(urlKey);
+            var confirmLabel = $(this).data('confirm')
+            if (confirm(confirmLabel)) {
+                $.get(url, {uid: uid}, function(o) {
+                    if (!o.code) {
+                        location.reload();
+                    } else {
+                        alert(o.msg);
+                    }
+                })
+            }
+        })
+
+        $('#update-real-name').on('show.bs.modal', function (e) {
+            var me = $(this),
+                srcTar = $(e.relatedTarget).parents('.data-user'),
+                modalTit = me.find('.modal-title'),
+                uid = srcTar.attr('data-user-id'),
+                email = srcTar.attr('data-user-email'),
+                realname = srcTar.attr('data-user-realname'),
+                url = srcTar.attr('data-rename-url'),
+                subBtn = me.find('.btn-submit'),
+                name = me.find('#real-name');
+            name.val(realname)
+
+            var title = modalTit.html();
+            modalTit.html(title + '：' + email);
+
+            subBtn.click(function () {
+                $.get(url, {uid: uid, realName: name.val()}, function(o) {
+                    if (!o.code) {
+                        location.reload();
+                    } else {
+                        alert('<?= yii::t('conf', 'js copy failed') ?>' + o.msg);
+                    }
+                })
+            });
+        });
+    });
+</script>