From: Toshi MARUYAMA Date: Fri, 2 Sep 2011 01:53:09 +0000 (+0000) Subject: rename .rhtml to .html.erb of app/views/issues/index.rhtml (#6317). X-Git-Tag: 1.3.0~922 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=75cf399ca464c3fd5609b57edff00fb6c0fd051e;p=redmine.git rename .rhtml to .html.erb of app/views/issues/index.rhtml (#6317). :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@7044 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb new file mode 100644 index 000000000..72787661d --- /dev/null +++ b/app/views/issues/index.html.erb @@ -0,0 +1,73 @@ +
+<% if !@query.new_record? && @query.editable_by?(User.current) %> + <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %> + <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> +<% end %> +
+ +

<%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %>

+<% html_title(@query.new_record? ? l(:label_issue_plural) : h(@query.name)) %> + +<% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %> + <%= hidden_field_tag 'set_filter', '1' %> +
+
"> + <%= l(:label_filter_plural) %> +
"> + <%= render :partial => 'queries/filters', :locals => {:query => @query} %> +
+
+ +
+

+ + <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %> + <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %> + <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %> + <%= link_to_function l(:button_save), "$('query_form').action='#{ url_for :controller => 'queries', :action => 'new', :project_id => @project }'; submit_query_form('query_form')", :class => 'icon icon-save' %> + <% end %> +

+<% end %> + +<%= error_messages_for 'query' %> +<% if @query.valid? %> +<% if @issues.empty? %> +

<%= l(:label_no_data) %>

+<% else %> +<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %> +

<%= pagination_links_full @issue_pages, @issue_count %>

+<% end %> + +<% other_formats_links do |f| %> + <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %> + <%= f.link_to 'CSV', :url => params %> + <%= f.link_to 'PDF', :url => params %> +<% end %> + +<% end %> +<%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %> + +<% content_for :sidebar do %> + <%= render :partial => 'issues/sidebar' %> +<% end %> + +<% content_for :header_tags do %> + <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %> + <%= auto_discovery_link_tag(:atom, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %> +<% end %> + +<%= context_menu issues_context_menu_path %> diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml deleted file mode 100644 index 72787661d..000000000 --- a/app/views/issues/index.rhtml +++ /dev/null @@ -1,73 +0,0 @@ -
-<% if !@query.new_record? && @query.editable_by?(User.current) %> - <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %> - <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> -<% end %> -
- -

<%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %>

-<% html_title(@query.new_record? ? l(:label_issue_plural) : h(@query.name)) %> - -<% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %> - <%= hidden_field_tag 'set_filter', '1' %> -
-
"> - <%= l(:label_filter_plural) %> -
"> - <%= render :partial => 'queries/filters', :locals => {:query => @query} %> -
-
- -
-

- - <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %> - <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload' %> - <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %> - <%= link_to_function l(:button_save), "$('query_form').action='#{ url_for :controller => 'queries', :action => 'new', :project_id => @project }'; submit_query_form('query_form')", :class => 'icon icon-save' %> - <% end %> -

-<% end %> - -<%= error_messages_for 'query' %> -<% if @query.valid? %> -<% if @issues.empty? %> -

<%= l(:label_no_data) %>

-<% else %> -<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %> -

<%= pagination_links_full @issue_pages, @issue_count %>

-<% end %> - -<% other_formats_links do |f| %> - <%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %> - <%= f.link_to 'CSV', :url => params %> - <%= f.link_to 'PDF', :url => params %> -<% end %> - -<% end %> -<%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %> - -<% content_for :sidebar do %> - <%= render :partial => 'issues/sidebar' %> -<% end %> - -<% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %> - <%= auto_discovery_link_tag(:atom, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %> -<% end %> - -<%= context_menu issues_context_menu_path %>