From 9c0825ce700c7bb7bc00bd3bf190fd975853ab1f Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 15 Dec 2015 16:46:14 +0800
Subject: [PATCH] fix more role open exec window width bug

---
 juser/views.py                      |  2 +-
 templates/jasset/asset_cu_list.html |  2 +-
 templates/jasset/asset_detail.html  |  2 +-
 templates/jasset/asset_list.html    |  2 +-
 templates/test.html                 | 34 +++++++++--------------------
 5 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/juser/views.py b/juser/views.py
index 06ac121a3..f72cd4432 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -271,7 +271,7 @@ def send_mail_retry(request):
     msg = u"""
     跳板机地址： %s
     用户名：%s
-    重设密码：%s/juser/forget_password/
+    重设密码：%s/juser/password/forget/
     请登录web点击个人信息页面重新生成ssh密钥
     """ % (URL, user.username, URL)
 
diff --git a/templates/jasset/asset_cu_list.html b/templates/jasset/asset_cu_list.html
index cd3c69eb8..24e6144c4 100644
--- a/templates/jasset/asset_cu_list.html
+++ b/templates/jasset/asset_cu_list.html
@@ -242,7 +242,7 @@
              type: 2,
              title: title,
              maxmin: true,
-             area: ['725x', '600px'],
+             area: ['725px', '600px'],
              shade: false,
              content: new_url
         });
diff --git a/templates/jasset/asset_detail.html b/templates/jasset/asset_detail.html
index 48de38e8f..d3d0e8fb8 100644
--- a/templates/jasset/asset_detail.html
+++ b/templates/jasset/asset_detail.html
@@ -238,7 +238,7 @@
                                             {% for rule in user_rule_perm %}
                                                 <tr>
                                                     <td class="text-navy">{{ rule }}</td>
-                                                    <td class="text-navy"><a href="{% url 'rule_detail' %}/?id={{ rule.id }}">详情</a></td>
+                                                    <td class="text-navy"><a href="{% url 'rule_detail' %}?id={{ rule.id }}">详情</a></td>
                                                 </tr>
                                             {% endfor %}
                                         </table>
diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html
index f534e7035..404be5ec0 100644
--- a/templates/jasset/asset_list.html
+++ b/templates/jasset/asset_list.html
@@ -306,7 +306,7 @@
              type: 2,
              title: title,
              maxmin: true,
-             area: ['725x', '600px'],
+             area: ['725px', '600px'],
              shade: false,
              content: new_url
         });
diff --git a/templates/test.html b/templates/test.html
index cc24d4ffe..8e0eb8eb8 100644
--- a/templates/test.html
+++ b/templates/test.html
@@ -54,11 +54,11 @@
                                       <div class="col-sm-6">
                                           <div class="form-group">
                                               <label>用户名  *</label>
-                                              <input id="username" name="username" type="text" class="form-control required">
+                                              <input id="username" name="username" type="text" class="form-control required" minlength="8" >
                                           </div>
                                           <div class="form-group">
                                               <label>密码 *</label>
-                                              <input id="password" name="password" type="password" class="form-control required">
+                                              <input id="password" name="password" type="password" class="form-control required password">
                                           </div>
                                       </div>
                                       <div class="col-sm-6">
@@ -68,27 +68,9 @@
                                           </div>
                                           <div class="form-group">
                                               <label>确认密码 *</label>
-                                              <input id="password" name="password" type="password" class="form-control">
+                                              <input id="pass_confirm" name="pass_confirm" type="password" equalto="#password"  class="form-control">
                                           </div>
                                       </div>
-{#                                    <div class="col-sm-8" style="height: 100%">#}
-{#                                        <div class="form-group">#}
-{#                                            <label>Username *</label>#}
-{#                                            <input id="userName" name="userName" type="text" class="form-control required">#}
-{#                                        </div>#}
-{#                                        <div class="form-group">#}
-{#                                            <label>Password *</label>#}
-{#                                            <input id="password" name="password" type="password" class="form-control required">#}
-{#                                        </div>#}
-{#                                        <div class="form-group">#}
-{#                                            <label>Confirm Password *</label>#}
-{#                                            <input id="confirm" name="confirm" type="password" class="form-control required">#}
-{#                                        </div>#}
-{#                                        <div class="form-group">#}
-{#                                            <label>Email *</label>#}
-{#                                            <input id="email" name="email" type="text" class="form-control required">#}
-{#                                        </div>#}
-{#                                    </div>#}
                                     <div class="col-sm-4">
                                         <div class="text-center">
                                             <div style="margin-top: 20px">
@@ -141,22 +123,26 @@
                                     <div class="col-sm-6">
                                         <div class="form-group">
                                             <label>SMTP *</label>
-                                            <input id="host" name="host" type="text" class="form-control required">
+                                            <input id="smtp" name="smtp" type="text" class="form-control required">
                                         </div>
                                         <div class="form-group">
                                             <label>端口 *</label>
-                                            <input id="port" name="port" type="text" class="form-control required">
+                                            <input id="smtp_port" name="smtp_port" type="text" class="form-control required">
                                         </div>
                                     </div>
                                     <div class="col-sm-6">
                                         <div class="form-group">
                                             <label>邮件地址 *</label>
-                                            <input id="dbuser" name="dbuser" type="text" class="form-control required">
+                                            <input id="mail_addr" name="mail_addr" type="text" class="form-control required">
                                         </div>
                                         <div class="form-group">
                                             <label>密码 *</label>
                                             <input id="dbpass" name="dbpass" type="password" class="form-control">
                                         </div>
+                                        <div class="form-group">
+                                            <div></div>
+                                            <a href="{% url 'user_add' %}" class="btn btn-sm btn-warning" style="float: right"> 测试邮件 </a>
+                                        </div>
                                     </div>
                                 </div>
                             </fieldset>