From ec051ef929f16e694b13ffbce7e8c2057e7fee44 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 7 Jul 2015 15:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E4=BD=9C=E4=B8=9A=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E3=80=81=E5=AD=A6=E7=94=9F=E7=95=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb        | 4 +++-
 app/views/homework_common/index.html.erb | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a31bd6189..c4762e8cc 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2292,6 +2292,8 @@ module ApplicationHelper
       else
         link = "<span class='fr mr10 pr_join_span ' title='学生提交作业数大于2时才可以启动匿评'>启动匿评</span>".html_safe
       end
+    elsif homework.homework_type == 2 && homework.homework_detail_programing #编程作业作业
+      link = "<span class='fr mr10 pr_join_span ' title='编程作业'>编程作业</span>".html_safe
     else
       link = "<span class='fr mr10 pr_join_span ' title='未开启匿评作业不可以启动匿评'>启动匿评</span>".html_safe
     end
@@ -2324,7 +2326,7 @@ module ApplicationHelper
     elsif homework.homework_type == 0
       "<span class='fr mr10 pr_join_span '>未启用匿评</span>".html_safe
     elsif homework.homework_type == 2
-      "<span class='fr mr10 pr_join_span '>编程作业</span>".html_safe
+      "<span class='fr mr10 pr_join_span '>&nbsp;编程作业&nbsp;&nbsp;</span>".html_safe
     end
   end
 
diff --git a/app/views/homework_common/index.html.erb b/app/views/homework_common/index.html.erb
index 870edbfe4..d9a93fe8f 100644
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@@ -68,8 +68,6 @@
                 ,缺评一个作品扣
                 <%= homework.homework_detail_manual.absence_penalty%>
                 分
-            <% else%>
-                。
             <% end%>
           </div>
         </div>