merge一次

app/views/layouts/base_projects.html.erb

@@ -119,7 +119,9 @@
 							<%= call_hook :view_layouts_base_content %>
 							<div style="clear:both;"></div>
 							<%= render_flash_messages %>
+							
 						</div>
+					    <%=render :partial => 'layouts/base_footer'%>
 					</div>
                     	
 					<div id="ajax-indicator" style="display:none;">

app/views/layouts/base_users.html.erb

@@ -19,15 +19,7 @@
 		<div id="wrapper">
 			<div id="wrapper2">
 				<div id="wrapper3"> 
-					<div id="top-menu" style="background-color: #FFFFFF">
-						<div id="account">
-						<div id="top-menu" style="background-color: #FFFFFF">
-							<%= render_menu :account_menu -%>
-						</div>
-						<%= 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? -%>
-					</div>
-
+				    <%=render :partial => 'layouts/base_header'%>
 					<div id="main" class="">
     					<!--user page-->
 						<div id="sidebar">
@@ -139,7 +131,10 @@
 								<%= call_hook :view_layouts_base_content %>
 							    <div style="clear:both;"></div>
 								<%= render_flash_messages %>
-							</div>
+						     
+						</div>
+					    <%=render :partial => 'layouts/base_footer'%>
+					    
 					</div>
                     
 					<div id="ajax-indicator" style="display:none;">
@@ -150,6 +145,7 @@
 					
 				</div>
 			</div>
+			
 			<%= call_hook :view_layouts_base_body_bottom %>
 	</body>
 </html>