From 7ae8f4026b78601b03d61cf37074efaaede8db85 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Wed, 6 Jan 2016 17:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=80=92=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8D=E7=BB=9F=E4=B8=80=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/oj/contest/_countdown_template.html   | 19 ++++++++++++++++
 template/src/oj/contest/contest_index.html    | 22 ++-----------------
 .../src/oj/contest/contest_problems_list.html |  2 +-
 .../src/oj/contest/no_contest_permission.html | 22 ++-----------------
 4 files changed, 24 insertions(+), 41 deletions(-)
 create mode 100644 template/src/oj/contest/_countdown_template.html

diff --git a/template/src/oj/contest/_countdown_template.html b/template/src/oj/contest/_countdown_template.html
new file mode 100644
index 00000000..951cdffe
--- /dev/null
+++ b/template/src/oj/contest/_countdown_template.html
@@ -0,0 +1,19 @@
+<script type="x-template" id="template">
+    {% if contest.status %}
+        <strong><span>距离比赛开始还有：</span></strong>
+    {% else %}
+        <strong><span>距离比赛结束还有：</span></strong>
+    {% endif %}
+    <div class="day-timer timer-section">
+        <span class="time">%d</span><span>%td</span>
+    </div>
+    <div class="hour-timer timer-section">
+        <span class="time">%h</span><span>%th</span>
+    </div>
+    <div class="min-timer timer-section">
+        <span class="time">%i</span><span>%ti</span>
+    </div>
+    <div class="second-timer timer-section">
+        <span class="time">%s</span><span>%ts</span>
+    </div>
+</script>
\ No newline at end of file
diff --git a/template/src/oj/contest/contest_index.html b/template/src/oj/contest/contest_index.html
index 3e1fe793..95714f50 100644
--- a/template/src/oj/contest/contest_index.html
+++ b/template/src/oj/contest/contest_index.html
@@ -15,31 +15,13 @@
                 <a href="/contest/{{ contest.id }}/submissions/">提交</a>
             </li>
             <li role="presentation">
-                <a href="/contest/{{ contest.id }}/rank/?paging=true&page=1&page_size=40">排名</a>
+                <a href="/contest/{{ contest.id }}/rank/">排名</a>
             </li>
         </ul>
         {% include "oj/contest/_contest_header.html" %}
     </div>
 {% endblock %}
 {% block js_block %}
-    <script type="x-template" id="template">
-        {% if contest.status %}
-            <strong><span>距离比赛开始还有：</span></strong>
-        {% else %}
-            <strong><span>距离比赛结束还有：</span></strong>
-        {% endif %}
-        <div class="day-timer timer-section">
-            <span class="time">%d</span> <span>%td</span>
-        </div>
-        <div class="hour-timer timer-section">
-            <span class="time">%h</span><span>%th</span>
-        </div>
-        <div class="min-timer timer-section">
-            <span class="time">%i</span><span>%ti</span>
-        </div>
-        <div class="second-timer timer-section">
-            <span class="time">%s</span><span>%ts</span>
-        </div>
-    </script>
+    {% include "oj/contest/_countdown_template.html" %}
     <script src="/static/js/app/oj/contest/contestCountdown.js"></script>
 {% endblock %}
diff --git a/template/src/oj/contest/contest_problems_list.html b/template/src/oj/contest/contest_problems_list.html
index 056ba6c0..469b366e 100644
--- a/template/src/oj/contest/contest_problems_list.html
+++ b/template/src/oj/contest/contest_problems_list.html
@@ -21,7 +21,7 @@
                         <a href="/contest/{{ contest.id }}/submissions/">提交</a>
                     </li>
                     <li role="presentation">
-                        <a href="/contest/{{ contest.id }}/rank/?paging=true&page=1&page_size=40">排名</a>
+                        <a href="/contest/{{ contest.id }}/rank/">排名</a>
                     </li>
                 </ul>
 
diff --git a/template/src/oj/contest/no_contest_permission.html b/template/src/oj/contest/no_contest_permission.html
index 29a09448..c6ff67c2 100644
--- a/template/src/oj/contest/no_contest_permission.html
+++ b/template/src/oj/contest/no_contest_permission.html
@@ -16,7 +16,7 @@
                     <a href="/contest/{{ contest.id }}/submissions/">提交</a>
                 </li>
                 <li role="presentation">
-                    <a href="/contest/{{ contest.id }}/rank/?paging=true&page=1&page_size=40">排名</a>
+                    <a href="/contest/{{ contest.id }}/rank/">排名</a>
                 </li>
             {% endif %}
         </ul>
@@ -39,25 +39,7 @@
     </div>
 {% endblock %}
 {% block js_block %}
-    <script type="x-template" id="template">
-        {% if contest.status %}
-            <strong><span>距离比赛开始还有：</span></strong>
-        {% else %}
-            <strong><span>距离比赛结束还有：</span></strong>
-        {% endif %}
-        <div class="day-timer timer-section">
-            <span class="time">%d</span> <span>%td</span>
-        </div>
-        <div class="hour-timer timer-section">
-            <span class="time">%h</span> : <span>%th</span>
-        </div>
-        <div class="min-timer timer-section">
-            <span class="time">%i</span> : <span>%ti</span>
-        </div>
-        <div class="second-timer timer-section">
-            <span class="time">%s</span> : <span>%ts</span>
-        </div>
-    </script>
+    {% include "oj/contest/_countdown_template.html" %}
     <script src="/static/js/app/oj/contest/contestPassword.js"></script>
     <script src="/static/js/app/oj/contest/contestCountdown.js"></script>
 {% endblock %}
\ No newline at end of file