From 077368f5971f82611eb9d7bd89d0242a93a1015b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 30 Dec 2015 16:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BF=E8=AF=84=E5=A2=9E=E5=8A=A0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AF=84=E5=88=86=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_title.html.erb   | 48 +++++++++----------
 .../student_work/_evaluation_work.html.erb    | 12 ++---
 public/stylesheets/public.css                 |  4 ++
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 1e006a6a6..2ef5ee9af 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -1,25 +1,25 @@
-<ul class="hworkUl">
-  <li class="hworkList340 hworkH30 width505">
-    <span class="HomeworkNameTitle f14 fb fl">作品名称</span>
-    <% if @homework.homework_type != 3 %>
-        <span class="HomeworkStuTitle f14 fb fl">姓名</span>
-        <span class="HomeworkStuTitle f14 fb fl">学号</span>
-    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-        <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
-    <% end %>
-  </li>
-
-  <li class="hworkList130 hworkH30 fb ml10">
-    时间
-  </li>
-
-  <% if @homework.homework_type == 2%>
-      <li class="hworkList50 hworkH30">
-        系统
-      </li>
-  <% end%>
-
-  <li class="hworkList50 hworkH30 fb mr10 ml10">
-    我的评分
-  </li>
+<ul class="hworkUl">
+  <li class="hworkList340 hworkH30 w455">
+    <span class="HomeworkNameTitle f14 fb fl w235">作品名称</span>
+    <% if @homework.homework_type != 3 %>
+        <span class="HomeworkStuTitle f14 fb fl">姓名</span>
+        <span class="HomeworkStuTitle f14 fb fl">学号</span>
+    <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
+        <span class="HomeworkStuTitle f14 fb fl">关联项目</span>
+    <% end %>
+  </li>
+
+  <li class="hworkList130 hworkH30 fb ml10">
+    时间
+  </li>
+
+  <% if @homework.homework_type == 2%>
+      <li class="hworkList50 hworkH30 fb">
+        系统
+      </li>
+  <% end%>
+
+  <li class="hworkList50 hworkH30 fb mr10 ml10" style="float: right;">
+    我的评分
+  </li>
 </ul>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index e65d4f267..cc346361e 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -6,16 +6,16 @@
     <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %>
     <% is_my_work = pro && pro.student_work_id == student_work.id%>
   <% end %>
-  <li class="hworkList340 width525">
+  <li class="hworkList340 w465">
     <ul>
       <% if is_my_work%>
           <li class="hworkPortrait mt15 mr10">
             <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %>
           </li>
-          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 w230 student_work_<%= student_work.id%>">
             <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
             <div>
-              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+              <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
@@ -40,9 +40,9 @@
           <li class="hworkPortrait mt15 mr10">
             <%= image_tag(url_to_avatar(""),width:"40", height: "40") %>
           </li>
-          <li class="hworkName mt15 mr15 width255 student_work_<%= student_work.id%>">
+          <li class="hworkName mt15 mr15 w230 student_work_<%= student_work.id%>">
             <div>
-              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word width285"%>
+              <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
             </div>
           </li>
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
@@ -83,7 +83,7 @@
   <% end%>
 
   <% my_score = student_work_score(student_work,User.current) %>
-  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10">
+  <li class="hworkList50 <%= my_score.nil? ? 'c_grey' : score_color(my_score.score)%> mr10 ml10" style="float:right; ">
     <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
   </li>
   <li class="hworkTip" style="display: none" id="work_click_<%= student_work.id%>"><em></em><span></span><font class="fontGrey2">点击查看详情</font></li>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 51f0be25d..cf741476e 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -135,12 +135,16 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w100{width: 100px;}
 .w210{ width:210px;}
 .w150{ width:150px;}
+.w230{width:230px !important;}
+.w235{ width:235px !important;}
 .w280{ width:280px;}
 .w265{ width: 265px;}
 .w270{ width: 270px;}
 .w350 {width:350px;}
 .w362 {width:362px;}
 .w430{ width:470px;}
+.w455{width:455px !important;}
+.w465{width:465px !important;}
 .w520{ width:520px;}
 .w543{ width:543px;}
 .w557{ width:557px;}