From 1119840e25184e77948e49962fea43a2f03d1581 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 4 Jun 2015 16:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_student_work.html.erb | 19 ++++++++-------
 .../student_work/_student_work_title.html.erb | 24 +++++++++----------
 public/stylesheets/courses.css                | 13 ++++++----
 public/stylesheets/public.css                 |  2 ++
 4 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/app/views/student_work/_student_work.html.erb b/app/views/student_work/_student_work.html.erb
index cff481b7a..e8fb2ce3a 100644
--- a/app/views/student_work/_student_work.html.erb
+++ b/app/views/student_work/_student_work.html.erb
@@ -1,22 +1,23 @@
 <!-- 作品列表，显示某一个作品的信息 -->
 <ul class="hwork_ul <%= cycle("b_grey", "") %>" id="student_work_<%= student_work.id%>">
-  <li style="min-height: 1px;width: 65px;">
-    <% student_id = student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
-    <%= link_to student_id,"javascript:void(0)",:class => "c_grey hwork_center",:title => student_id%>
+  <li class="hwork_num">
+    <span>
+      <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
+    </span>
   </li>
-  <li>
-    <%= link_to student_work.user.show_name,user_path(student_work.user),:class => "c_blue02 hwork_name",:title => student_work.user.show_name%>
+  <li class=" hwork_name ">
+    <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name%>
   </li>
   <li class=" hwork_tit">
     <%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
   </li>
-  <li class=" hwork_code <%= student_work.teacher_score.nil? ? 'c_grey' : 'c_red'%>">
+  <li class=" hwork_code <%= student_work.teacher_score.nil? ? 'c_grey' : 'c_red'%> mr18">
     <%= student_work.teacher_score.nil? ? "--" : format("%.2f",student_work.teacher_score)%>
   </li>
-  <li class=" hwork_code <%= student_work.teaching_asistant_score.nil? ? 'c_grey' : 'c_red'%>">
+  <li class=" hwork_code <%= student_work.teaching_asistant_score.nil? ? 'c_grey' : 'c_red'%> mr18">
     <%= student_work.teaching_asistant_score.nil? ? "--" : format("%.2f",student_work.teaching_asistant_score)%>
   </li>
-  <li class=" hwork_code02 <%= student_work.student_score.nil? ? 'c_grey' : 'c_red'%> student_score_info">
+  <li class=" hwork_code02 <%= student_work.student_score.nil? ? 'c_grey' : 'c_red'%> mr18 student_score_info" >
     <%= student_work.student_score.nil? ? "--" : format("%.2f",student_work.student_score)%>
     <% unless student_work.student_score.nil?%>
         <span class="c_blue">
@@ -30,7 +31,7 @@
         </div>
     <% end%>
   </li>
-  <li class=" hwork_code02 <%= student_work.final_score.nil? ? 'c_grey' : 'c_red'%>">
+  <li class=" hwork_code <%= student_work.final_score.nil? ? 'c_grey' : 'c_red'%>">
     <%= student_work.final_score.nil? ? "--" : format("%.2f",student_work.final_score)%>
   </li>
   <div class="cl"></div>
diff --git a/app/views/student_work/_student_work_title.html.erb b/app/views/student_work/_student_work_title.html.erb
index 7cf5e5d01..8162ea971 100644
--- a/app/views/student_work/_student_work_title.html.erb
+++ b/app/views/student_work/_student_work_title.html.erb
@@ -1,32 +1,32 @@
-<li class="w70 ">
-  <span href="javascript:void(0);" class="c_dark f14 fb fl  ">学号</span>
+<li class="hwork_num ">
+  <a href="javascript:void(0);" class=" f14 f_b c_dark fl" >学号</a>
 </li>
-<li class="w70">
-  <span class="c_dark f14 fb fl ">学生姓名</span>
+<li class=" hwork_name f14 fb c_dark">
+  学生姓名
 </li>
 <li class="hwork_tit">
   <span class="c_dark f14 fb fl">作品名称</span>
 </li>
-<li class="w70 mr5" >
-  <%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+<li class="mr5 w70">
+  <%= link_to "教师评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teacher_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl hwork_code"%>
   <% if @show_all && @order == "teacher_score"%>
       <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
   <% end%>
 </li>
-<li class="w70 mr5">
-  <%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+<li class="mr5 w70">
+  <%= link_to "教辅评分",@show_all ? student_work_index_path(:homework => @homework.id,:order => "teaching_asistant_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl hwork_code"%>
   <% if @show_all && @order == "teaching_asistant_score"%>
       <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
   <% end%>
 </li>
-<li class="w60 mr5 ml10">
-  <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+<li class="mr5 ml15 w40">
+  <%= link_to "匿评",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
   <% if @show_all && @order == "student_score"%>
       <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
   <% end%>
 </li>
-<li class="w40 ml10" id="final_sort">
-  <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "final_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "c_dark f14 fb fl"%>
+<li class="ml30">
+  <%= link_to "成绩",@show_all ? student_work_index_path(:homework => @homework.id,:order => "final_score", :sort => @score, :name => @name) : "javascript:void(0)",:class => "f14 f_b c_dark fl"%>
   <% if @show_all && @order == "final_score"%>
       <a href="javascript:void(0);" class="<%= @score == 'desc' ? 'st_up' : 'st_down'%>" ></a>
   <% end%>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 7cafd04cc..982c6ff31 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -630,14 +630,17 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
 .w300{ width:300px;}
 .w80{ width:80px;}
 .t_c{ text-align:center;}
-.hwork_tit{ width:240px; float:left; }
-.hwork_tit a{ width:255px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+
+.hwork_tit{ width:210px; float:left; }
+.hwork_tit a{ width:205px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.hwork_code{ width:56px; text-align:center;  }
+.hwork_code02{ width:60px; text-align:center;  }
 .hwork_tit_e{ width:440px; float:left; }
 .hwork_tit_e a{ width:455px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.hwork_code{ width:60px; text-align:center; margin-right:15px;}
-.hwork_code02{ width:60px; text-align:center; margin-right:10px;}
+.hwork_num{ width:90px;  display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.mr18{ margin-right:18px;}
 a.hwork_center{ display:block; width:60px;  margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
-a.hwork_name{ display:block;width:65px;  margin-right:10px;overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_name{ display:block;width:80px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
 .show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
 .show_hwork ul li{ margin-bottom:5px;}
 .show_hwork_arrow{ position:relative; top:2px; left:25px;background:url(../images/course/arrow_up.jpg) 0 0 no-repeat; width:20px; height:11px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index d0f788495..306520f96 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -59,6 +59,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml35{margin-left: 35px;}
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
@@ -86,6 +87,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
 .w20{ width:20px;}
+.w40{width: 40px;}
 .w45{ width: 45px;}
 .w60{ width:60px;}
 .w70{ width:70px;}