From b4036ba901c0e433c3d9e7668f693afd8a56bb6b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Sat, 8 Oct 2016 15:28:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_evaluation_un_group_member_work.html.erb          |  8 ++++----
 .../student_work/_evaluation_un_group_work.html.erb    | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb
index d373600a5..ac13c57ed 100644
--- a/app/views/student_work/_evaluation_un_group_member_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb
@@ -8,18 +8,18 @@
             <span class="fl hidden ml5" style="max-width:90px;"><%= st.user.show_name %></span>
             <span class="fl">(组长)</span>
           </span>
-          <span class="fl mr15 hidden student_work_<%= st.id%>" style="width:90px;">
+          <span class="fl hidden student_work_<%= st.id%>" style="width:90px; margin-right:3px;">
             <span class="fontGrey2">学号</span>：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%>
           </span>
       <% else %>
           <span class="fl student_work_<%= st.id%>" style="width:135px;">
             <span class="fl hidden ml5" style="max-width:90px;"><%= st.user.show_name %></span>
           </span>
-          <span class="fl student_work_<%= st.id%> mr15 hidden" style="width:90px;">
+          <span class="fl student_work_<%= st.id%> hidden" style="width:90px; margin-right:3px;">
             <span class="fontGrey2">学号</span>：<%= st.user.user_extensions.nil? ? "--" : st.user.user_extensions.student_id%>
           </span>
       <% end %>
-      <div class="flex-container fl" style="width:340px;">
+      <div class="flex-container fl" style="width:351px;">
         <div class="flex-cell"><span class="<%= score_color st.teacher_score%> ml35"><%= st.teacher_score.nil? ? "--" : format("%.1f",st.teacher_score)%></span></div>
         <div class="flex-cell"><span class="<%= score_color st.teaching_asistant_score%> ml35"><%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%></span></div>
         <% if @homework.anonymous_comment == 0 %>
@@ -68,7 +68,7 @@
         </div>
       </div>
       <% if is_expand %>
-          <div class="fr" style="width:25px; color: #3b94d6; white-space:nowrap; text-align:right;" onclick = "show_student_work(<%= student_work_path(st)%>)">评分</div>
+          <div class="fr" style="width:25px; color: #3b94d6; white-space:nowrap; text-align:right; margin-right:5px;" onclick = "show_student_work(<%= student_work_path(st)%>)">评分</div>
       <% end %>
     </div>
     <div class="hworkTip" style="display: none; left:700px; top:20px; white-space:nowrap; right:auto;" id="work_click_<%= st.id%>"><em></em><span></span><font class="fontGrey2"><%= !st.student_work_projects.empty? ? '大作品评分即组长的评分' : '点击进行评分' %></font></div>
diff --git a/app/views/student_work/_evaluation_un_group_work.html.erb b/app/views/student_work/_evaluation_un_group_work.html.erb
index bd3d71a28..31b8fd190 100644
--- a/app/views/student_work/_evaluation_un_group_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@@ -9,18 +9,18 @@
         </span>
         </span>
   <% if @homework.homework_detail_group.base_on_project == 1 %>
-      <span class="ml15 fl">关联项目：</span>
       <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
-          <%= link_to student_work.project.name, project_path(student_work.project.id), :class => 'link-blue fl hidden', :style => "width:200px;", :title => "项目名称"%>
+          <%= link_to student_work.project.name, project_path(student_work.project.id), :class => 'link-blue fr hidden', :style => "max-width:200px;", :title => "项目名称"%>
       <% else %>
-          <span class="fontBlue fl hidden" style="width:200px;" title="该项目是私有的"><%= student_work.project.name %></span>
+          <span class="fontBlue fr hidden" style="max-width:200px;" title="该项目是私有的"><%= student_work.project.name %></span>
       <% end %>
+      <span class="fr">关联项目：</span>
   <% end %>
   <div class="cl"></div>
 </div>
 <div class="fl sy_p_grey">
-  <span class="fl" style="width:296px;">提交时间：<%=format_date(student_work.commit_time) %></span>
-  <div class="flex-container fl" style="width:340px;">
+  <span class="fl" style="width:285px;">提交时间：<%=format_date(student_work.commit_time) %></span>
+  <div class="flex-container fl" style="width:351px;">
     <div class="flex-cell">教师：<span class="<%= score_color student_work.teacher_score%>"><%= student_work.teacher_score.nil? ? "--" : format("%.1f",student_work.teacher_score)%></span></div>
     <div class="flex-cell">助教：<span class="<%= score_color student_work.teaching_asistant_score%>"><%= student_work.teaching_asistant_score.nil? ? "--" : format("%.1f",student_work.teaching_asistant_score)%></span></div>
     <% if @homework.anonymous_comment == 0 %>