From 7599bf75a3c20f191ba9bdefcd36de349d75b5ac Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 27 May 2016 15:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A=E4=B8=8D?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E6=97=B6=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=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

---
 app/views/student_work/_evaluation_un_title.html.erb | 2 +-
 app/views/student_work/_evaluation_un_work.html.erb  | 2 +-
 app/views/users/_user_homework_detail.html.erb       | 2 +-
 public/stylesheets/courses.css                       | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb
index b52f34580..1a3220df6 100644
--- a/app/views/student_work/_evaluation_un_title.html.erb
+++ b/app/views/student_work/_evaluation_un_title.html.erb
@@ -22,7 +22,7 @@
           <span class="c_dark f14 fb">关联项目</span>
         </th>
     <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-        <th class="hworkList290 pr10" style="text-align:left;">作品名称</th>
+        <th class="<%=@homework.anonymous_comment == 1 ? 'hworkList340' : 'hworkList290' %> pr10" style="text-align:left;">作品名称</th>
     <% end %>
     <th class="hworkList130">
       <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%>
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index a184d4140..688e31451 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -35,7 +35,7 @@
             </td>
         <% end %>
   <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
-      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> width290" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
+      <td class="hworkName float-none pr10 student_work_<%= student_work.id%> <%=@homework.anonymous_comment == 1 ? 'width340' : 'width290' %>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
         <% 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,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 650ced5dc..a01418d2f 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -201,7 +201,7 @@
     <% end %>
 
     <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %>
-        <% projects = homework_common.student_work_projects.where("is_leader = 1") %>
+        <% projects = homework_common.student_work_projects.where("is_leader = 1 and project_id != -1") %>
         <% unless projects.empty? %>
             <% sort_projects = project_sort_update projects %>
             <div class="mt10 relatePWrap" id="relatePWrap_<%=homework_common.id %>">
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 101a54efc..63abab281 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -62,6 +62,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 .hworkList220 {width:220px; text-align:center;}
 .hworkList260 {width:260px; text-align:left;}
 .hworkList290 {width:290px; text-align:left;}
+.hworkList340 {width:340px; text-align:left;}
 .hworkList420 {width:420px; text-align:left;}
 .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px;  width:714px; margin-bottom:10px; }
 .hworkName {width:80px; float:left; line-height:18px;}
@@ -94,6 +95,7 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re
 .width165{width: 165px;}
 .width180{width: 180px;}
 .width290{width: 290px;}
+.width340{width: 340px;}
 .width525{width: 525px;}
 .width285{width: 285px;}
 .width255{width: 255px;}