From: Toshi MARUYAMA Date: Mon, 29 Aug 2011 00:03:54 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/layouts/admin.rhtml. X-Git-Tag: 1.3.0~1258 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3a47aedfd2e00d8a33cdde9e3e064fd41374c060;p=redmine.git rename .rhtml to .html.erb of app/views/layouts/admin.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@6704 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb new file mode 100644 index 000000000..197c32a84 --- /dev/null +++ b/app/views/layouts/admin.html.erb @@ -0,0 +1,8 @@ +<% unless controller_name == 'admin' && action_name == 'index' %> + <% content_for :sidebar do %> +

<%=l(:label_administration)%>

+ <%= render :partial => 'admin/menu' %> + <% end %> +<% end %> + +<%= render :file => "layouts/base" %> diff --git a/app/views/layouts/admin.rhtml b/app/views/layouts/admin.rhtml deleted file mode 100644 index 197c32a84..000000000 --- a/app/views/layouts/admin.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -<% unless controller_name == 'admin' && action_name == 'index' %> - <% content_for :sidebar do %> -

<%=l(:label_administration)%>

- <%= render :partial => 'admin/menu' %> - <% end %> -<% end %> - -<%= render :file => "layouts/base" %>