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

Merge branch 'hohoTT-dev' into virusdefender-dev

Browse Source 
* hohoTT-dev:
  前台比赛、比赛题目与普通题目的一系列界面

Conflicts:
	submission/views.py
	template/oj/contest/contest_problem.html
	template/oj/problem/my_submission.html
This commit is contained in:
virusdefender
2015-08-25 10:33:44 +08:00
parent 7b7e7131b8 48eb2d1e9b
commit a82f46a001
24 changed files with 573 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
template/oj/problem/my_submission.html
View File

@@ -12,12 +12,23 @@
<ul class="nav nav-tabs nav-tabs-google">
<li role="presentation">
{% if submission.contest_id %}
<a href="/contest/{{ submission.contest_id }}/problem/{{ problem.id }}/">题目</a>
{% else %}
<a href="/problem/{{ problem.id }}/">题目</a>
<a href="/problem/{{ problem.id }}/">题目</a>
{% endif %}
</li>
<li role="presentation" class="active"><a href="/problem/{{ problem.id }}/my_submissions/">我的提交</a></li>
<li role="presentation" class="active">
{% if submission.contest_id %}
<a href="/contest/{{ submission.contest_id }}/problem/{{ problem.id }}/submissions/">我的提交</a>
{% else %}
<a href="/problem/{{ problem.id }}/submissions/">我的提交</a>
{% endif %}
</li>
</ul>
{% include "oj/problem/_problem_header.html" %}
<div class="panel panel-default">

10
template/oj/problem/my_submissions_list.html
View File

@@ -8,13 +8,9 @@
<li role="presentation">
<a href="/problem/{{ problem.id }}/">题目</a></li>
<li role="presentation" class="active">
<a href="/problem/{{ problem.id }}/my_submissions/">我的提交</a></li>
<a href="/problem/{{ problem.id }}/submissions/">我的提交</a></li>
</ul>
<h2 class="text-center">{{ problem.title }}</h2>
<p class="text-muted text-center">发布时间: {{ problem.create_time }}&nbsp;&nbsp;
时间限制: {{ problem.time_limit }}ms&nbsp;&nbsp;
内存限制: {{ problem.memory_limit }}M</p>
{% include "oj/problem/_problem_header.html" %}
<table class="table table-bordered">
<thead>
<tr class="" success>
@@ -28,7 +24,7 @@
<tbody>
{% for item in submissions %}
<tr class="{{ item.result|translate_result_class }}">
<th scope="row"><a href="/my_submission/{{ item.id }}/">{{ forloop.counter }}</a></th>
<th scope="row"><a href="/submission/{{ item.id }}/">{{ forloop.counter }}</a></th>
<td>{{ item.create_time }}</td>
<td>{{ item.result|translate_result }}</td>
<td>

2
template/oj/problem/problem.html
View File

@@ -5,7 +5,7 @@
<ul class="nav nav-tabs nav-tabs-google">
<li role="presentation" class="active">
<a href="/problem/{{ problem.id }}/">题目</a></li>
<li role="presentation"><a href="/problem/{{ problem.id }}/my_submissions/">我的提交</a></li>
<li role="presentation"><a href="/problem/{{ problem.id }}/submissions/">我的提交</a></li>
</ul>
{% include "oj/problem/_problem_header.html" %}