From d274b675db2ff3418e4b12279e8f4e4cb64099d9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sun, 6 Sep 2015 10:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8A=A8=E6=80=81=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E2=80=9C=E7=BC=BA=E9=99=B7=E6=8F=8F=E8=BF=B0=E2=80=9D?=
 =?UTF-8?q?=E3=80=81=E2=80=9C=E9=80=9A=E7=9F=A5=E6=8F=8F=E8=BF=B0=E2=80=9D?=
 =?UTF-8?q?=E7=AD=89=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_homework.html.erb | 2 +-
 app/views/users/_course_message.html.erb  | 2 +-
 app/views/users/_course_news.html.erb     | 1 -
 app/views/users/_course_poll.html.erb     | 2 +-
 app/views/users/_project_issue.html.erb   | 2 +-
 app/views/users/_project_message.html.erb | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index f29512b0e..07a2dad39 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -22,7 +22,7 @@
         <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
-        作业描述：<%= activity.description.html_safe %>
+        <%= activity.description.html_safe %>
       </div>
       <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity_id %>">
         <ul>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 3cbcd33dd..eee272fe6 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -25,7 +25,7 @@
       </div>
 
 
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 3d2ee18b4..d2213c743 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -19,7 +19,6 @@
         发布时间：<%= format_time(activity.created_on) %>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
-        通知描述：
         <%= activity.description.html_safe %>
       </div>
     </div>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 436ae2f46..24adf108e 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -28,7 +28,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_time(activity.published_at) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>"><%=activity.polls_description.html_safe.to_s%></div>
       <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 011ac5c70..3a6eac49d 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -33,7 +33,7 @@
           <%=format_time(activity.created_on) %>
         </div>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">缺陷描述：
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
         <% if activity.description? %>
             <%= textAreailizable activity, :description, :attachments => activity.attachments %>
         <% end %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 18bc49f23..5fc10e48c 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -26,7 +26,7 @@
       <div class="homepagePostDate">
         时间：<%= format_time(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
         <% if activity.parent_id.nil? %>
             <%= activity.content.to_s.html_safe%>
         <% else %>