From cf2a00d7a8642c10f2269678cd0c1575cd1c28e3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 18 Sep 2015 14:25:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=9A=E7=BC=96=E7=A8=8B=E8=AF=AD=E8=A8=80=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=8C=BF=E8=AF=84=E9=98=B6=E6=AE=B5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_list.html.erb | 27 ++++++++++++++++----
 public/stylesheets/new_user.css              |  2 ++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 6a9ffb727..c6e827291 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -11,18 +11,35 @@
             TO
             <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
           </div>
-          <div class="homepagePostTitle hidden">
+          <span class="homepagePostTitle hidden m_w530 fl">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
-          </div>
+          </span>
+          <% if homework_common.homework_detail_manual.comment_status == 1%>
+              <span class="grey_btn_cir ml10">未开启匿评</span>
+          <% elsif homework_common.homework_detail_manual.comment_status == 2%>
+              <span class="green_btn_cir ml10">匿评中</span>
+          <% elsif homework_common.homework_detail_manual.comment_status == 3%>
+              <span class="grey_btn_cir ml10">匿评已结束</span>
+          <% end%>
 
           <div class="homepagePostSubmitContainer">
             <div class="homepagePostSubmit">
               <%= user_for_homework_common homework_common,is_teacher %>
             </div>
             <% if homework_common.homework_type == 2 && is_teacher%>
-            <div class="homepagePostSubmit">
-              <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
-            </div>
+                <div class="homepagePostSubmit">
+                  <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
+                </div>
+            <% end %>
+            <% if homework_common.homework_type == 2%>
+                <div class="homepagePostDeadline mr15">
+                    语言：
+                    <% if homework_common.homework_detail_programing.language.to_i == 1%>
+                        C
+                    <% elsif homework_common.homework_detail_programing.language.to_i == 2%>
+                        C++
+                    <% end%>
+                </div>
             <% end %>
             <div class="homepagePostDeadline">
               <%= l(:label_end_time)%>：<%= homework_common.end_time%>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4e1ef745c..c15fbbccd 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -223,6 +223,7 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .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;}
 .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;}
 .bgreen_btn_cir{ background:#1abc9c; padding:1px 10px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal; font-size:12px;}
@@ -916,6 +917,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_w530{max-width: 530px;}
 .ProResultTable{ color:#888888;}
 .T_C{ text-align:center;}
 .SearchIcon{background:url(../images/homepage_icon2.png) 676px -393px no-repeat; }