From 0a495267516cdfa7c602d25728b1f736b641cb44 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 29 Aug 2011 01:40:28 +0000 Subject: rename .rhtml to .html.erb of app/views/timelog/_list.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@6711 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/timelog/_list.html.erb | 53 ++++++++++++++++++++++++++++++++++++++++ app/views/timelog/_list.rhtml | 53 ---------------------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) create mode 100644 app/views/timelog/_list.html.erb delete mode 100644 app/views/timelog/_list.rhtml (limited to 'app/views/timelog') diff --git a/app/views/timelog/_list.html.erb b/app/views/timelog/_list.html.erb new file mode 100644 index 000000000..6d3180c85 --- /dev/null +++ b/app/views/timelog/_list.html.erb @@ -0,0 +1,53 @@ +<% form_tag({}) do -%> +<%= hidden_field_tag 'back_url', url_for(params) %> + + + + +<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %> +<%= sort_header_tag('user', :caption => l(:label_member)) %> +<%= sort_header_tag('activity', :caption => l(:label_activity)) %> +<%= sort_header_tag('project', :caption => l(:label_project)) %> +<%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %> + +<%= sort_header_tag('hours', :caption => l(:field_hours)) %> + + + + +<% entries.each do |entry| -%> + hascontextmenu"> + + + + + + + + + + +<% end -%> + +
+ <%= link_to image_tag('toggle_check.png'), + {}, + :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;', + :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %> +<%= l(:field_comments) %>
<%= check_box_tag("ids[]", entry.id, false, :id => nil) %><%= format_date(entry.spent_on) %><%= link_to_user(entry.user) %><%=h entry.activity %><%= link_to_project(entry.project) %> +<% if entry.issue -%> +<%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%> +<% end -%> +<%=h entry.comments %><%= html_hours("%.2f" % entry.hours) %> +<% if entry.editable_by?(User.current) -%> + <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil}, + :title => l(:button_edit) %> + <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil}, + :confirm => l(:text_are_you_sure), + :method => :delete, + :title => l(:button_delete) %> +<% end -%> +
+<% end -%> + +<%= context_menu time_entries_context_menu_path %> diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml deleted file mode 100644 index 6d3180c85..000000000 --- a/app/views/timelog/_list.rhtml +++ /dev/null @@ -1,53 +0,0 @@ -<% form_tag({}) do -%> -<%= hidden_field_tag 'back_url', url_for(params) %> - - - - -<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %> -<%= sort_header_tag('user', :caption => l(:label_member)) %> -<%= sort_header_tag('activity', :caption => l(:label_activity)) %> -<%= sort_header_tag('project', :caption => l(:label_project)) %> -<%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %> - -<%= sort_header_tag('hours', :caption => l(:field_hours)) %> - - - - -<% entries.each do |entry| -%> - hascontextmenu"> - - - - - - - - - - -<% end -%> - -
- <%= link_to image_tag('toggle_check.png'), - {}, - :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;', - :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %> -<%= l(:field_comments) %>
<%= check_box_tag("ids[]", entry.id, false, :id => nil) %><%= format_date(entry.spent_on) %><%= link_to_user(entry.user) %><%=h entry.activity %><%= link_to_project(entry.project) %> -<% if entry.issue -%> -<%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%> -<% end -%> -<%=h entry.comments %><%= html_hours("%.2f" % entry.hours) %> -<% if entry.editable_by?(User.current) -%> - <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil}, - :title => l(:button_edit) %> - <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil}, - :confirm => l(:text_are_you_sure), - :method => :delete, - :title => l(:button_delete) %> -<% end -%> -
-<% end -%> - -<%= context_menu time_entries_context_menu_path %> -- cgit v1.2.3