From 36fecfc6355a196f50a4e200ca99992b4fd7cee0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 19 Jun 2014 19:48:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=95=8C=E9=9D=A2=E9=A2=9C=E8=89=B2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=202.=E5=BE=97=E5=88=86=E6=98=BE=E7=A4=BA=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E2=80=9C=E5=88=86=E2=80=9D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_homework_list.html.erb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index 0a92df47d..30c6c6029 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -12,7 +12,7 @@
           User.current.admin? ||
           !(User.current.roles_for_project(@bid.courses.first).map(&:id) & ([7,9])).empty? ) ||
           (Rails.env.development?) %>
-      </td>
+            </td>
             <td align="right">
 			<div class="project-search">
                 <% if is_teacher %>
@@ -36,7 +36,7 @@
                 <tr>
                   <td title="<%= homework.user.name  %>">
                     <p style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><strong>
-                      <%= link_to (is_teacher ? homework.user.realname : homework.user ), user_path(homework.user)%>
+                      <%= link_to (is_teacher ? homework.user.realname : homework.user ), user_path(homework.user),{:style => "color:#727272"} %>
                     </strong></p>
                   </td>
                 </tr>
@@ -57,19 +57,19 @@
 			<td colspan="2">
 				<table width="580px" border="0" style="table-layout: fixed">
                     <tr>
-                      <td style="width: 300px;">
-                        <strong>作业名称:</strong>&nbsp;
+                      <td style="width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                        <strong>作品名称:</strong>&nbsp;
                         <% if homework.name == nil || homework.name == "" %>
                             <% homework_filename = homework.user.name + "提交的作业" %>
                         <% else %>
                             <% homework_filename = homework.name %>
                         <% end %>
-                        <strong>
+                        <strong title="<%=homework_filename%>">
                           <%= link_to homework_filename , homework_attach_path(homework)%>
                         </strong>
                       </td>
                       <td style="vertical-align: top;width: 200px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                        <strong>参与人员:&nbsp;</strong>
+                        <strong>合作成员:&nbsp;</strong>
                           <% homework_users = "" %>
                           <% homework.users.each do |user| %>
                               <% homework_users = homework_users + (is_teacher ? user.realname : user.name) %>
@@ -96,16 +96,16 @@
                         <% if homework.project != nil %>
                             <%= link_to homework.project.name,project_path(homework.project.id)%>
                         <% else %>
-                            该作业暂无项目
+                            暂无
                         <% end %>
                       </td>
                       <td>
                         <strong>项目得分:</strong>&nbsp;
-                        <span class="required">
+                        <span style="color: #EC6300;">
                             <% if homework.project != nil %>
-                                0分
+                                0
                             <% else %>
-                                0分
+                                0
                             <% end %>
                         </span>
                       </td>
@@ -123,7 +123,7 @@
                       </td>
                       <td>
                         <strong>互评得分:&nbsp;
-                          <span class="required"><%= student_score_for_homework(homework)  %>分</span>&nbsp;&nbsp;
+                          <span style="color: #EC6300;"><%= student_score_for_homework(homework)  %></span>&nbsp;&nbsp;
                             <% if is_evaluation && is_student && (!users_for_homework(homework).include? User.current)%>
                                 <%= link_to "学生互评>>",homework_attach_path(homework)  %>
                             <% end %>
@@ -138,8 +138,8 @@
                           <% end %>
                         </td>
                         <td>
-                          <strong>综评得分:&nbsp;
-                            <span class="required"><%= score_for_homework homework  %>分</span>&nbsp;&nbsp;
+                          <strong>终评得分:&nbsp;
+                            <span style="color: #EC6300;"><%= score_for_homework homework  %></span>&nbsp;&nbsp;
                             <% if is_teacher %>
                                 <%= link_to "教师评分>>",homework_attach_path(homework)  %>
                             <% end %>