From 656d6b700d6cf5bdbf639b703546d8031b8a2c3c Mon Sep 17 00:00:00 2001
From: Menci <HuangHaoRui301@Gmail.com>
Date: Fri, 17 Feb 2017 18:20:03 +0800
Subject: [PATCH] UI optimize

---
 static/style.css             |  5 +----
 views/problem_data.ejs       | 43 +++++++++++++++++++++---------------
 views/submission_content.ejs |  2 +-
 views/util.ejs               |  1 -
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/static/style.css b/static/style.css
index 7c47612..38d21c2 100644
--- a/static/style.css
+++ b/static/style.css
@@ -39,10 +39,7 @@ pre {
 
 :not(.status_detail).status.accepted,
 .title:hover .status_detail.status.accepted,
-.title.active .status_detail.status.accepted,
-:not(.status_detail).status.passed,
-.title:hover .status_detail.status.passed,
-.title.active .status_detail.status.passed {
+.title.active .status_detail.status.accepted {
     color: forestgreen;
 }
 
diff --git a/views/problem_data.ejs b/views/problem_data.ejs
index b539f60..83651b6 100644
--- a/views/problem_data.ejs
+++ b/views/problem_data.ejs
@@ -1,11 +1,17 @@
 <% this.title = '上传测试数据'; %>
 <% include header %>
+<%
+let subtaskType = {
+  sum: '测试点分数按百分比相加',
+  min: '取各测试点最低分',
+  mul: '测试点分数按百分比相乘'
+};
+%>
 <div class="padding">
     <div class="ui grid">
     <div class="row">
       <div class="seven wide column">
           <% if (problem.testdata) { %>
-              <p>数据包：<%= problem.testdata.filename %></p>
             <%
             try {
                 let list = syzoj.utils.parseTestData(problem.testdata.getPath());
@@ -17,26 +23,27 @@
                 <% } %>
                 <table class="ui very basic table">
                   <thead>
-                <tr>
+                  <tr>
                     <th>输入文件</th>
                     <th>输出文件</th>
-                </tr>
-                </thead>
-                <tbody>
-                <% for (let subtask of list) { %>
-                  <% if (list.length !== 1) { %>
-                    <tr>
-                      <td colspan='2'><strong>→ 子任务评分方式：<%= subtask.type %>，分值：<%= subtask.score %></strong></td>
-                    </tr>
+                  </tr>
+                  </thead>
+                  <tbody>
+                  <% let i = 0; %>
+                  <% for (let subtask of list) { %>
+                    <% if (list.length !== 1) { %>
+                      <tr>
+                        <td colspan='2'><h4 style="margin-bottom: 5px; "><strong>子任务 <%= ++i %></strong></h4><%= subtaskType[subtask.type] %>，总分值 <%= subtask.score %></td>
+                      </tr>
+                    <% } %>
+                    <% for (let testcase of subtask.cases) { %>
+                      <tr>
+                        <td><%= testcase.input %></td>
+                        <td><%= testcase.output %></td>
+                      </tr>
+                    <% } %>
                   <% } %>
-                  <% for (let testcase of subtask.cases) { %>
-                    <tr>
-                      <td><%= testcase.input %></td>
-                      <td><%= testcase.output %></td>
-                    </tr>
-                  <% } %>
-                <% } %>
-                </tbody>
+                  </tbody>
                   </table>
             <% } catch (e) { %>
                 <h3>数据包错误：<%= e %></h3>
diff --git a/views/submission_content.ejs b/views/submission_content.ejs
index e7fbfe6..32ad795 100644
--- a/views/submission_content.ejs
+++ b/views/submission_content.ejs
@@ -97,7 +97,7 @@ for (let s of judge.result.subtasks) {
         </div>
       </div>
       <div class="content auto_update_activation<% if (subtask_cases.isActiveSubtask) { %> active<% } %>">
-        <div class="accordion">
+        <div class="accordion" style="margin-top: 0; ">
     <% } %>
     <% for (let i = 0; i < subtask_cases.case_num; i++) { %>
     <% let testcase = subtask_cases[i]; %>
diff --git a/views/util.ejs b/views/util.ejs
index 745a369..932b7b9 100644
--- a/views/util.ejs
+++ b/views/util.ejs
@@ -15,7 +15,6 @@ this.isPending = (status) => {
 
 this.icon = {
   'Accepted': 'checkmark',
-  'Passed': 'checkmark',
   'Wrong Answer': 'remove',
   'Runtime Error': 'bomb',
   'Time Limit Exceeded': 'clock',