Merge branch 'dev' into hohoTT-dev

template/oj/contest/contest_rank.html

@@ -1,30 +0,0 @@
-{% extends "oj_base.html" %}
-{% block body %}
-    {% load contest %}
-    <div class="container main">
-        <div class="col-lg-12 contest-tab">
-            <ul class="nav nav-tabs nav-tabs-google">
-                <li role="presentation" class="active">
-                    <a href="/contest/{{ contest.id }}/">比赛详情</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/problems/">题目</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/submissions/">提交</a>
-                </li>
-                <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/rank/">排名</a>
-                </li>
-            </ul>
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-            </div>
-        </div>
-    </div>
-{% endblock %}
-
-
-{% block js_block %}
-{% endblock %}

template/src/oj/contest/contest_problem.html

@@ -1,11 +1,13 @@
 {% extends 'oj_base.html' %}
 
 {% block body %}
-<div class="container main">
+    <div class="container main">
     <ul class="nav nav-tabs nav-tabs-google">
         <li role="presentation" class="active">
             <a href="/contest/{{ contest_problem.contest.id }}/problem/{{ contest_problem.id }}/">题目</a></li>
-        <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 }}/problem/{{ contest_problem.id }}/submissions/">我的提交</a>
+        </li>
     </ul>
     <h2 class="text-center">{{ contest_problem.title }}</h2>
 
@@ -15,29 +17,22 @@
     </p>
 
     <div>
-        <div class="problem-section">
-            <label class="problem-label">描述</label>
+    <div class="problem-section">
+        <label class="problem-label">描述</label>
 
-            <p class="problem-detail">{{ contest_problem.description|safe }}</p>
-        </div>
-        <div class="problem-section">
-            <label class="problem-label">输入</label>
+        <p class="problem-detail">{{ contest_problem.description|safe }}</p>
+    </div>
+    <div class="problem-section">
+        <label class="problem-label">输入</label>
+
+        <p class="problem-detail">{{ contest_problem.input_description }}</p>
 
         <div>
-            <div class="problem-section">
-                <label class="problem-label">描述</label>
 
-                <p class="problem-detail">{{ contest_problem.description|safe }}</p>
-            </div>
-            <div class="problem-section">
-                <label class="problem-label">输入</label>
-
-                <p class="problem-detail">{{ contest_problem.input_description }}</p>
-            </div>
             <div class="problem-section">
                 <label class="problem-label">输出</label>
 
-                <p class="problem-detail">{{ contest_problem.output_description }}k</p>
+                <p class="problem-detail">{{ contest_problem.output_description }}</p>
             </div>
             {% for item in samples %}
                 <div class="problem-section">

template/src/oj/contest/contest_rank.html

@@ -0,0 +1,59 @@
+{% extends "oj_base.html" %}
+{% block body %}
+    {% load submission %}
+    <div class="container main">
+        <div class="col-lg-12 contest-tab">
+            <ul class="nav nav-tabs nav-tabs-google">
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/">比赛详情</a>
+                </li>
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/problems/">题目</a>
+                </li>
+                <li role="presentation">
+                    <a href="/contest/{{ contest.id }}/submissions/">提交</a>
+                </li>
+                <li role="presentation" class="active">
+                    <a href="/contest/{{ contest.id }}/rank/">排名</a>
+                </li>
+            </ul>
+        </div>
+        <div class="row">
+            <div class="col-lg-12">
+                <table class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th>#</th>
+                        <th>用户名</th>
+                        <th>AC / 总提交</th>
+                        <th>用时 + 罚时</th>
+                        {% for item in contest_problems %}
+                            <th><a href="/contest/{{ contest.id }}/problem/{{ item.id }}/">{{ item.sort_index }}</a>
+                            </th>
+                        {% endfor %}
+                    </tr>
+                    </thead>
+                    <tbody>
+                    {% for item in result %}
+                        <tr>
+                            <th scope="row">{{ forloop.counter }}</th>
+                            <td>{{ item.user.username }}</td>
+                            <td>{{ item.total_ac }} / {{ item.total_submit }}</td>
+                            <td>{% if item.total_time %}{{ item.total_time }} min{% else %}--{% endif %}</td>
+                            {% for problem in contest_problems %}
+                                <td class="{% submission_problem_result_class problem item.submissions %}">
+                                    {% submission_problem problem item.submissions %}
+                                </td>
+                            {% endfor %}
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+{% endblock %}
+
+
+{% block js_block %}
+{% endblock %}