xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into hohoTT-dev

Browse Source 
Conflicts:
	oj/urls.py
This commit is contained in:
hohoTT
2015-09-17 20:33:16 +08:00
parent 903a36f43d 5fb55221ea
commit 17a0448890
28 changed files with 350 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
template/src/oj/account/change_password.html
View File

@@ -24,9 +24,10 @@
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label for="confirm_password">验证码</label>
<img src="/captcha/" id="captcha-img">
<input type="text" class="form-control input-lg" id="captcha" name="captcha" placeholder="验证码" maxlength="4" required>
<label for="captcha">验证码</label>
&nbsp;&nbsp;<img src="/captcha/" id="captcha-img">
<small><p></p></small>
<input type="text" class="form-control input-lg" id="captcha" name="captcha" placeholder="验证码" maxlength="4" data-error="请填写验证码" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">

1
template/src/oj/account/login.html
View File

@@ -22,6 +22,7 @@
<div class="help-block with-errors"></div>
</div>
<div class="form-group" id="captcha-area"></div>
<div class="form-group">
<button type="submit" class="btn btn-primary">提交</button>
</div>

10
template/src/oj/account/register.html
View File

@@ -10,7 +10,7 @@
<form id="register-form">
<div class="form-group">
<label for="username">用户名</label>
<input type="text" class="form-control input-lg" id="username" name="username" placeholder="用户名" data-error="请填写用户名" required autofocus>
<input type="text" class="form-control input-lg" id="username" name="username" placeholder="用户名" data-remote="/api/username_check/" data-remote-error="该用户名已被注册！" data-error="请填写用户名" required autofocus>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
@@ -20,7 +20,7 @@
</div>
<div class="form-group">
<label for="email">邮箱地址</label>
<input type="email" class="form-control input-lg" id="email" name="email" placeholder="邮箱地址" data-error="请填写正确的邮箱地址" required>
<input type="email" class="form-control input-lg" id="email" name="email" placeholder="邮箱地址" data-remote="/api/email_check/" data-remote-error="该邮箱已被注册！" data-error="请填写正确的邮箱地址" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
@@ -34,6 +34,12 @@
placeholder="确认密码" data-match="#password" data-match-error="两个密码不一致" data-error="请填写确认密码" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label for="captcha">验证码</label>
&nbsp;&nbsp;<img src="/captcha/" id="captcha-img"><small><p></p></small>
<input type="text" class="form-control input-lg" id="captcha" name="captcha" placeholder="验证码" maxlength="4" data-error="请填写验证码" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">提交</button>
</div>