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

4
template/src/oj/announcement/_announcement_panel.html
View File

@@ -1,3 +1,4 @@
{% load announcement_list %}
<div class="panel panel-info">
<div class="panel-heading">
<h3 class="panel-title">
@@ -5,8 +6,9 @@
公告
</h3></div>
<div class="panel-body">
{% public_announcement_list as announcements %}
{% if announcements %}
{% for item in announcements %}
{% for item in announcements%}
<p>{{ forloop.counter }}.&nbsp;&nbsp;<a href="/announcement/{{ item.id }}/" target="_blank">{{ item.title }}</a>
</p>
{% endfor %}

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>

3
template/src/oj/problem/problem.html
View File

@@ -9,9 +9,6 @@
<li role="presentation">
<a href="/problem/{{ problem.id }}/submissions/">我的提交</a>
</li>
<li role="presentation">
<a href="/problems/">返回</a>
</li>
</ul>
{% include "oj/problem/_problem_header.html" %}

8
template/src/oj/problem/problem_list.html
View File

@@ -21,16 +21,16 @@
<th></th>
<th>#</th>
<th>题目</th>
<th><a href="/problems/?order_by=difficulty">难度</a></th>
<th><a href="/problems/?order_by=acceptance">通过率</a></th>
<th><a href="/problems/?order_by={{ difficulty_order }}">难度</a></th>
<th>通过率</th>
</tr>
</thead>
<tbody>
{% for item in problems %}
<tr>
<th><span class="glyphicon glyphicon-ok ac-flag"></span></th>
<th scope="row"><a href="/problem/{{ item.id }}/" target="_blank">{{ item.id }}</a></th>
<td><a href="/problem/{{ item.id }}/" target="_blank">{{ item.title }}</a></td>
<th scope="row"><a href="/problem/{{ item.id }}/">{{ item.id }}</a></th>
<td><a href="/problem/{{ item.id }}/">{{ item.title }}</a></td>
<td>{{ item.difficulty }}</td>
<td>{{ item|accepted_radio }}</td>
</tr>

8
template/src/oj/submission/my_submissions_list.html
View File

@@ -3,7 +3,7 @@
{% block body %}
{% load submission %}
<div class="container main">
<div class="col-md-9 col-lg-9">
<div class="col-md-12 col-lg-12">
<table class="table table-striped">
<thead>
<tr>
@@ -52,7 +52,7 @@
<a href="/submission/{{ item.id }}/">{{ forloop.counter |add:start_id }}</a>
</th>
<td>
<a href="/problem/{{ item.problem_id }}/">{{ item.problem_id }}</a>
<a href="/problem/{{ item.problem_id }}/">{{ item.title }}</a>
</td>
<td>{{ item.create_time }}</td>
<td>
@@ -92,8 +92,6 @@
<p>你还没有提交记录!</p>
{% endif %}
</div>
<div class="col-md-3 col-lg-3">
{% include "oj/announcement/_announcement_panel.html" %}
</div>
</div>
{% endblock %}