Date: Mon, 29 Aug 2011 02:31:40 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/layouts/base.rhtml. X-Git-Tag: 1.3.0~1249 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=94f7b0ea16d138566ac5e9f7d375a9e0ba2c9e91;p=redmine.git rename .rhtml to .html.erb of app/views/layouts/base.rhtml. :rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6713 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb new file mode 100644 index 000000000..5084b9235 --- /dev/null +++ b/app/views/layouts/base.html.erb @@ -0,0 +1,81 @@ + + + + +<%=h html_title %> + + +<%= 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 %> + +<%= call_hook :view_layouts_base_html_head %> + +<%= yield :header_tags -%> + + +

+ + +

+ <% if User.current.logged? || !Setting.login_required? %> +

+ <% 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 %> + <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>: + <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %> + <% end %> + <%= render_project_jump_box %> +

+ <% end %> + +

<%= page_header_title %>

+ + <% if display_main_menu?(@project) %> + + <% end %> +

+ +<%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %> + + +

+ <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +

+ + + + +

+ +<%= call_hook :view_layouts_base_body_bottom %> + + diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml deleted file mode 100644 index 5084b9235..000000000 --- a/app/views/layouts/base.rhtml +++ /dev/null @@ -1,81 +0,0 @@ - - - - -<%=h html_title %> - - -<%= 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 %> - -<%= call_hook :view_layouts_base_html_head %> - -<%= yield :header_tags -%> - - -

- - -

- <% if User.current.logged? || !Setting.login_required? %> -

- <% 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 %> - <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>: - <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %> - <% end %> - <%= render_project_jump_box %> -

- <% end %> - -

<%= page_header_title %>

- - <% if display_main_menu?(@project) %> - - <% end %> -

- -<%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %> - - -

- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -

- - - - -

- -<%= call_hook :view_layouts_base_body_bottom %> - -