github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix more role open exec window width bug

pull/26/head
ibuler 2015-12-15 16:46:14 +08:00
parent 2e81f0cf95
commit 9c0825ce70
5 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
juser/views.py
View File

@ -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)

2
templates/jasset/asset_cu_list.html
View File

@ -242,7 +242,7 @@
type: 2,
title: title,
maxmin: true,
area: ['725x', '600px'],
area: ['725px', '600px'],
shade: false,
content: new_url
});

2
templates/jasset/asset_detail.html
View File

@ -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>

2
templates/jasset/asset_list.html
View File

@ -306,7 +306,7 @@
type: 2,
title: title,
maxmin: true,
area: ['725x', '600px'],
area: ['725px', '600px'],
shade: false,
content: new_url
});

34
templates/test.html
View File

@ -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>