From ac0284879f81aeaa8449e4deda95c0ed8aee5bab Mon Sep 17 00:00:00 2001
From: virusdefender <qduliyang@outlook.com>
Date: Sat, 23 Apr 2016 20:31:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9E=E9=99=85=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E9=97=B4=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/src/js/components/testCaseUploader.js  |  2 +-
 template/src/oj/submission/my_submission.html | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/static/src/js/components/testCaseUploader.js b/static/src/js/components/testCaseUploader.js
index 3f908e1..890cf1c 100644
--- a/static/src/js/components/testCaseUploader.js
+++ b/static/src/js/components/testCaseUploader.js
@@ -7,7 +7,7 @@ define("testCaseUploader", ["avalon", "uploader", "bsAlert", "jquery"], function
         '请将所有测试用例打包在一个文件中上传，' +
         '所有文件要在压缩包的根目录，' +
         '且输入输出文件名要以从1开始连续数字标识要对应例如：' +
-        '<br>1.in 1.out 2.in 2.out(普通题目)或者1.in 2.in 3.in(Special Judge) </small> ' +
+        '<br>1.in 1.out 2.in 2.out(普通题目)或者1.in 2.in 3.in(Special Judge) 请尽可能的合并测试用例在一个文件中</small> ' +
         '<p>上传进度<span ms-text="uploadProgress"></span>%</p> ' +
         '<table class="table table-striped" ms-visible="uploaded"> ' +
         '<tr> <td>编号</td> <td>输入文件名</td> <td>输出文件名</td> </tr> ' +
diff --git a/template/src/oj/submission/my_submission.html b/template/src/oj/submission/my_submission.html
index c0c099c..289361f 100644
--- a/template/src/oj/submission/my_submission.html
+++ b/template/src/oj/submission/my_submission.html
@@ -68,19 +68,21 @@
                         <table class="table">
                           <thead>
                             <tr>
-                              <th>测试用例</th>
-                              <th>CPU时间</th>
-                              <th>内存</th>
-                              <th>结果</th>
+                                <th>测试用例</th>
+                                <th><a href="https://github.com/QingdaoU/OnlineJudge/wiki/%E5%AE%9E%E9%99%85%E8%BF%90%E8%A1%8C%E6%97%B6%E9%97%B4%E5%92%8CCPU%E6%97%B6%E9%97%B4">实际运行时间</a></th>
+                                <th>CPU时间</th>
+                                <th>内存</th>
+                                <th>结果</th>
                             </tr>
                           </thead>
                           <tbody>
                           {% for item in info %}
                             <tr>
                               <th scope="row">{{ item.test_case }}</th>
-                              <td>{{ item.cpu_time }} ms</td>
-                              <td>{{ item.memory }} Byte</td>
-                              <td class="{{ item.result|translate_result_class }}">{{ item.result|translate_result }}</td>
+                                <td>{{ item.real_time }} ms</td>
+                                <td>{{ item.cpu_time }} ms</td>
+                                <td>{{ item.memory }} Byte</td>
+                                <td class="{{ item.result|translate_result_class }}">{{ item.result|translate_result }}</td>
                             </tr>
                           {% endfor %}
                           </tbody>