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

Accept Merge Request #93 : (hohoTT-dev -> dev)

Browse Source 
Merge Request: 替换掉商业版的 formvalidation,修改admin中js与html中的问题
Created By: @hohoTT
Accepted By: @virusdefender
URL: https://coding.net/u/virusdefender/p/qduoj/git/merge/93?tab=files
This commit is contained in:
virusdefender
2015-08-17 16:40:27 +08:00
parent f38c6ecd21 1790945a3e
commit c33efce63c
12 changed files with 267 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
template/admin/announcement/announcement.html
View File

@@ -53,11 +53,17 @@
<h3>添加公告</h3>
<form id="announcement-form">
<div class="form-group"><label>标题</label>
<input name="title" type="text" class="form-control" id="title" placeholder="公告标题"></div>
<div class="form-group">
<label>标题</label>
<input name="title" type="text" class="form-control" id="title" placeholder="公告标题"
data-error="请填写公告标题(标题不得超过50字)" maxlength="50" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<label>内容</label>
<textarea id="create-announcement-editor" placeholder="公告内容"></textarea>
<textarea id="create-announcement-editor" placeholder="公告内容" maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary">提交</button>

11
template/admin/group/group_detail.html
View File

@@ -36,12 +36,17 @@
<form id="edit_group_form">
<div class="col-md-12">
<div class="form-group"><label>小组名</label>
<input type="text" name="name" class="form-control" ms-duplex="name">
<input type="text" name="name" class="form-control" ms-duplex="name"
data-error="请填写小组名(名称不能超过20字)" maxlength="20" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-12">
<div class="form-group"><label>描述</label>
<textarea rows="3" name="description" class="form-control" ms-duplex="description"></textarea>
<textarea rows="3" name="description" class="form-control" ms-duplex="description"
data-error="请填写描述" maxlength="300" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-12">
@@ -58,4 +63,4 @@
</form>
</div>
<script src="/static/js/app/admin/group/groupDetail.js"></script>
<script src="/static/js/app/admin/group/groupDetail.js"></script>

30
template/admin/problem/add_problem.html
View File

@@ -3,7 +3,9 @@
<div class="form-group col-md-12">
<label>题目标题</label>
<input type="text" name="title" autofocus class="form-control" ms-duplex="title">
<input type="text" name="title" autofocus class="form-control" ms-duplex="title"
data-error="请填写题目名称(名称不能超过50个字)" maxlength="50" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-12">
@@ -15,21 +17,23 @@
<div class="col-md-3">
<div class="form-group"><label>时间限制(ms)</label>
<input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit">
<input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
data-error="请输入时间限制(保证是一个1000-5000的合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>内存限制(MB)</label>
<input type="number" name="memoryLimit" class="form-control" ms-duplex="memoryLimit">
<input type="number" name="memoryLimit" class="form-control" ms-duplex="memoryLimit"
data-error="请输入内存限制(保证是一个合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>难度</label>
<input type="number" name="difficulty" class="form-control" ms-duplex="difficulty">
<input type="number" name="difficulty" class="form-control" ms-duplex="difficulty"
data-error="请输入难度(保证是一个合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3 form-group">
@@ -45,12 +49,18 @@
<div class="col-md-12 form-group">
<label>输入描述</label><br>
<textarea class="form-control" rows="5" name="input_description"
ms-duplex="inputDescription"></textarea>
ms-duplex="inputDescription"data-error="请填写输入描述"
maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="col-md-12 form-group">
<label>输出描述</label><br>
<textarea class="form-control" rows="5" name="output_description"
ms-duplex="outputDescription"></textarea>
ms-duplex="outputDescription"data-error="请填写输出描述"
maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="col-md-12"><br>
<label>样例</label>

28
template/admin/problem/edit_problem.html
View File

@@ -9,7 +9,9 @@
<div class="form-group col-md-12">
<label>题目标题</label>
<input type="text" name="title" autofocus class="form-control" ms-duplex="title">
<input type="text" name="title" autofocus class="form-control" ms-duplex="title"
data-error="请填写题目名称(名称不能超过30个字)" maxlength="30" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-12">
@@ -21,17 +23,23 @@
<div class="col-md-3">
<div class="form-group"><label>时间限制(ms)</label>
<input type="number" name="cpu" class="form-control" ms-duplex="timeLimit">
<input type="number" name="timeLimit" class="form-control" ms-duplex="timeLimit"
data-error="请输入时间限制(保证是一个1000-5000的合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>内存限制(MB)</label>
<input type="number" name="memory" class="form-control" ms-duplex="memoryLimit">
<input type="number" name="memory" class="form-control" ms-duplex="memoryLimit"
data-error="请输入内存限制(保证是一个合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>难度</label>
<input type="number" name="difficulty" class="form-control" ms-duplex="difficulty">
<input type="number" name="difficulty" class="form-control" ms-duplex="difficulty"
data-error="请输入难度(保证是一个合法整数)" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="col-md-3 form-group">
@@ -47,12 +55,18 @@
<div class="col-md-12 form-group">
<label>输入描述</label><br>
<textarea class="form-control" rows="5" name="input_description"
ms-duplex="inputDescription"></textarea>
ms-duplex="inputDescription" data-error="请填写输入描述"
maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="col-md-12 form-group">
<label>输出描述</label><br>
<textarea class="form-control" rows="5" name="output_escription"
ms-duplex="outputDescription"></textarea>
ms-duplex="outputDescription" data-error="请填写输出描述"
maxlength="10000" required>
</textarea>
<div class="help-block with-errors"></div>
</div>
<div class="col-md-12"><br>
<label>样例</label>
@@ -126,4 +140,4 @@
</form>
</div>
<script src="/static/js/app/admin/problem/edit_problem.js"></script>
<script src="/static/js/app/admin/problem/edit_problem.js"></script>

15
template/admin/user/user_list.html
View File

@@ -52,19 +52,26 @@
<input name="id" type="number" class="form-control" readonly ms-duplex="id">
</div>
<div class="form-group col-md-4"><label>用户名</label>
<input name="username" type="text" class="form-control" ms-duplex="username">
<input name="username" type="text" class="form-control" ms-duplex="username"
data-minlength="3" data-minlength-error="用户名不得少于3位" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-4"><label>真实姓名</label>
<input name="real_name" type="text" class="form-control" ms-duplex="realName">
<input name="real_name" type="text" class="form-control" ms-duplex="realName"
data-error="请填写真实姓名" maxlength="30" required>
<div class="help-block with-errors"></div>
</div>
</div>
<div class="row">
<div class="form-group col-md-4"><label>新密码（留空则保留原密码）</label>
<input name="password" type="password" class="form-control" id="password" ms-duplex="password"
placeholder="此项留空则保留原密码">
placeholder="此项留空则保留原密码" data-minlength="6" data-minlength-error="密码不得少于6位">
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-4"><label>电子邮箱</label>
<input name="email" type="email" class="form-control" ms-duplex="email">
<input name="email" type="email" class="form-control" ms-duplex="email"
data-error="请填写邮箱地址(并保证是正确的邮箱格式)" required>
<div class="help-block with-errors"></div>
</div>
<div class="form-group col-md-4"><label>用户类型</label>
<select name="admin_type" class="form-control" ms-duplex="adminType">