From b259f923816b23618d76a67e752a654926fa0b62 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sun, 9 Oct 2016 09:02:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E5=B8=96=E5=AD=90=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E9=BB=98=E8=AE=A4=E5=B1=95=E7=A4=BA5=E4=B8=AA?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=AF=E8=BF=9B=E5=85=A5=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   | 10 +++++
 .../_org_left_subfield_list.html.erb          | 41 +++++++++----------
 .../organizations/_org_subdomain.html.erb     | 13 +++---
 .../organizations/more_org_submains.js.erb    |  1 +
 config/routes.rb                              |  1 +
 public/javascripts/org.js                     | 11 +++++
 6 files changed, 49 insertions(+), 28 deletions(-)
 create mode 100644 app/views/organizations/more_org_submains.js.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 2b31cae13..edffdd28b 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -460,6 +460,16 @@ class OrganizationsController < ApplicationController
     @members = paginateHelper @members, 20
   end
 
+  def more_org_submains
+    @org_subfield = OrgSubfield.find params[:org_subfield_id].to_i
+
+    @page = params[:page]
+    @submains = @org_subfield.sub_domains.reorder('priority').uniq.page((params[:page].to_i || 1) +1).per(5)
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def  more_org_projects
     @organization = Organization.find params[:id]
     @page = params[:page]
diff --git a/app/views/organizations/_org_left_subfield_list.html.erb b/app/views/organizations/_org_left_subfield_list.html.erb
index 11f45ede1..ee467067b 100644
--- a/app/views/organizations/_org_left_subfield_list.html.erb
+++ b/app/views/organizations/_org_left_subfield_list.html.erb
@@ -43,12 +43,11 @@
             $(this).prev().css("color","#808080");
             $(this).css("z-index", "1");
         });
-
         //二级菜单滑动时箭头方向控制
         $(".homepageLeftMenuMoreIcon").toggle(function(){
-            $(this).css("background","url(/images/homepage_icon.png) 100px -624px no-repeat");
-        },function(){
             $(this).css("background","url(/images/homepage_icon.png) -74px -240px no-repeat");
+        },function(){
+            $(this).css("background","url(/images/homepage_icon.png) 100px -624px no-repeat");
         });
     })
 </script>
@@ -103,17 +102,15 @@
                         <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                     <% end %>
                 <% else %>
-                    <!-- link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" -->
-                    <a href = "javascript:void(0);" class = "homepageMenuText" onclick = "$('#PostDomain_<%= field.id %>').slideToggle();"><%= field.name %></a>
+                    <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText homepageMenuControl hidden", :onclick => "$('#homepageLeftMenuPost').slideToggle();" %>
                 <% end %>
                 <% if User.current.logged? and User.current.admin_of_org?(organization) %>
                     <%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
                 <% end %>
               </div>
-              <div class="homepageLeftMenuCourses" id="PostDomain_<%= field.id %>" style="display:<%= field.sub_domains.count == 0 ? 'none' : '' %>">
-
+              <div class="<%= (field.sub_domains.count == 0) ? 'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="PostDomain_<%= field.id %>" style="display:block;">
                 <ul>
-                  <%= render :partial => 'organizations/org_subdomain',:locals => {:subdomains => field.sub_domains.reorder('priority').uniq, :org_subfield_id => field.id} %>
+                  <%= render :partial => 'organizations/org_subdomain',:locals => {:subdomains => field.sub_domains.reorder('priority').uniq.limit(5), :org_subfield_id => field.id, :page=>1, :org_id => organization.id } %>
                 </ul>
               </div>
 
@@ -139,20 +136,20 @@
               </div>
           <% elsif field.field_type == "Resource" %>
               <div class="homepageLeftMenuBlock">
-                  <% if !field.subfield_subdomain_dir.nil? %>
-                      <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
-                          <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %>
-                      <% else %>
-                          <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %>
-                      <% end %>
-                  <% else %>
-                      <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText homepageMenuControl hidden" %>
-                  <% end %>
-                  <% if User.current.member_of_org?organization %>
-                      <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
-                      <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
-                  <% end %>
-                  <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->
+               <% if !field.subfield_subdomain_dir.nil? %>
+                    <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
+                        <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %>
+                    <% else %>
+                        <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText homepageMenuControl hidden" %>
+                    <% end %>
+                <% else %>
+                    <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText homepageMenuControl hidden" %>
+                <% end %>
+                <% if User.current.member_of_org?organization %>
+                    <%= link_to "", subfield_upload_file_org_subfield_files_path(field.id, :in_org => 1),:method => "post", :remote => true, :class => "homepageMenuSetting fr", :title => "上传资源" %>
+                    <!--<a class="homepageMenuSetting fr" title="上传资源" href="javascript:void(0);" onclick="org_subfield_files_upload(<%#= field.id %>);"> </a>-->
+                <% end %>
+                <!--<a href="javascript:void(0);" class="homepageMenuText"><%#= field.name %></a>-->
               </div>
           <% end %>
         </div>
diff --git a/app/views/organizations/_org_subdomain.html.erb b/app/views/organizations/_org_subdomain.html.erb
index b096a14ae..8b8807533 100644
--- a/app/views/organizations/_org_subdomain.html.erb
+++ b/app/views/organizations/_org_subdomain.html.erb
@@ -3,9 +3,10 @@
       <%= link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => org_subfield_id), :class => "coursesLineGrey hidden", :title => subdomain.name %>
     </li>
 <% end %>
-<%# if subdomains.size == 5 %>
-    <!--<li class="homepageLeftMenuMore" id="show_more_org_project">-->
-      <!--<input type="hidden" value="<%#= page %>" id="org_project_page_num">-->
-      <!--<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_project('<%#=  more_org_projects_organization_path(org_id) %>');"></a>-->
-    <!--</li>-->
-<%# end%>
\ No newline at end of file
+<% if subdomains.size == 5 %>
+    <li class="homepageLeftMenuMore" id="show_more_org_submains">
+      <input type="hidden" value="<%= page %>" id="org_submains_page_num">
+      <a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="show_more_org_submain('<%=  more_org_submains_organization_path(org_id, :org_subfield_id => org_subfield_id) %>');"></a>
+    </li>
+<% end%>
+
diff --git a/app/views/organizations/more_org_submains.js.erb b/app/views/organizations/more_org_submains.js.erb
new file mode 100644
index 000000000..088c9ed34
--- /dev/null
+++ b/app/views/organizations/more_org_submains.js.erb
@@ -0,0 +1 @@
+$("#show_more_org_submains").replaceWith("<%= escape_javascript( render :partial => 'organizations/org_subdomain',:locals => {:subdomains => @submains, :org_subfield_id => @org_subfield.id, :page=> @page, :org_id => @organization } )%>");
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 4ff75cbf9..633ce465c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,6 +73,7 @@ RedmineApp::Application.routes.draw do
       put 'set_homepage'
       put 'cancel_homepage'
       get 'members'
+      get 'more_org_submains'
       get 'more_org_projects'
       get 'more_org_courses'
       get 'search_courses'
diff --git a/public/javascripts/org.js b/public/javascripts/org.js
index f1520a0ec..84711cded 100644
--- a/public/javascripts/org.js
+++ b/public/javascripts/org.js
@@ -34,6 +34,17 @@ function observeSearchfield(fieldId, targetId, url) {
     });
 }
 
+//显示更多子栏目
+function show_more_org_submain(url){
+    $.get(
+        url,
+        { page: $("#org_submains_page_num").val() },
+        function (data) {
+
+        }
+    );
+}
+
 //显示更多的项目
 function show_more_org_project(url){
     $.get(