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

合并dev,修复冲突，修改比赛列表中的小bug

Browse Source
This commit is contained in:
sxw@401
2015-09-12 17:12:16 +08:00
parent 068513b451 494c5e4b60
commit 060f6c6764
20 changed files with 146 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
template/src/oj/contest/_contest_header.html
View File

@@ -33,6 +33,6 @@
</tbody>
</table>
<hr>
<div>{{ contest.description|safe }}</div>
<div class="text-center">{{ contest.description|safe }}</div>
</div>
<p class="text-center"></p>

4
template/src/oj/contest/contest_problem.html
View File

@@ -8,9 +8,6 @@
<li role="presentation"><a
href="/contest/{{ contest_problem.contest.id }}/problem/{{ contest_problem.id }}/submissions/">我的提交</a>
</li>
<li role="presentation"><a
href="/contest/{{ contest_problem.contest.id }}/problems/">返回</a>
</li>
</ul>
<h2 class="text-center">{{ contest_problem.title }}</h2>
@@ -40,6 +37,7 @@
{% for item in samples %}
<div class="problem-section">
<label class="problem-label">样例输入{{ forloop.counter }}</label>
<a href="javascript:void(0)" class="copy-sample" data-clipboard-text="{{ item.input }}">复制</a>
<pre>
{{ item.input }}</pre>

4
template/src/oj/contest/contest_problems_list.html
View File

@@ -57,10 +57,10 @@
</th>
<th scope="row">
<a href="/contest/{{ item.contest.id }}/problem/{{ item.id }}/" target="_blank">{{ item.sort_index }}</a>
<a href="/contest/{{ item.contest.id }}/problem/{{ item.id }}/">{{ item.sort_index }}</a>
</th>
<td>
<a href="/contest/{{ item.contest.id }}/problem/{{ item.id }}/" target="_blank">{{ item.title }}</a>
<a href="/contest/{{ item.contest.id }}/problem/{{ item.id }}/">{{ item.title }}</a>
</td>
<td>{{ item|accepted_radio }}</td>
</tr>