This is aimed at the least intrusive change possible.

Signed-off-by: Nigel Kersten <[email protected]>
---
Local-branch: tickets/master/5947
 app/views/node_classes/show.html.haml |    2 +-
 app/views/node_groups/show.html.haml  |    2 +-
 app/views/nodes/show.html.haml        |    2 +-
 app/views/reports/_report.html.haml   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/node_classes/show.html.haml 
b/app/views/node_classes/show.html.haml
index c15a44d..f0b864e 100644
--- a/app/views/node_classes/show.html.haml
+++ b/app/views/node_classes/show.html.haml
@@ -7,7 +7,7 @@
     %ul.actions
       - unless SETTINGS.enable_read_only_mode
         %li= link_to 'Edit', edit_node_class_path(@node_class), :class => 
"edit button"
-        %li= link_to 'Destroy', @node_class, :confirm => 'Are you sure?', 
:method => :delete, :class => "delete button"
+        %li= link_to 'Delete', @node_class, :confirm => 'Are you sure?', 
:method => :delete, :class => "delete button"
 
   .item
     - if @node_class.all_nodes.present?
diff --git a/app/views/node_groups/show.html.haml 
b/app/views/node_groups/show.html.haml
index f593b12..fca56ca 100644
--- a/app/views/node_groups/show.html.haml
+++ b/app/views/node_groups/show.html.haml
@@ -7,7 +7,7 @@
     %ul.actions
       - unless SETTINGS.enable_read_only_mode
         %li= link_to 'Edit', edit_node_group_path(@node_group), :class => 
"edit button", :rel => 'inspect'
-        %li= link_to 'Destroy', @node_group, :confirm => 'Are you sure?', 
:method => :delete, :class => "delete button"
+        %li= link_to 'Delete', @node_group, :confirm => 'Are you sure?', 
:method => :delete, :class => "delete button"
 
   .item
     = render 'shared/parameters', :resource => @node_group
diff --git a/app/views/nodes/show.html.haml b/app/views/nodes/show.html.haml
index e76942c..cb88f7f 100644
--- a/app/views/nodes/show.html.haml
+++ b/app/views/nodes/show.html.haml
@@ -13,7 +13,7 @@
           %li= link_to 'Unhide', unhide_node_path(@node), :class => "hide 
button", :method => :put
         - else
           %li= link_to 'Hide', hide_node_path(@node), :class => "hide button", 
:method => :put
-        %li= link_to 'Destroy', @node, :confirm => 'Are you sure you wish to 
destroy this node?', :method => :delete, :class => "delete button"
+        %li= link_to 'Delete', @node, :confirm => 'Are you sure you wish to 
delete this node?', :method => :delete, :class => "delete button"
   .item
     - Registry.each_callback :core, :node_view_widgets do |widget|
       = widget.call self, @node
diff --git a/app/views/reports/_report.html.haml 
b/app/views/reports/_report.html.haml
index 7e2cb7c..f93674b 100644
--- a/app/views/reports/_report.html.haml
+++ b/app/views/reports/_report.html.haml
@@ -5,7 +5,7 @@
     %ul.actions
       - Registry.each_callback :report, :actions do |thing|
         = thing.call self, report
-      %li= link_to 'Destroy', report, :confirm => 'Are you sure?', :method => 
:delete, :class => "delete button"
+      %li= link_to 'Delete', report, :confirm => 'Are you sure?', :method => 
:delete, :class => "delete button"
 
 .item
   - Registry.each_callback :core, :report_view_widgets do |widget|
-- 
1.7.4.1

-- 
You received this message because you are subscribed to the Google Groups 
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to