From 99e63b1477063665fa2dc888d164ee2cd7b4ff62 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 6 Sep 2016 17:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=8E=A8=E8=8D=90=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97block=E9=A2=9C=E8=89=B2=E5=AD=97=E4=BD=93=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=EF=BC=9B=E6=B5=8B=E9=AA=8C=E5=AD=A6=E5=8F=B7=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E7=9C=81=E7=95=A5=E5=8F=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_student_table.html.erb | 140 ++++++++++-----------
 public/stylesheets/syllabus.css            |   4 +-
 2 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb
index bdfd2c96f..c917cb03e 100644
--- a/app/views/exercise/_student_table.html.erb
+++ b/app/views/exercise/_student_table.html.erb
@@ -1,71 +1,71 @@
-<table class="hwork-table-wrap" style="border-bottom:1px solid #eaeaea;">
-  <tr class="b_grey hworkH30">
-    <th class="hworkList30 pl5 pr5"><span class="c_dark f14 fb">序号</span></th>
-    <th class="hworkList50">&nbsp;&nbsp;</th>
-    <th class="hworkList60"><span class="c_dark f14 fb">姓名</span></th>
-    <th class="hworkList80"><span class="c_dark f14 fb">学号</span></th>
-    <th class="hworkList80"><span class="c_dark f14 fb">班级</span></th>
-    <th width="230">&nbsp;&nbsp;</th>
-    <th class="hworkList130">
-      <%= link_to "时间",'',:class => "c_dark f14 fb" ,:remote => true%>
-    </th>
-    <th class="hworkList50">
-      <%= link_to "成绩",'',:class => "c_dark f14 fb",:remote => true%>
-    </th>
-  </tr>
-
-  <% @exercise_users_list.each_with_index do |exercise, index|%>
-      <tr class="hworkListRow" id="student_work_<%= exercise.id%>">
-        <td class="pl5 pr5" style="text-align:center;"><%=index + 1 %></td>
-        <td class="hworkPortrait pr10 float-none">
-          <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;", :class => "mt15"),user_activities_path(exercise.user)) %>
-        </td>
-        <td class="hworkStName student_work_<%= exercise.id%>" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
-          <%=exercise.user.show_name %>
-        </td>
-        <td class="hworkStID student_work_<%= exercise.id%> pl15 pr10 float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
-          <span class="hidden fl" style="width:80px;"><%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%></span>
-        </td>
-        <td class="hworkStID student_work_<%= exercise.id%> float-none" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
-          --
-        </td>
-        <td width="230">&nbsp;</td>
-        <td class="hworkList130 c_grey">
-          <% if exercise.created_at%>
-              <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
-              <% if @exercise.end_time <= exercise.created_at %>
-                  <span class="c_red">[未答]</span>
-              <% end %>
-          <% end %>
-        </td>
-        <td class="hworkList50 <%= score_color exercise.score%> student_final_scor_info">
-          <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%>
-        </td>
-        <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= exercise.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
-      </tr>
-
-      <script type="text/javascript">
-          $(".student_work_<%= exercise.id%>").mouseenter(function(){
-              $("#work_click_<%= exercise.id%>").show();
-          }).mouseleave(function(){
-              $("#work_click_<%= exercise.id%>").hide();
-          }).mouse;
-          $(function(){
-              <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
-              $("#student_name_<%= exercise.id%>,#student_id_<%= exercise.id%>,#student_class_<%= exercise.id%>").on('click',function() {
-                  window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user_id) %>';
-              });
-              <% else %>
-              //$("#show_student_result_div_<%#= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
-              $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
-              $("#student_id_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
-              $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
-              <% end %>
-          });
-          /*function show_result(id) {
-           window.location.href = '<%#=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
-           }*/
-      </script>
-
-<% end%>
+<table class="hwork-table-wrap" style="border-bottom:1px solid #eaeaea;">
+  <tr class="b_grey hworkH30">
+    <th class="hworkList30 pl5 pr5"><span class="c_dark f14 fb">序号</span></th>
+    <th class="hworkList50">&nbsp;&nbsp;</th>
+    <th class="hworkList60"><span class="c_dark f14 fb">姓名</span></th>
+    <th class="hworkList80"><span class="c_dark f14 fb">学号</span></th>
+    <th class="hworkList80"><span class="c_dark f14 fb">班级</span></th>
+    <th width="230">&nbsp;&nbsp;</th>
+    <th class="hworkList130">
+      <%= link_to "时间",'',:class => "c_dark f14 fb" ,:remote => true%>
+    </th>
+    <th class="hworkList50">
+      <%= link_to "成绩",'',:class => "c_dark f14 fb",:remote => true%>
+    </th>
+  </tr>
+
+  <% @exercise_users_list.each_with_index do |exercise, index|%>
+      <tr class="hworkListRow" id="student_work_<%= exercise.id%>">
+        <td class="pl5 pr5" style="text-align:center;"><%=index + 1 %></td>
+        <td class="hworkPortrait pr10 float-none">
+          <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;", :class => "mt15"),user_activities_path(exercise.user)) %>
+        </td>
+        <td class="hworkStName student_work_<%= exercise.id%>" title="姓名" id="student_name_<%= exercise.id%>" style="cursor:pointer;">
+          <%=exercise.user.show_name %>
+        </td>
+        <td class="hworkStID student_work_<%= exercise.id%> pl15 pr10 float-none" title="学号" id="student_id_<%= exercise.id%>" style="cursor:pointer;">
+          <span class="hidden fl" style="width:55px;"><%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%></span>
+        </td>
+        <td class="hworkStID student_work_<%= exercise.id%> float-none" title="班级"  id="student_class_<%= exercise.id%>" style="cursor:pointer;">
+          --
+        </td>
+        <td width="230">&nbsp;</td>
+        <td class="hworkList130 c_grey">
+          <% if exercise.created_at%>
+              <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>&nbsp;
+              <% if @exercise.end_time <= exercise.created_at %>
+                  <span class="c_red">[未答]</span>
+              <% end %>
+          <% end %>
+        </td>
+        <td class="hworkList50 <%= score_color exercise.score%> student_final_scor_info">
+          <%= exercise.score.nil? ? "--" : format("%.1f",exercise.score)%>
+        </td>
+        <td><div style="position:relative;"><div class="hworkTip" style="display: none" id="work_click_<%= exercise.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></div></div></td>
+      </tr>
+
+      <script type="text/javascript">
+          $(".student_work_<%= exercise.id%>").mouseenter(function(){
+              $("#work_click_<%= exercise.id%>").show();
+          }).mouseleave(function(){
+              $("#work_click_<%= exercise.id%>").hide();
+          }).mouse;
+          $(function(){
+              <% if Time.parse(h(@exercise.end_time)).strftime("%Y-%m-%d-%H-%M-%S") <= Time.now.strftime("%Y-%m-%d-%H-%M-%S") %>
+              $("#student_name_<%= exercise.id%>,#student_id_<%= exercise.id%>,#student_class_<%= exercise.id%>").on('click',function() {
+                  window.location.href = '<%=show_student_result_exercise_path(@exercise,:user_id => exercise.user_id) %>';
+              });
+              <% else %>
+              //$("#show_student_result_div_<%#= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+              $("#student_name_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+              $("#student_id_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+              $("#student_class_<%= exercise.id%>").attr("title","截止日期未到，暂不能查看学生答题结果");
+              <% end %>
+          });
+          /*function show_result(id) {
+           window.location.href = '<%#=show_student_result_exercise_path(@exercise,:user_id => exercise.user.id) %>';
+           }*/
+      </script>
+
+<% end%>
 </table>
\ No newline at end of file
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index f6a8e8e6e..c92db8b76 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -566,9 +566,9 @@ a:hover.sy_btn_orange{
 a.sy_class_ltitle{display: block; font-size: 14px; width: 185px; color:#888; }
 a:hover.sy_class_ltitle{ color:#333;}
 .sy_cir_grey{
-    font-size:12px;
+    font-size:11px;
     padding: 0 10px;
-    background: #dbdbdb;
+    background: #eee;
     -webkit-border-radius: 15px;
     -moz-border-radius: 15px;
     border-radius: 15px;