haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-04 08:28:11 +00:00
Code Issues Releases Wiki Activity

Merge branch 'lj'

Browse Source
This commit is contained in:
xiez
2012-04-13 13:32:53 +08:00
parent 5b92a3aab9 f21f367b61
commit 451c8de68e
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
media/css/seahub.css
View File

@@ -96,11 +96,14 @@ button {
margin:0;
}
label { display: inline-block; margin:2px 0px; }
#user-add-form label {
#user-add-form label,
.reg label,
.pwd_change label {
width:5em;
text-align:right;
}
#user-add-form .submit {
#user-add-form .submit,
.reg .submit {
margin-left:5em;
}
.login .submit {
@@ -109,6 +112,12 @@ label { display: inline-block; margin:2px 0px; }
.login .error {
margin:3px 0 0 3em;
}
.pwd_change label {
width:6em;
}
.pwd_change .submit {
margin-left:6em;
}
/* form */
/* forms */

12
templates/registration/password_change_form.html
View File

@@ -2,16 +2,14 @@
{% load i18n %}
{% block title %}{% trans 'Password change' %}{% endblock %}
{% block main_panel %}
<div class="pwd_change">
<h2>{% trans 'Password change' %}</h2>
<form action="" method="post">
<form action="" method="post" class="pwd_change">
<label for="id_old_password">当前密码：</label>{{ form.old_password }}<br />
{{ form.old_password.errors }}
<p><label for="id_old_password">当前密码：</label>{{ form.old_password }}</p>
<label for="id_new_password1">新密码：</label>{{ form.new_password1 }}<br />
{{ form.new_password1.errors }}
<p><label for="id_new_password1">新密码：</label>{{ form.new_password1 }}</p>
<label for="id_new_password2">新密码确认：</label>{{ form.new_password2 }}<br />
{{ form.new_password2.errors }}
<p><label for="id_new_password2">新密码确认：</label>{{ form.new_password2 }}</p>
<p><input type="submit" value="提交" class="submit" /></p>
<input type="submit" value="提交" class="submit" />
</form>
</div>
{% endblock %}

4
views.py
View File

@@ -106,7 +106,7 @@ def repo(request, repo_id):
current_page = int(request.GET.get('page', '1'))
per_page= int(request.GET.get('per_page', '25'))
except ValueError:
page = 1
current_page = 1
per_page = 25
commits_all = get_commits(repo_id, per_page * (current_page -1), per_page + 1)
@@ -238,7 +238,7 @@ def seafadmin(request):
current_page = int(request.GET.get('page', '1'))
per_page= int(request.GET.get('per_page', '25'))
except ValueError:
page = 1
current_page = 1
per_page = 25
repos_all = seafserv_threaded_rpc.get_repo_list(per_page * (current_page -1), per_page + 1)