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

Merge branch 'dev' into virusdefender-dev

Browse Source 
* dev:
  [前端]重新修改添加比赛中测试用例的上传方式，修复了bug，还没有写ajax上传比赛信息的部分，因为没有API[CI SKIP]
  [[前端]修改添加比赛页面格局，只保留一个上传控件，以避免分歧，但仍稍有问题
  Revert "Revert "删除不必要的东西""
  Revert "删除不必要的东西"
  删除不必要的东西
This commit is contained in:
virusdefender
2015-08-11 20:11:19 +08:00
parent a0b34a01a4 9273c5484d
commit 3f8a8e98b3
6 changed files with 80 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
template/admin/contest/add_contest.html
View File

@@ -37,9 +37,7 @@
</div>
<div class="col-md-6">
<label>
密码保护
</label>
<label>密码保护</label>
</div>
<div class="col-md-3">
<label>
@@ -77,10 +75,17 @@
<div class="col-md-12">
<label>添加题目</label>
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="add_problem()">添加</a>
<div class="col-md-12">
<label>上传测试用例</label>
<label>选择题号</label><select ms-duplex="problemNo"><option value="-1">未指定</option><option ms-repeat="problems" ms-attr-value="$index+1">{{$index+1}}</option></select>
<div id="uploader">
<div>选择文件</div>
</div>
</div>
</div>
<div class="col-md-12">
<div class="problem" ms-repeat-problem="problems">
<div class="panel panel-default problem-panel" ms-attr-id="problem-{{ problem.id }}">
<div class="panel panel-default problem-panel">
<div class="panel-heading">
<span class="panel-title">题目{{$index + 1}} </span>
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="toggle(problem)">
@@ -91,73 +96,44 @@
</a>
</div>
<div class="panel-body" ms-visible="problem.visible">
<div class="col-md-12">
<label>题目</label>
<div class="form-group col-md-12">
<label>题目标题</label>
<input type="text" name="problem_name[]" class="form-control" ms-duplex="problem.title">
</div>
<div class="col-md-12">
<div class="form-group">
<input type="text" name="problem_name[]" class="form-control"
ms-duplex="problem.title">
</div>
</div>
<label>题目描述</label>
<textarea ms-attr-id="problem-{{ problem.id }}-description" placeholder="这里输入内容"
ms-duplex="problem.description"></textarea>
<small ms-visible="problem.description==''" style="color:red">请填写题目描述</small>
<div class="form-group">
<div class="form-group col-md-12">
<label>题目描述</label>
<textarea ms-attr-id="problem-{{ problem.id }}-description" placeholder="这里输入内容" ms-duplex="problem.description"></textarea>
<small ms-visible="problem.description==''" style="color:red">请填写题目描述</small>
</div>
<div class="form-group col-md-12">
<label>提示</label>
<textarea ms-attr-id="problem-{{ problem.id }}-hint" placeholder="这里输入内容" ms-duplex="problem.hint"></textarea>
</div>
<div class="col-md-3">
<div class="form-group"><label>cpu</label>
<input type="number" name="cpu[]" class="form-control" ms-duplex="problem.cpu">
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>内存</label>
<input type="number" name="memory[]" class="form-control" ms-duplex="problem.memory">
</div>
</div>
<div class="col-md-3">
<div class="form-group"><label>难度</label>
<input type="number" name="difficulty[]" class="form-control" ms-duplex="problem.difficulty">
</div>
<div class="col-md-3 form-group">
<label>cpu</label>
<input type="number" name="cpu[]" class="form-control" ms-duplex="problem.cpu">
</div>
<div class="col-md-3 form-group">
<label>前台是否可见</label><br>
<label><input type="checkbox" ms-duplex-checked="problem.isVisible">
<small> 可见</small>
</label>
<label>内存</label>
<input type="number" name="memory[]" class="form-control" ms-duplex="problem.memory">
</div>
<div id="tag" class="col-md-12">
<label>标签</label><br>
<input type="text" ms-attr-id="problem-{{ problem.id }}-tags" >
<div class="col-md-3 form-group">
<label>难度</label>
<input type="number" name="difficulty[]" class="form-control" ms-duplex="problem.difficulty">
</div>
<div class="col-md-12">
<label>样例</label>
<a href="javascript:void(0)" class="btn btn-primary btn-sm"
ms-click="add_sample(problem)">
添加
</a>
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="add_sample(problem)">添加</a>
<div class="sample">
<div class="panel panel-default sample-panel"
ms-repeat-sample="problem.samples">
<div class="panel panel-default sample-panel" ms-repeat-sample="problem.samples">
<div class="panel-heading">
<span class="panel-title">样例{{$index + 1}}</span>
<a href="javascript:void(0)" class="btn btn-primary btn-sm"
ms-click="toggle(sample)">
<a href="javascript:void(0)" class="btn btn-primary btn-sm" ms-click="toggle(sample)">
{{getBtnContent(sample)}}
</a>
<a href="javascript:void(0)" class="btn btn-danger btn-sm"
ms-click="del_sample(problem, sample)">
<a href="javascript:void(0)" class="btn btn-danger btn-sm" ms-click="del_sample(problem, sample)">
删除
</a>
</div>
<div class="panel-body row" ms-visible="sample.visible">
<div class="col-md-6">
@@ -183,25 +159,19 @@
<small class="text-info">请将所有测试用例打包在一个文件中上传，所有文件要在压缩包的根目录，且输入输出文件名要以从1开始连续数字标识要对应例如：<br>
1.in 1.out 2.in 2.out
</small>
<table class="table table-striped" ms-visible="uploadSuccess">
<table class="table table-striped" ms-visible="problem.uploadSuccess">
<tr>
<td>编号</td>
<td>输入文件名</td>
<td>输出文件名</td>
</tr>
<tr ms-repeat="testCaseList">
<tr ms-repeat="problem.testCaseList">
<td>{{$index}}</td>
<td>{{el.input}}</td>
<td>{{el.output}}</td>
</tr>
</table>
</div>
<div class="col-md-12">
<div class="form-group">
<div ms-attr-id="problem-{{ problem.id }}-uploader">选择文件</div>
</div>
</div>
</div>
</div>
</div>

1
template/oj/announcement/announcement.html
View File

@@ -15,7 +15,6 @@
{% endifequal %}
</p>
<div>
<p>{{ announcement.content|safe }}</p>
</div>