From 7f4635022f7dab0fb755868a99a0db6a3e45ec81 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 12 Sep 2009 09:25:39 +0000 Subject: [PATCH] Makes 'delete links' the same on admin views. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2872 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/custom_fields/_index.rhtml | 7 +++++-- app/views/enumerations/list.rhtml | 7 +++++-- app/views/issue_statuses/list.rhtml | 7 +++++-- app/views/roles/list.rhtml | 7 +++++-- app/views/trackers/list.rhtml | 7 +++++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/app/views/custom_fields/_index.rhtml b/app/views/custom_fields/_index.rhtml index 1417dd4bb..c70fbea48 100644 --- a/app/views/custom_fields/_index.rhtml +++ b/app/views/custom_fields/_index.rhtml @@ -21,8 +21,11 @@ <%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %> <% end %> <%= reorder_links('custom_field', {:action => 'edit', :id => custom_field}) %> - - <%= button_to l(:button_delete), { :action => 'destroy', :id => custom_field }, :confirm => l(:text_are_you_sure), :class => "button-small" %> + + <%= link_to(l(:button_delete), { :action => 'destroy', :id => custom_field }, + :method => :post, + :confirm => l(:text_are_you_sure), + :class => 'icon icon-del') %> <% end; reset_cycle %> diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml index 8143ad0f3..3ae144487 100644 --- a/app/views/enumerations/list.rhtml +++ b/app/views/enumerations/list.rhtml @@ -11,8 +11,11 @@ <%= link_to h(enumeration), :action => 'edit', :id => enumeration %> <%= image_tag('true.png') if enumeration.is_default? %> <%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %> - - <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, :method => :post, :confirm => l(:text_are_you_sure), :class => "icon icon-del" %> + + <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, + :method => :post, + :confirm => l(:text_are_you_sure), + :class => 'icon icon-del' %> <% end %> diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml index fd4e3e8b2..ca973153d 100644 --- a/app/views/issue_statuses/list.rhtml +++ b/app/views/issue_statuses/list.rhtml @@ -19,8 +19,11 @@ <%= image_tag 'true.png' if status.is_default? %> <%= image_tag 'true.png' if status.is_closed? %> <%= reorder_links('issue_status', {:action => 'update', :id => status}) %> - - <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %> + + <%= link_to(l(:button_delete), { :action => 'destroy', :id => status }, + :method => :post, + :confirm => l(:text_are_you_sure), + :class => 'icon icon-del') %> <% end %> diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml index 32ff7160c..41878146b 100644 --- a/app/views/roles/list.rhtml +++ b/app/views/roles/list.rhtml @@ -19,8 +19,11 @@ <%= reorder_links('role', {:action => 'edit', :id => role}) %> <% end %> - - <%= button_to(l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small", :disabled => role.builtin? ) %> + + <%= link_to(l(:button_delete), { :action => 'destroy', :id => role }, + :method => :post, + :confirm => l(:text_are_you_sure), + :class => 'icon icon-del') unless role.builtin? %> <% end %> diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml index 06eaf7105..ab6eba575 100644 --- a/app/views/trackers/list.rhtml +++ b/app/views/trackers/list.rhtml @@ -17,8 +17,11 @@ <%= link_to tracker.name, :action => 'edit', :id => tracker %> <% unless tracker.workflows.count > 0 %><%= l(:text_tracker_no_workflow) %> (<%= link_to l(:button_edit), {:controller => 'workflows', :action => 'edit', :tracker_id => tracker} %>)<% end %> <%= reorder_links('tracker', {:action => 'edit', :id => tracker}) %> - - <%= button_to l(:button_delete), { :action => 'destroy', :id => tracker }, :confirm => l(:text_are_you_sure), :class => "button-small" %> + + <%= link_to(l(:button_delete), { :action => 'destroy', :id => tracker }, + :method => :post, + :confirm => l(:text_are_you_sure), + :class => 'icon icon-del') %> <% end %>