UI调整

protected/class/profile.php

@@ -21,7 +21,7 @@ class Profile
         $this->uprofile->company = filter_var($intp['company'], FILTER_SANITIZE_STRING);
         $this->uprofile->jobs = filter_var($intp['jobs'], FILTER_SANITIZE_STRING);
         $this->uprofile->phone = filter_var($intp['phone'], FILTER_SANITIZE_STRING);
-        $this->uprofile->mobile = filter_var($intp['mobile'], FILTER_SANITIZE_STRING);
+//        $this->uprofile->mobile = filter_var($intp['mobile'], FILTER_SANITIZE_STRING);
         if (isset($intp['qq']))
             $this->uprofile->qq = filter_var($intp['qq'], FILTER_SANITIZE_STRING);
         $this->uprofile->groups = 'vip';

protected/module/admin/controller/AdminController.php

@@ -16,17 +16,20 @@ Doo::loadClass('mailer');
 // 列表停用 编辑 重置密码
 // 管理员权限管理
 // 管理员修改密码
-class AdminController extends DooController {
+class AdminController extends DooController
+{
 
     private $data, $users, $user, $profile, $ph, $userz, $mailer;
 
-    public function beforeRun($resource, $action) {
+    public function beforeRun($resource, $action)
+    {
         if (!isset($_SESSION['auid'])) {
             return Doo::conf()->APP_URL . 'manage';
         }
     }
 
-    public function __construct() {
+    public function __construct()
+    {
         $this->users = new AUsers();
         $this->user = new AUser();
         $this->userz = new Users();
@@ -36,7 +39,8 @@ class AdminController extends DooController {
         $this->data['rootUrl'] = Doo::conf()->APP_URL;
     }
 
-    function addUser() {
+    function addUser()
+    {
         $params = NULL;
         if (isset($_POST['email'])) {
             if (filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
@@ -62,7 +66,8 @@ class AdminController extends DooController {
         $this->render('admin-addUser', $this->data, TRUE);
     }
 
-    public function randomPassword() {
+    public function randomPassword()
+    {
         $alphabet = "abcdefghijklmnopqrstuwxyzABCDEFGHIJKLMNOPQRSTUWXYZ0123456789";
         $pass = array(); //remember to declare $pass as an array
         $alphaLength = strlen($alphabet) - 1; //put the length -1 in cache
@@ -73,7 +78,8 @@ class AdminController extends DooController {
         return implode($pass); //turn the array into a string
     }
 
-    function editUser() {
+    function editUser()
+    {
         $this->data['users'] = $this->users->getOne(array('where' => 'uid = ?', 'param' => array($this->params['uid']), 'asArray' => TRUE));
         $this->data['profile'] = $this->profile->getProWithUid($this->params['uid']);
         if (isset($_POST['email']) && ($_POST['email'] != $this->data['users']['uemail']) && filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)) {
@@ -82,14 +88,15 @@ class AdminController extends DooController {
                 $this->userz->update(array('where' => 'uid = ?', 'param' => array($this->params['uid'])));
             }
         }
-        if (isset($_POST['company']) && isset($_POST['jobs']) && isset($_POST['name']) && isset($_POST['phone']) && isset($_POST['mobile'])) {
+        if (isset($_POST['company']) && isset($_POST['jobs']) && isset($_POST['name']) && isset($_POST['phone'])) {
             $this->profile->upProfile($this->params['uid'], $_POST);
             return Doo::conf()->APP_URL . 'manage/user/list';
         }
         $this->render('admin-editUser', $this->data, TRUE);
     }
 
-    function option() {
+    function option()
+    {
         $this->data['auser'] = $this->user->getOne(array('where' => 'auid = ?', 'param' => array($_SESSION['auid']), 'asArray' => TRUE));
         if (isset($_POST['oldpasswd']) && isset($_POST['newpasswd']) && isset($_POST['renewpasswd']) && ($_POST['newpasswd'] == $_POST['renewpasswd']) && $this->ph->CheckPassword($_POST['oldpasswd'], $this->data['auser']['aupass'])) {
             $this->user->upPasswWd($_SESSION['auid'], $this->ph->HashPassword($_POST['newpasswd']));
@@ -98,7 +105,8 @@ class AdminController extends DooController {
         $this->render('admin-option', $this->data, TRUE);
     }
 
-    function userSwitch() {
+    function userSwitch()
+    {
         $userzArray = $this->userz->getOne(array('where' => 'uid = ?', 'param' => array($this->params['uid']), 'asArray' => TRUE));
         if (isset($userzArray['uid']) && $userzArray['isstop']) {
             $this->userz->isstop = 0;
@@ -109,7 +117,8 @@ class AdminController extends DooController {
         return Doo::conf()->APP_URL . 'manage/user/list';
     }
 
-    function userRepasswd() {
+    function userRepasswd()
+    {
         $userzArray = $this->userz->getOne(array('where' => 'uid = ?', 'param' => array($this->params['uid']), 'asArray' => TRUE));
         if (isset($userzArray['uemail'])) {
             $passwdStr = $this->randomPassword();
@@ -127,7 +136,8 @@ class AdminController extends DooController {
         }
     }
 
-    function userList() {
+    function userList()
+    {
         if (isset($_SESSION['passwd'])) {
             echo '添加用户的密码是：' . $_SESSION['passwd'];
         }

protected/module/admin/view/admin-addUser.html

@@ -49,17 +49,11 @@
                                 </div>
                             </div>
                             <div class="control-group">
-                                <label class="control-label">电话</label>
+                                <label class="control-label">联系电话</label>
                                 <div class="controls">
                                     <input type="text" name="phone" placeholder="输入电话号码，0000-0000000">
                                 </div>
                             </div>
-                            <div class="control-group">
-                                <label class="control-label">手机</label>
-                                <div class="controls">
-                                    <input type="text" name="mobile" placeholder="输入用户手机">
-                                </div>
-                            </div>
                             <div class="alert alert-info">
                                 添加成功后，系统将会发送一封确认邮件给该用户，邮件中将包含登录密码。
                             </div>

protected/module/admin/view/admin-editUser.html

@@ -1,96 +1,97 @@
 <!DOCTYPE html>
 <html lang=zh-cn>
-    <head>
-        <meta charset=utf-8>
-        <title>纵横计量支付系统</title>
-        <meta name=description content=计量支付>
-        <meta name=copyright content=smartcost.com.cn>
-        <link rel=stylesheet href={{rootUrl}}global/css/bootstrap.css>
-        <link rel=stylesheet href={{rootUrl}}global/css/style.css>
-        <script src={{rootUrl}}global/js/jquery-1.9.1.min.js></script>
-        <script src={{rootUrl}}global/js/bootstrap.js></script>
-        <script src={{rootUrl}}global/js/jl.js></script>
-    </head>
-    <body>
-        <div class="wrapHeader">
-            <h1 class="mainLogo" title="纵横计量支付"></h1>
-            <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
+<head>
+    <meta charset=utf-8>
+    <title>纵横计量支付系统</title>
+    <meta name=description content=计量支付>
+    <meta name=copyright content=smartcost.com.cn>
+    <link rel=stylesheet href={{rootUrl}}global/css/bootstrap.css>
+    <link rel=stylesheet href={{rootUrl}}global/css/style.css>
+    <script src={{rootUrl}}global/js/jquery-1.9.1.min.js></script>
+    <script src={{rootUrl}}global/js/bootstrap.js></script>
+    <script src={{rootUrl}}global/js/jl.js></script>
+</head>
+<body>
+<div class="wrapHeader">
+    <h1 class="mainLogo" title="纵横计量支付"></h1>
+    <div class="sysTools"><a title="返回首页" href="index.html"><i class="icon-circle-arrow-left icon-white"></i></a>&nbsp;&nbsp;&nbsp;<a
+            title="纵横官网" target="_blank" href="http://smartcost.com.cn"><i class="icon-home icon-white"></i></a></div>
+</div>
+<!-- include "top" -->
+<div class="warpAdmin">
+    <div class="adminSidebar fL">
+        <ul>
+            <li><a href="{{rootUrl}}manage/user/list" class="now">用户列表</a></li>
+            <li><a href="{{rootUrl}}manage/user/add">添加用户</a></li>
+        </ul>
+    </div>
+    <div class="adminContent">
+        <div class="adminMain">
+            <form class="form-horizontal" method="post">
+                <fieldset>
+                    <legend>编辑用户</legend>
+                    <div class="control-group">
+                        <label class="control-label">邮箱（登录使用）</label>
+                        <div class="controls">
+                            <input type="text" name="email" value="{{users.uemail}}">
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label">单位（公司）</label>
+                        <div class="controls">
+                            <input type="text" name="company" value="{{profile.company}}">
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label">职位</label>
+                        <div class="controls">
+                            <input type="text" name="jobs" value="{{profile.jobs}}">
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label">姓名</label>
+                        <div class="controls">
+                            <input type="text" name="name" value="{{profile.name}}">
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label">联系电话</label>
+                        <div class="controls">
+                            <input type="text" name="phone" value="{{profile.phone}}">
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label">短信通知</label>
+                        <div class="controls">
+                            <input type="text" disabled="disabled" value="{{profile.mobile}}">
+                        </div>
+                    </div>
+                    <div class="alert alert-error">
+                        <strong>请谨慎编辑用户!</strong> 编辑后将影响该用户曾参与的所有标段数据。
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label"></label>
+                        <div class="controls">
+                            <input type="submit" class="btn btn-normal btn-danger" value="完成编辑"/>
+                        </div>
+                    </div>
+                </fieldset>
+            </form>
+            <!--		    <div class="userPrj">
+                                    <legend>该用户参与的标段</legend>
+                                    <table class="table table-striped">
+                                        <thead>
+                                            <tr><th>项目名称</th><th>标段名称</th></tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr><td>XXXX项目</td><td>A标段</td></tr>
+                                            <tr><td>XXXX项目</td><td>B标段</td></tr>
+                                            <tr><td>XXXX项目</td><td>C标段</td></tr>
+                                        </tbody>
+                                    </table>
+                                </div>-->
         </div>
-        <!-- include "top" -->
-        <div class="warpAdmin">
-            <div class="adminSidebar fL">
-                <ul>
-                    <li><a href="{{rootUrl}}manage/user/list" class="now">用户列表</a></li>
-                    <li><a href="{{rootUrl}}manage/user/add">添加用户</a></li>
-                </ul>
-            </div>
-            <div class="adminContent">
-                <div class="adminMain">
-                    <form class="form-horizontal" method="post">
-                        <fieldset>
-                            <legend>编辑用户</legend>
-                            <div class="control-group">
-                                <label class="control-label">邮箱（登录使用）</label>
-                                <div class="controls">
-                                    <input type="text" name="email" value="{{users.uemail}}">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">单位（公司）</label>
-                                <div class="controls">
-                                    <input type="text" name="company" value="{{profile.company}}">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">职位</label>
-                                <div class="controls">
-                                    <input type="text" name="jobs"  value="{{profile.jobs}}">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">姓名</label>
-                                <div class="controls">
-                                    <input type="text" name="name"  value="{{profile.name}}">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">电话</label>
-                                <div class="controls">
-                                    <input type="text" name="phone"  value="{{profile.phone}}">
-                                </div>
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label">手机</label>
-                                <div class="controls">
-                                    <input type="text" name="mobile"  value="{{profile.mobile}}">
-                                </div>
-                            </div>
-                            <div class="alert alert-error">
-                                <strong>请谨慎编辑用户!</strong> 编辑后将影响该用户曾参与的所有标段数据。
-                            </div>
-                            <div class="control-group">
-                                <label class="control-label"></label>
-                                <div class="controls">
-                                    <input type="submit" class="btn btn-normal btn-danger" value="完成编辑" />
-                                </div>
-                            </div>
-                        </fieldset>
-                    </form>
-                    <!--		    <div class="userPrj">
-                                            <legend>该用户参与的标段</legend>
-                                            <table class="table table-striped">
-                                                <thead>
-                                                    <tr><th>项目名称</th><th>标段名称</th></tr>
-                                                </thead>
-                                                <tbody>
-                                                    <tr><td>XXXX项目</td><td>A标段</td></tr>
-                                                    <tr><td>XXXX项目</td><td>B标段</td></tr>
-                                                    <tr><td>XXXX项目</td><td>C标段</td></tr>
-                                                </tbody>
-                                            </table>
-                                        </div>-->
-                </div>
-            </div>
-        </div>
-        <script type="text/javascript">autoFlashHeight();</script>
-    </body>
+    </div>
+</div>
+<script type="text/javascript">autoFlashHeight();</script>
+</body>

protected/module/admin/view/admin-userlist.html

@@ -31,8 +31,8 @@
                         <th>姓名</th>
                         <th>单位（公司）</th>
                         <th>职位</th>
-                        <th>电话</th>
-                        <th>手机</th>
+                        <th>联系电话</th>
+                        <th>短信通知</th>
                         <th>邮箱（登录使用）</th>
                         <th>操作</th>
                     </tr>

protected/view/edit-profile.html

@@ -66,13 +66,18 @@
                                 <input type="text" name="phone" value="{{uprofile.phone}}"
                                        placeholder="格式：0000-00000000" style="width:167px">
                             </div>
+                        </div>
+                    </div>
+                    <div class="control-group">
+                        <label class="control-label" for="inputEmail">短信通知</label>
+                        <div class="controls">
                             <div class="input-prepend">
                                 <span class="add-on">手机</span>
-                                <input type="text" disabled="disabled" value="{{uprofile.mobile}}" placeholder="输入11位手机号码"
-                                       class="span2">
+                                <input type="text" disabled="disabled" value="{{uprofile.mobile}}" style="width:167px">
                             </div>
                         </div>
                     </div>
+
                     <div class="control-group">
                         <label class="control-label" for="inputEmail">QQ</label>
                         <div class="controls">