将Jquery引入组织首页

10 years ago · 12c57e7e4b
parent 37a7abea53
commit 12c57e7e4b
2 changed files with 15 additions and 1 deletions
--- a/app/views/layouts/base_organization.html.erb
+++ b/app/views/layouts/base_organization.html.erb
@ -5,6 +5,13 @@
 <head>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  <title>组织主页</title>
+  <meta charset="utf-8" />
+  <meta name="description" content="<%= Redmine::Info.app_name %>" />
+  <meta name="keywords" content="issue,bug,tracker" />
+  <%= csrf_meta_tag %>
+  <%= favicon %>
+  <%= javascript_heads %>
+  <%= heads_for_theme %>
  <link href="css/public.css" rel="stylesheet"   type="text/css" />
  <link href="css/leftside.css" rel="stylesheet"   type="text/css" />
  <link href="css/org.css" rel="stylesheet"   type="text/css" />
@ -104,10 +111,17 @@
    </ul>
  </div>
  <div class="cl"></div>
+
  <ul class="copyright mt10">
    <li class="fl mr30">Copyright&nbsp;&copy;&nbsp;2007-2015,&nbsp;All Rights Riserved</li>
    <li>ICP备09019772</li>
  </ul>
 </div>
+
+<div id="ajax-modal" style="display:none;"></div>
+
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
 </body>
 </html>
--- 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 %>
-    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", organization_path(org,:page => page.to_i + 1, :type => params[:type]),:id => "more_org_activities_link",:remote => "true",:class => "none" %></div>
+    <div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=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" %></div>
    <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
 <% end%>