From 18b1d22502b045188b5bc4737654bb4f6127d16f Mon Sep 17 00:00:00 2001 From: zhangyang Date: Thu, 1 Aug 2013 20:10:56 +0800 Subject: [PATCH] =?UTF-8?q?merge=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 4 +++- app/views/layouts/base_users.html.erb | 20 ++++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index ca7c2ddf5..2c05abc94 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -119,9 +119,11 @@ <%= call_hook :view_layouts_base_content %>
<%= render_flash_messages %> + + <%=render :partial => 'layouts/base_footer'%> - + diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 5621f8d39..46f549a3d 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -18,16 +18,8 @@
-
-
-
-
- <%= render_menu :account_menu -%> -
- <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> - <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> -
- +
+ <%=render :partial => 'layouts/base_header'%>
+ +
+ <%=render :partial => 'layouts/base_footer'%> +
- + @@ -150,6 +145,7 @@
+ <%= call_hook :view_layouts_base_body_bottom %>