diff app/views/layouts/.svn/text-base/base.rhtml.svn-base @ 441:cbce1fd3b1b7 redmine-1.2

Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)

--- a/app/views/layouts/.svn/text-base/base.rhtml.svn-base	Thu Mar 03 11:42:28 2011 +0000
+++ b/app/views/layouts/.svn/text-base/base.rhtml.svn-base	Mon Jun 06 14:24:13 2011 +0100
@@ -5,12 +5,12 @@
 <title><%=h html_title %></title>
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
+<%= csrf_meta_tag %>
 <%= favicon %>
 <%= stylesheet_link_tag 'application', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= heads_for_theme %>
-<%= heads_for_wiki_formatter %>
 <!--[if IE 6]>
     <style type="text/css">
       * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
@@ -29,10 +29,11 @@
         <%= render_menu :account_menu -%>
     </div>
     <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => 'loggedas') if User.current.logged? %>
-    <%= render_menu :top_menu -%>
+    <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
 </div>
       
 <div id="header">
+    <% if User.current.logged? || !Setting.login_required? %>
     <div id="quick-search">
         <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
         <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
@@ -41,6 +42,7 @@
         <% end %>
         <%= render_project_jump_box %>
     </div>
+    <% end %>
     
     <h1><%= page_header_title %></h1>