From e06f08aa3b159b38f90c6be03537a6766eb861af Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 4 Nov 2015 11:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_homework.html.erb     | 25 +++++++++++++------
 .../users/_user_homework_detail.html.erb      | 12 ++++-----
 public/stylesheets/courses.css                |  7 +++---
 public/stylesheets/new_user.css               |  5 ++--
 4 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 4dd6f1a0a..77f7d97dd 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -13,15 +13,26 @@
         <% 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_w530 fl"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle hidden m_w480 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.comment_status == 1%>
-          <span class="grey_btn_cir ml10">未开启匿评</span>
-      <% elsif activity.homework_detail_manual.comment_status == 2%>
-          <span class="green_btn_cir ml10">匿评中</span>
-      <% elsif activity.homework_detail_manual.comment_status == 3%>
-          <span class="grey_btn_cir ml10">匿评已结束</span>
+      <% 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>
+              <% 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>
+              <% end %>
+              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+          <% elsif activity.homework_detail_manual.comment_status == 3%>
+              <% if activity.anonymous_comment == 0%>
+                  <span class="grey_btn_cir ml5">匿评已结束</span>
+              <% end %>
+              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+          <% end%>
       <% end%>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit">
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index e8a3bef72..3d841b087 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -10,29 +10,29 @@
         TO
         <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
       </div>
-          <span class="homepagePostTitle hidden m_w530 fl">
+          <span class="homepagePostTitle hidden m_w480 fl">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
           </span>
 
       <% if homework_common.homework_detail_manual%>
           <% if homework_common.homework_detail_manual.comment_status == 0 %>
-              <span class="grey_btn_cir ml10">未发布</span>
+              <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>
               <% end %>
-              <span class="green_btn_cir ml10">作品提交中</span>
+              <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>
               <% end %>
-              <span class="green_btn_cir ml10">教师教辅评阅中</span>
+              <span class="green_btn_cir ml5">教师教辅评阅中</span>
           <% elsif homework_common.homework_detail_manual.comment_status == 3%>
               <% if homework_common.anonymous_comment == 0%>
                   <span class="grey_btn_cir ml5">匿评已结束</span>
               <% end %>
-              <span class="green_btn_cir ml10">教师教辅评阅中</span>
-    <% end%>
+              <span class="green_btn_cir ml5">教师教辅评阅中</span>
+          <% end%>
       <% end%>
 
       <div class="homepagePostSubmitContainer">
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 5612a774e..8f27d7365 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -178,8 +178,8 @@ a.f_grey:hover {color:#000000;}
 /*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}*/
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
-.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.blue_btn_cir{ background:#3498db; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .locked_btn_cir{background: url("../images/locked.png") 0 0 no-repeat; cursor: default;}
@@ -965,8 +965,9 @@ 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_w530{max-width: 530px;}
+.m_w480{max-width: 480px;}
 .m_w500{max-width: 500px;}
+.m_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
 .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; }
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index f753b191b..bca26d0c8 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -293,8 +293,8 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .more_btn{-moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF;  border-radius:3px; padding:0px 3px;}
 .upbtn{ margin:42px 0 0 10px; border:none; color:#999; width:150px;}
 .red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.grey_btn_cir{ background:#b2b2b2; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
+.green_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.grey_btn_cir{ background:#b2b2b2; padding:1px 3px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
 .orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
 .sticky_btn_cir{ background:#269ac9; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
@@ -1071,6 +1071,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_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}