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

Accept Merge Request #150 前台表单验证再次统一，改密码功能改动，后台用户名显示，去重复代码 : (dev-sxw -> dev)

Browse Source 
Merge Request: 前台表单验证再次统一，改密码功能改动，后台用户名显示，去重复代码
Created By: @esp
Accepted By: @esp
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/150
This commit is contained in:
esp
2015-09-02 15:33:02 +08:00
parent a4433a1cf3 d48e9de074
commit 6f62d7e650
9 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
template/src/admin/admin.html
View File

@@ -15,7 +15,7 @@
</head>
<body>
<body ms-controller="admin">
<!-- nav begin -->
<nav class="navbar navbar-masthead navbar-default navbar-static-top">
@@ -39,13 +39,13 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false">
李扬
{{ username }}
<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">我的提交</a></li>
<li><a href="/submissions/">我的提交</a></li>
<li><a href="#">我的资料</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">退出</a></li>
<li><a href="/logout/">退出</a></li>
</ul>
</li>
</ul>
@@ -62,7 +62,7 @@
<![endif]-->
<!-- browser happy end -->
<div class="container main" ms-controller="admin">
<div class="container main">
<div class="row">
<!-- admin left begin-->
<div class="col-md-2">

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

@@ -5,11 +5,6 @@
<h2 class="text-center">修改密码</h2>
<form id="change_password-form">
<div class="form-group">
<label for="username">用户名</label>
<input type="text" class="form-control input-lg" id="username" name="username" placeholder="用户名" data-error="请填写用户名" maxlength="30" autofocus required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label for="password">旧密码</label>
<input type="password" class="form-control input-lg" id="password" name="password" placeholder="密码" data-error="请填写旧密码" maxlength="30" required>

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

@@ -7,28 +7,28 @@
<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-error="请填写用户名" required autofocus>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label for="real_name">真实姓名</label>
<input type="text" class="form-control input-lg" id="real_name" name="real_name" placeholder="真实姓名" data-error="请输入姓名" required>
<input type="text" class="form-control input-lg" id="real_name" name="real_name" placeholder="真实姓名" data-error="请填写姓名" required>
<div class="help-block with-errors"></div>
</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-error="请填写正确的邮箱地址" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label for="password">密码</label>
<input type="password" class="form-control input-lg" id="password" name="password" placeholder="密码" data-minlength="6" data-minlength-error="密码不得少于6位" required>
<input type="password" class="form-control input-lg" id="password" name="password" data-error="请填写密码" placeholder="密码" data-minlength="6" data-minlength-error="密码不得少于6位" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label for="confirm_password">确认密码</label>
<input type="password" class="form-control input-lg" id="confirm_password" name="confirm_password"
placeholder="确认密码" data-match="#password" data-match-error="两个密码不一致" required>
placeholder="确认密码" data-match="#password" data-match-error="两个密码不一致" data-error="请填写确认密码" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">