From 019e4e0630debffa944e1a7365819ec93b90b599 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 5 Nov 2015 15:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81=E5=92=8C?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/index.html.erb          |  3 +++
 app/views/users/_user_homework_detail.html.erb | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/views/student_work/index.html.erb b/app/views/student_work/index.html.erb
index 8f1f0033e..b0e70c9b0 100644
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@@ -162,6 +162,9 @@
         </div>
         <div class="mt5">
           <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
+          <% if @homework.homework_detail_manual.comment_status == 0 %>
+            <div class="fontGrey2 db fl ml10">发布时间：<%= @homework.publish_time %>&nbsp;00:00</div>
+          <% end %>
           <% if @homework.homework_detail_manual%>
               <% if @homework.homework_detail_manual.comment_status == 1%>
                   <% end_time = @homework.end_time.to_time.to_i + 24*60*60 - 1 %>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 9ca50c019..e920cf409 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -56,14 +56,14 @@
               <%= homework_common.language_name%>
             </div>
         <% end %>
-        <% if homework_common.homework_detail_manual.comment_status == 0 %>
-            <div class="homepagePostDeadline mr15">
-              <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>
-            </div>
-        <% end %>
         <div class="homepagePostDeadline">
           <%= l(:label_end_time)%>：<%= homework_common.end_time%>&nbsp;23:59
         </div>
+        <% if homework_common.homework_detail_manual.comment_status == 0 %>
+            <div class="homepagePostDeadline ml15">
+              <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>&nbsp;00:00
+            </div>
+        <% end %>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="homework_description_<%= homework_common.id%>">
         <div id="intro_content_<%= homework_common.id%>">