From d0c2eabddd127952088d28d195061a22a79d6cda Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 19 Jan 2016 16:42:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E9=99=86=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=B9=9F=E8=83=BD=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E7=9A=84=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 2 +-
 app/helpers/application_helper.rb         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index fd43977ee..514f68d49 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -600,7 +600,7 @@ private
 
   def has_login
     unless @attachment && @attachment.container_type == "PhoneAppVersion"
-      render_403 unless User.current.logged?
+      render_403 if  !User.current.logged? && @attachment.container_type != 'OrgSubfield' && @attachment.container_type != 'OrgDocumentComment'
     end
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 07f7a0ed8..9f08a63ed 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1996,6 +1996,8 @@ module ApplicationHelper
         candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
       elsif attachment.container.is_a?(OrgSubfield)
         candown = true
+      elsif attachment.container.is_a?(OrgDocumentComment)
+        candown = true
       elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
           attachment.container.board.course
         course = attachment.container.board.course

From 6e56a0706a9c9444a95607a4907c07aa93899399 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 19 Jan 2016 16:53:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=8D=95=E8=AF=8D=E6=8A=98=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/blogs/_article.html.erb                | 16 +++++++---------
 app/views/blogs/_homepage.html.erb               |  5 ++---
 app/views/org_document_comments/show.html.erb    |  7 ++++++-
 .../organizations/_org_course_homework.html.erb  |  7 ++-----
 .../organizations/_org_course_message.html.erb   | 16 +++++++---------
 .../organizations/_org_course_news.html.erb      |  6 +-----
 .../organizations/_org_course_poll.html.erb      |  7 ++-----
 .../organizations/_org_project_issue.html.erb    |  8 +-------
 .../organizations/_org_subfield_message.html.erb | 15 ++++++---------
 .../organizations/_project_message.html.erb      | 15 ++++++---------
 app/views/organizations/_show_home_page.html.erb |  5 ++++-
 .../organizations/_show_org_document.html.erb    |  5 ++++-
 app/views/projects/_project_news.html.erb        |  6 +-----
 app/views/users/_course_homework.html.erb        |  7 ++-----
 app/views/users/_course_message.html.erb         | 15 ++++++---------
 app/views/users/_course_news.html.erb            |  6 +-----
 app/views/users/_course_poll.html.erb            |  6 +-----
 app/views/users/_intro_content.html.erb          | 12 ++++++++++++
 app/views/users/_project_issue.html.erb          |  8 +-------
 app/views/users/_project_message.html.erb        | 15 ++++++---------
 app/views/users/_user_blog.html.erb              |  6 +-----
 app/views/users/_user_homework_detail.html.erb   |  6 +-----
 app/views/users/user_system_messages.html.erb    |  2 +-
 public/stylesheets/courses.css                   |  2 +-
 public/stylesheets/new_user.css                  |  4 ++--
 public/stylesheets/project.css                   |  2 +-
 26 files changed, 85 insertions(+), 124 deletions(-)
 create mode 100644 app/views/users/_intro_content.html.erb

diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 22df4499a..4e0270da2 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -81,15 +81,13 @@
         更新时间：<%= format_time(UserActivity.where("act_type='#{activity.class}' and act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content= activity.content%>
+      <% else %>
+          <% content= activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+
       <div class="cl"></div>
       <!--<div class=" fl" style="width: 600px">
         <%# if activity.attachments.any?%>
diff --git a/app/views/blogs/_homepage.html.erb b/app/views/blogs/_homepage.html.erb
index 99835c87d..80ae8c9f4 100644
--- a/app/views/blogs/_homepage.html.erb
+++ b/app/views/blogs/_homepage.html.erb
@@ -40,9 +40,8 @@
         <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id,
                    :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey", :style => 'text-align:center;' %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" >
-        <%= activity.content.to_s.html_safe %>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.content} %>
+      
       <div class="cl"></div>
     </div>
     <div class="cl"></div>
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index e0d4f628f..d8df6a439 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -25,7 +25,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
       <% unless @document.content.blank? %>
-          <div class="homepagePostIntro" style="width:640px;">
+          <div class="homepagePostIntro" style="width:640px;" id="intro_content_<%= @document.id%>">
             <%= @document.content.html_safe %>
           </div>
       <% end %>
@@ -132,6 +132,11 @@
 </div>
 
 <script type="text/javascript">
+    $(function(){
+        var postContent = $("#intro_content_<%= @document.id%>").html();
+        postContent = postContent.replace(/&nbsp;/g," ");
+        $("#intro_content_<%= @document.id%>").html(postContent);
+    });
     function expand_reply(container, btnid) {
         var target = $(container);
         var btn = $(btnid);
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 631385e22..eabebcf2d 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -93,11 +93,8 @@
             <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
         <% end %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 55be0bf91..b755d7806 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -35,15 +35,13 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index ddad08279..902a142a0 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -27,11 +27,7 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb
index 925839f92..49ec66496 100644
--- a/app/views/organizations/_org_course_poll.html.erb
+++ b/app/views/organizations/_org_course_poll.html.erb
@@ -34,11 +34,8 @@
             更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
           </div>
           <div class="cl"></div>
-          <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-            <div id="intro_content_<%= user_activity_id%>">
-              <%= activity.polls_description.html_safe %>
-            </div>
-          </div>
+          <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.polls_description} %>
+
           <div class="cl"></div>
           <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
           <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 9c1863992..4488e4f39 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -38,13 +38,7 @@
         </div>
         <div class="cl"></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.description? %>
-              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
-          <% end %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 901c2ecf4..30ce91f27 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -31,15 +31,12 @@
         更新时间：<%= format_time(OrgActivity.where("org_act_type='#{activity.class}' and org_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index c7d99c5fb..d120d9ffe 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -31,15 +31,12 @@
         更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/organizations/_show_home_page.html.erb b/app/views/organizations/_show_home_page.html.erb
index 7178cfe1d..32d3ad10d 100644
--- a/app/views/organizations/_show_home_page.html.erb
+++ b/app/views/organizations/_show_home_page.html.erb
@@ -6,7 +6,7 @@
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
     <% end %>
       <% unless document.content.blank? %>
-          <div class="homepagePostIntro" >
+          <div class="homepagePostIntro" id="intro_content_<%= document.id%>">
             <%= document.content.html_safe %>
           </div>
       <% end %>
@@ -52,6 +52,9 @@
 </div>
 
 <script type="text/javascript">
+    var postContent = $("#intro_content_<%= document.id%>").html();
+    postContent = postContent.replace(/&nbsp;/g," ");
+    $("#intro_content_<%= document.id%>").html(postContent);
     function expand_reply(container, btnid) {
         var target = $(container);
         var btn = $(btnid);
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 14eb8ef74..3f0ef8db1 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -20,7 +20,7 @@
       </div>
       <div class="cl"></div>
       <% unless document.content.blank? %>
-          <div class="homepagePostIntro" style="width:640px;">
+          <div class="homepagePostIntro" style="width:640px;" id="intro_content_<%= document.id%>">
             <%= document.content.html_safe %>
           </div>
       <% end %>
@@ -117,6 +117,9 @@
 
 <script type="text/javascript">
     function expand_reply(container, btnid) {
+        var postContent = $("#intro_content_<%= document.id%>").html();
+        postContent = postContent.replace(/&nbsp;/g," ");
+        $("#intro_content_<%= document.id%>").html(postContent);
         var target = $(container);
         var btn = $(btnid);
         if (btn.data('init') == '0') {
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 2e7b1316a..50950f9a5 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -27,11 +27,7 @@
         更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id %>">
-        <div id="intro_content_<%= user_activity_id %>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 81627f9d6..ce708c4b7 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -93,11 +93,8 @@
             <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
         <% end %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index d8268d698..2312ee944 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -35,15 +35,12 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index ddad08279..902a142a0 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -27,11 +27,7 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index c3eda8303..3e29b255b 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -34,11 +34,7 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.polls_description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.polls_description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/_intro_content.html.erb b/app/views/users/_intro_content.html.erb
new file mode 100644
index 000000000..d5806c078
--- /dev/null
+++ b/app/views/users/_intro_content.html.erb
@@ -0,0 +1,12 @@
+<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+  <div id="intro_content_<%= user_activity_id%>">
+    <%= content.to_s.html_safe%>
+  </div>
+</div>
+<script type="text/javascript">
+  $(function(){
+      var postContent = $("#intro_content_<%= user_activity_id%>").html();
+      postContent = postContent.replace(/&nbsp;/g," ");
+      $("#intro_content_<%= user_activity_id%>").html(postContent);
+  });
+</script>
\ No newline at end of file
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 954c24dac..386022a82 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -50,13 +50,7 @@
         </div>
         <div class="cl"></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.description? %>
-              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
-          <% end %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 75940b32c..66c672095 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -36,15 +36,12 @@
         更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 3ce0926a8..b1823dcaa 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -33,11 +33,7 @@
         更新时间：<%= format_time(UserActivity.where("act_type='#{activity.class}' and act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.content.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index af48e2a21..15e4061f3 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -95,11 +95,7 @@
             </div>
         <% end %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="homework_description_<%= homework_common.id%>">
-        <div id="intro_content_<%= homework_common.id%>">
-          <%= homework_common.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>homework_common.id, :content=>homework_common.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index 66d7037e9..86ae56cc8 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -12,7 +12,7 @@
             <span style="color:#0781b4; max-width:470px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;"><%= system_message.subject.nil? ? "系统消息" : system_message.subject %></span>
           </div>
           <div class="cl"></div>
-          <div class="homepagePostIntro break_word upload_img">
+          <div class="homepagePostIntro break_word upload_img" id="system">
             <p>
               <%= system_message.content.nil? ? system_message.description.html_safe : system_message.content.html_safe %>
             </p>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 16ef3c5df..c483c953d 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1099,7 +1099,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index ac9b50d0f..13ea35974 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -581,7 +581,7 @@ a.homepageImageNumber:hover {color:#269ac9;}
 .homepageLeftMenuCourses {font-size:13px; border-bottom:1px solid #dddddd;}
 .homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;}
 .homepageLeftMenuCoursesLine:hover {background-color:#269ac9;}
-a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;}
+a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;}
 a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
@@ -836,7 +836,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;display: inline}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 4cd41b31b..46364eee0 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1109,7 +1109,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}

From 7acfc22ee1db611d5f7f56afb0aecab137971e33 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 19 Jan 2016 16:58:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E9=99=86=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=EF=BC=8C=E8=AE=BF=E9=97=AE=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E5=A2=9E=E5=8A=A0margin-top:10px,=E5=B7=B2?=
 =?UTF-8?q?=E4=BD=BF=E6=A0=B7=E5=BC=8F=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_subfield_files.html.erb         | 2 +-
 app/views/org_subfields/_show_post_type.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 31fb38cce..eed9266d5 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -19,7 +19,7 @@
 </script>
 
 <div class="homepageRight mt0 ml0">
-  <div class="homepageRightBanner">
+  <div class="homepageRightBanner" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>">
     <div class="NewsBannerName"><%= org_subfield.name %></div>
     <ul class="resourcesSelect">
       <ul class="resourcesSelect">
diff --git a/app/views/org_subfields/_show_post_type.html.erb b/app/views/org_subfields/_show_post_type.html.erb
index 06ac0b10b..bc95c0774 100644
--- a/app/views/org_subfields/_show_post_type.html.erb
+++ b/app/views/org_subfields/_show_post_type.html.erb
@@ -17,7 +17,7 @@
     .homepagePostReplyInputContainer .ke-container {float: left;}
 </style>
 
-<div class="homepageRightBanner">
+<div class="homepageRightBanner" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>">
   <div class="NewsBannerName"><%= @org_subfield.name %></div>
 </div>