Merge branch 'szzh' into develop

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

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

app/views/blogs/_article.html.erb

@@ -81,15 +81,13 @@
         更新时间：<%= format_time(activity.updated_on) %>
       </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?%>

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>

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">

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);

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>
 

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>

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>

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>

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>

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>

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>

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>

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);

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') {

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>

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>

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>

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>

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>

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>

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>

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>

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>