From 12c57e7e4b7f2ce76312aa88e9b0660764ffbd3d Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Sat, 5 Dec 2015 12:01:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86Jquery=E5=BC=95=E5=85=A5=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_organization.html.erb | 14 ++++++++++++++ app/views/organizations/_org_activities.html.erb | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/base_organization.html.erb b/app/views/layouts/base_organization.html.erb index 4c2d3dc7c..0d7309ddd 100644 --- a/app/views/layouts/base_organization.html.erb +++ b/app/views/layouts/base_organization.html.erb @@ -5,6 +5,13 @@ 组织主页 + + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> @@ -104,10 +111,17 @@
+ + + + + diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb index 60238091f..9cb84e6d6 100644 --- a/app/views/organizations/_org_activities.html.erb +++ b/app/views/organizations/_org_activities.html.erb @@ -56,7 +56,7 @@ <% end %> <% if org_act_count == 10 %> -
展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %>
+
展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :show_homepage =>params[:show_homepage],:type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %>
<%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> <% end%>