From 1133b35169b67a138f8b049467c0824e996f0e45 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 4 Nov 2015 15:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9Atag=E7=9A=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=20=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=B2=BE=E7=A1=AE=E5=88=B0=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_homework.html.erb     | 14 +++++++++----
 .../users/_user_homework_detail.html.erb      | 20 ++++++++++++-------
 public/stylesheets/courses.css                |  2 +-
 public/stylesheets/new_user.css               |  2 +-
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 77f7d97dd..be7945cc0 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -13,25 +13,31 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
-      <div class="homepagePostTitle hidden m_w480 fl"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle hidden m_w505 fl"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id,:host=> Setting.host_course), :class => "postGrey"%>
       </div>
       <% if activity.homework_detail_manual%>
           <% if activity.homework_detail_manual.comment_status == 1%>
               <% if activity.anonymous_comment == 0%>
                   <span class="grey_btn_cir ml5">未开启匿评</span>
+              <% else %>
+                  <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
               <span class="green_btn_cir ml5">作品提交中</span>
           <% elsif activity.homework_detail_manual.comment_status == 2%>
               <% if activity.anonymous_comment == 0%>
                   <span class="green_btn_cir ml5">匿评中</span>
+              <% else %>
+                  <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% elsif activity.homework_detail_manual.comment_status == 3%>
               <% if activity.anonymous_comment == 0%>
                   <span class="grey_btn_cir ml5">匿评已结束</span>
+              <% else %>
+                  <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
       <div class="homepagePostSubmitContainer">
@@ -52,7 +58,7 @@
             </div>
         <% end %>
 
-        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
+        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 3d841b087..f9743d7c3 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -10,7 +10,7 @@
         TO
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
       </div>
-          <span class="homepagePostTitle hidden m_w480 fl">
+          <span class="homepagePostTitle hidden m_w505 fl">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
           </span>
 
@@ -19,19 +19,25 @@
               <span class="grey_btn_cir ml5">未发布</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 1%>
               <% if homework_common.anonymous_comment == 0%>
-                    <span class="grey_btn_cir ml5">未开启匿评</span>
+                <span class="grey_btn_cir ml5">未开启匿评</span>
+              <% else %>
+                <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
               <span class="green_btn_cir ml5">作品提交中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 2%>
               <% if homework_common.anonymous_comment == 0%>
-                  <span class="green_btn_cir ml5">匿评中</span>
+                <span class="green_btn_cir ml5">匿评中</span>
+              <% else %>
+                <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 3%>
               <% if homework_common.anonymous_comment == 0%>
-                  <span class="grey_btn_cir ml5">匿评已结束</span>
+                <span class="grey_btn_cir ml5">匿评已结束</span>
+              <% else %>
+                <span class="grey_btn_cir ml5">匿评已禁用</span>
               <% end %>
-              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5" title="目前教师和教辅正在评阅">教师评阅中</span>
           <% end%>
       <% end%>
 
@@ -56,7 +62,7 @@
             </div>
         <% end %>
         <div class="homepagePostDeadline">
-          <%= l(:label_end_time)%>：<%= homework_common.end_time%>
+          <%= l(:label_end_time)%>：<%= homework_common.end_time%>&nbsp;23:59
         </div>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="homework_description_<%= homework_common.id%>">
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 317a21d02..22560f0aa 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -966,7 +966,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
-.m_w480{max-width: 480px;}
+.m_w505{max-width: 505px;}
 .m_w500{max-width: 500px;}
 .m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 6a296b941..061ad0561 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1073,7 +1073,7 @@ a:hover.icon_remove{background:url(../images/course/icons.png) -20px -338px no-r
 .ProResultCon{ padding:10px; color:#888888; line-height:24px; border-bottom:1px solid #dddddd; }
 .W50{ width:50px;}
 .W200{ width:200px;}
-.m_w480{max-width: 480px;}
+.m_w505{max-width: 505px;}
 .m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}