1.栏目增加新建帖子功能；

2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。

app/controllers/org_document_comments_controller.rb

@@ -18,7 +18,7 @@ class OrgDocumentCommentsController < ApplicationController
       flash.keep[:notice] = l(:notice_successful_create)
       EditorOfDocument.create(:editor_id => User.current.id, :org_document_comment_id => @org_document_comment.id, :created_at => @org_document_comment.updated_at)
       if params[:field_id]
-        redirect_to organization_path(@organization)
+        redirect_to organization_path(@organization, :org_subfield_id => params[:field_id])
       else
         redirect_to organization_org_document_comments_path(@organization)
       end
@@ -53,7 +53,7 @@ class OrgDocumentCommentsController < ApplicationController
           if params[:flag].to_i == 1
             redirect_to org_document_comment_path(@org_document.root.id, :organization_id => @org_document.organization.id)
           else
-            redirect_to organization_path(@org_document.organization.id)
+            redirect_to organization_path(@org_document.organization.id, :org_subfield_id => params[:org_subfield_id])
           end
         end
       }

app/controllers/organizations_controller.rb

@@ -68,6 +68,11 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
+      if params[:org_subfield_id]
+        @org_subfield = OrgSubfield.find(params[:org_subfield_id])
+        @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
+        @org_activities = OrgActivity.where("org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})").order('updated_at desc').page(params[:page] || 1).per(10)
+      else
         project_ids = @organization.projects.map(&:id) << 0
         course_ids = @organization.courses.map(&:id) << 0
         course_types = "('Message','News','HomeworkCommon','Poll','Course')"
@@ -92,6 +97,7 @@ class OrganizationsController < ApplicationController
           when 'course_poll'
             @org_activities = OrgActivity.where("container_type = 'Course' and org_act_type = 'Poll' and container_id in (#{course_ids.join(',')})").order('updated_at desc').page(params[:page] || 1).per(10)
         end
+      end
       @page = params[:page]
       respond_to do |format|
         format.html

app/views/org_document_comments/edit.html.erb

@@ -17,7 +17,7 @@
 </div>
 <div class="cl"></div>
 <div>
-<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag),:method => 'put', :id => 'new_org_document_form' do |f| %>
+<%= form_tag url_for(:controller => 'org_document_comments',:action => 'update', :id => @org_document.id, :flag => @flag, :org_subfield_id => params[:org_subfield_id]),:method => 'put', :id => 'new_org_document_form' do |f| %>
     <div class="resources">
       <div>
         <input class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" value="<%= @org_document.title %>" />

app/views/org_document_comments/new.html.erb

@@ -22,17 +22,13 @@
         }
     }
     function cancel_create_org_document(){
-        $("#document_title").val("");
-        org_document_description_editor.html("");
-        org_document_description_editor.sync();
-        $('#org_document_editor').hide();
-        $('#doc_title_hint').hide();
+        location.href = document.referrer;
     }
 </script>
 <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id, :field_id => params[:field_id]), :id => 'new_org_document_form' do |f| %>
 <div class="resources">
       <div>
-        <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" onblur="check_org_title();" placeholder="请输入文章标题"></textarea>
+        <textarea class="postDetailInput fl mr15" style="margin-bottom:15px;" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题"></textarea>
       </div>
       <div id="doc_title_hint"></div>
     <div id="org_document_editor" class="mt15" >
@@ -48,7 +44,7 @@
       <div class="mt5">
             <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
             <span class="fr mr10 mt3">或</span>
-            <a href="javascript:void(0);" onclick="$('#org_document_editor').hide(); $('#doc_title_hint').hide();" class="fr mr10 mt3">取消</a>
+            <a href="javascript:void(0);" onclick="cancel_create_org_document();" class="fr mr10 mt3">取消</a>
         <div class="cl"></div>
       </div>
 

app/views/organizations/_org_activities.html.erb

@@ -22,7 +22,7 @@
                 </div>
             <% end %>
             <% if act.org_act_type == 'OrgDocumentComment' && act.org_act_id != @organization.home_id %>
-                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2} %>
+                <%= render :partial => 'show_org_document', :locals => {:document => act.org_act, :act => act, :flag => 2, :org_subfield_id => params[:org_subfield_id]} %>
             <% end %>
         <% end %>
         <% if act.container_type == 'Project' %>

app/views/organizations/_org_left_subfield_list.html.erb

@@ -25,7 +25,7 @@
 </div>
 <% organization.org_subfields.each do |field| %>
     <div class="homepageLeftMenuBlock">
-      <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses_#{field.id}').slideToggle();"><%= field.name %></a>
+      <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
       <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子"%>
     </div>
     <div class="homepageLeftMenuCourses" id="homepageLeftMenuField_<%= field.id %>" style="display:none;">

app/views/organizations/_show_org_document.html.erb

@@ -32,7 +32,7 @@
                     <% end %>
                   </li>
                   <li>
-                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag), :class => "postOptionLink" %>
+                    <%= link_to "编辑文章", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => flag, :org_subfield_id => org_subfield_id), :class => "postOptionLink" %>
                   </li>
                   <li>
                     <%= link_to "删除文章", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',

app/views/organizations/show.html.erb

@@ -14,7 +14,8 @@
 </style>
 <% if params[:show_homepage].nil? %>
 <div class="homepageRightBanner">
-  <div class="NewsBannerName">最新动态</div>
+  <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
+  <% if params[:org_subfield_id].nil? %>
       <ul class="resourcesSelect">
         <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
           <ul class="homepagePostType">
@@ -50,9 +51,10 @@
           </ul>
         </li>
       </ul>
+  <% end %>
 </div>
 <% end %>
-<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 %>
+<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
     <script>
         $(function() {
             init_activity_KindEditor_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "87%");