···
---
app/views/architectures/index.html.erb | 2 +-
app/views/auth_source_ldaps/index.html.erb | 2 +-
app/views/bookmarks/index.html.erb | 2 +-
app/views/common_parameters/index.html.erb | 2 +-
app/views/config_templates/index.html.erb | 2 +-
app/views/domains/index.html.erb | 2 +-
app/views/environments/index.html.erb | 2 +-
app/views/hostgroups/index.html.erb | 2 +-
app/views/hypervisors/guests/index.html.erb | 2 +-
app/views/hypervisors/guests/show.html.erb | 4 ++--
app/views/hypervisors/index.html.erb | 2 +-
app/views/lookup_keys/index.html.erb | 2 +-
app/views/media/index.html.erb | 2 +-
app/views/models/index.html.erb | 2 +-
app/views/operatingsystems/index.html.erb | 2 +-
app/views/ptables/index.html.erb | 2 +-
app/views/puppetclasses/index.html.erb | 2 +-
app/views/reports/_list.html.erb | 2 +-
app/views/smart_proxies/autosign/index.html.erb | 2 +-
app/views/smart_proxies/index.html.erb | 2 +-
app/views/smart_proxies/puppetca/index.html.erb | 2 +-
app/views/subnets/index.html.erb | 2 +-
app/views/usergroups/index.html.erb | 2 +-
app/views/users/index.html.erb | 2 +-
24 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/app/views/architectures/index.html.erb b/app/views/architectures/index.html.erb
index 70517cb…19b9482 100644
— a/app/views/architectures/index.html.erb
+++ b/app/views/architectures/index.html.erb
@@ -12,7 +12,7 @@
<%= link_to_if_authorized(h(architecture.name), hash_for_edit_architecture_path(:id => architecture.name)) %> |
<%=h architecture.operatingsystems.to_sentence %> |
-
<%= display_link_if_authorized "Destroy", hash_for_architecture_path(:id => architecture.name, :auth_action => :destroy), :confirm => "Delete #{architecture.name}?", :method => :delete %>
-
<%= display_link_if_authorized "Delete", hash_for_architecture_path(:id => architecture.name, :auth_action => :destroy), :confirm => "Delete #{architecture.name}?", :method => :delete %>
</td>
<% end %>
diff --git a/app/views/auth_source_ldaps/index.html.erb b/app/views/auth_source_ldaps/index.html.erb
index a9d0b1e…4525868 100644
— a/app/views/auth_source_ldaps/index.html.erb
+++ b/app/views/auth_source_ldaps/index.html.erb
@@ -16,7 +16,7 @@
|
<%=h auth_source_ldap.host %> |
<%=checked_icon auth_source_ldap.onthefly_register %> |
<%=checked_icon auth_source_ldap.tls %> |
-
<td><%= display_link_if_authorized "Destroy", hash_for_auth_source_ldap_path(:id => auth_source_ldap, :auth_action => :destroy), :confirm => "Delete #{auth_source_ldap.name}?", :method => :delete %></td>
-
<td><%= display_link_if_authorized "Delete", hash_for_auth_source_ldap_path(:id => auth_source_ldap, :auth_action => :destroy), :confirm => "Delete #{auth_source_ldap.name}?", :method => :delete %></td>
<% end %>
diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb
index b9c6a77..b40fc25 100644
--- a/app/views/bookmarks/index.html.erb
+++ b/app/views/bookmarks/index.html.erb
@@ -16,7 +16,7 @@
<%=h bookmark.controller %> |
<%=h bookmark.public %> |
- <%= display_link_if_authorized "Destroy", hash_for_bookmark_path(:id => bookmark.name, :auth_action => :destroy), :confirm => "Delete #{bookmark.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_bookmark_path(:id => bookmark.name, :auth_action => :destroy), :confirm => "Delete #{bookmark.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/common_parameters/index.html.erb b/app/views/common_parameters/index.html.erb
index b765e29..e833f2f 100644
--- a/app/views/common_parameters/index.html.erb
+++ b/app/views/common_parameters/index.html.erb
@@ -13,7 +13,7 @@
<%= link_to_if_authorized h(common_parameter), hash_for_edit_common_parameter_path(:id => common_parameter.id)%> |
<%=h common_parameter.value %> |
- <%= display_link_if_authorized "Destroy", hash_for_common_parameter_path(:id => common_parameter, :auth_action => :destroy), :confirm => "Delete #{common_parameter.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_common_parameter_path(:id => common_parameter, :auth_action => :destroy), :confirm => "Delete #{common_parameter.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/config_templates/index.html.erb b/app/views/config_templates/index.html.erb
index 0c72dd3..0630be5 100644
--- a/app/views/config_templates/index.html.erb
+++ b/app/views/config_templates/index.html.erb
@@ -21,7 +21,7 @@
<%= combination config_template %> |
<%= config_template.try(:template_kind) %> |
<%= checked_icon config_template.snippet %> |
- <%= display_link_if_authorized "Destroy", hash_for_config_template_path(:id => config_template.to_param, :auth_action => :destroy),
+ |
<%= display_link_if_authorized "Delete", hash_for_config_template_path(:id => config_template.to_param, :auth_action => :destroy),
:confirm => "Delete #{config_template}?", :method => :delete -%> |
<% end %>
diff --git a/app/views/domains/index.html.erb b/app/views/domains/index.html.erb
index 50953c3..9d077eb 100644
--- a/app/views/domains/index.html.erb
+++ b/app/views/domains/index.html.erb
@@ -12,7 +12,7 @@
">
| <%= link_to_if_authorized h(domain.fullname.empty? ? domain.name : domain.fullname), hash_for_edit_domain_path(:id => domain.name)%> |
<%= link_to_if domain.hosts.any?, domain.hosts.size, hosts_path(:search => "domain = #{domain}") %>
- |
<%= display_link_if_authorized "Destroy", hash_for_domain_path(:id => domain, :auth_action => :destroy), :confirm => "Delete #{domain.name}?", :method => :delete %> |
+ <%= display_link_if_authorized "Delete", hash_for_domain_path(:id => domain, :auth_action => :destroy), :confirm => "Delete #{domain.name}?", :method => :delete %> |
<% end %>
diff --git a/app/views/environments/index.html.erb b/app/views/environments/index.html.erb
index f884069..7c893ad 100644
--- a/app/views/environments/index.html.erb
+++ b/app/views/environments/index.html.erb
@@ -19,7 +19,7 @@
<%= link_to_if environment.hosts.any?, environment.hosts.size, hosts_path(:search => "environment = #{environment}") %>
|
<%= link_to "classes", puppetclasses_path(:search => "environment = #{environment}")%>
- <%= display_link_if_authorized "Destroy", hash_for_environment_path(:id => environment.name, :auth_action => :destroy), :confirm => "Delete #{environment.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_environment_path(:id => environment.name, :auth_action => :destroy), :confirm => "Delete #{environment.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/hostgroups/index.html.erb b/app/views/hostgroups/index.html.erb
index 7f5e9fa..e27c813 100644
--- a/app/views/hostgroups/index.html.erb
+++ b/app/views/hostgroups/index.html.erb
@@ -13,7 +13,7 @@
<%= display_link_if_authorized 'Nest', hash_for_nest_hostgroup_path(:id => hostgroup) %>
<%= display_link_if_authorized 'Clone', hash_for_clone_hostgroup_path(:id => hostgroup) %>
- <%= display_link_if_authorized "Destroy", hash_for_hostgroup_path(:id => hostgroup, :auth_action => :destroy), :confirm => warning_message(hostgroup), :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_hostgroup_path(:id => hostgroup, :auth_action => :destroy), :confirm => warning_message(hostgroup), :method => :delete %>
|
<% end %>
diff --git a/app/views/hypervisors/guests/index.html.erb b/app/views/hypervisors/guests/index.html.erb
index fc7c061..0f68dd0 100644
--- a/app/views/hypervisors/guests/index.html.erb
+++ b/app/views/hypervisors/guests/index.html.erb
@@ -20,7 +20,7 @@
> <%= state(!guest.running?) %> |
<%= power_action guest %>
- <%= display_link_if_authorized "Destroy", hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => guest).merge(:auth_action => :destroy), :confirm => 'Are you sure?', :method => :delete, :class => "label important" %>
+ <%= display_link_if_authorized "Delete", hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => guest).merge(:auth_action => :destroy), :confirm => 'Are you sure?', :method => :delete, :class => "label important" %>
|
<% end -%>
diff --git a/app/views/hypervisors/guests/show.html.erb b/app/views/hypervisors/guests/show.html.erb
index eed5d5f..dd132bf 100644
--- a/app/views/hypervisors/guests/show.html.erb
+++ b/app/views/hypervisors/guests/show.html.erb
@@ -51,5 +51,5 @@
<% title_actions display_link_if_authorized("Power#{state(@guest.running?)}", hash_for_power_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => @guest), :confirm => 'Are you sure?', :method => :put, :class=>'btn ' + (@guest.running? ? "danger" : "success")),
- display_link_if_authorized("Destroy", hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => @guest).merge(:auth_action => :destroy), :confirm => 'Are you sure?', :method => :delete, :class=>'btn danger'),
- display_link_if_authorized("Other Guests on this hypervisor", hash_for_hypervisor_guests_path(:hypervisor_id => @hypervisor), :class=>'btn') %>
\ No newline at end of file
+ display_link_if_authorized("Delete", hash_for_hypervisor_guest_path(:hypervisor_id => @hypervisor, :id => @guest).merge(:auth_action => :destroy), :confirm => 'Are you sure?', :method => :delete, :class=>'btn danger'),
+ display_link_if_authorized("Other Guests on this hypervisor", hash_for_hypervisor_guests_path(:hypervisor_id => @hypervisor), :class=>'btn') %>
diff --git a/app/views/hypervisors/index.html.erb b/app/views/hypervisors/index.html.erb
index 749ea34..20f279e 100644
--- a/app/views/hypervisors/index.html.erb
+++ b/app/views/hypervisors/index.html.erb
@@ -17,7 +17,7 @@
<%= display_link_if_authorized "Guests", hash_for_hypervisor_guests_path(:hypervisor_id => hypervisor.name) %>
<%= display_link_if_authorized "Edit", hash_for_edit_hypervisor_path(:id => hypervisor.name) %>
- <%= display_link_if_authorized "Destroy", hash_for_hypervisor_path(:id => hypervisor.name, :auth_action => :destroy), :confirm => "Delete #{hypervisor.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_hypervisor_path(:id => hypervisor.name, :auth_action => :destroy), :confirm => "Delete #{hypervisor.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/lookup_keys/index.html.erb b/app/views/lookup_keys/index.html.erb
index c9438b4..0867c02 100644
--- a/app/views/lookup_keys/index.html.erb
+++ b/app/views/lookup_keys/index.html.erb
@@ -13,7 +13,7 @@
<%= link_to_if_authorized h(lookup_key.key), hash_for_edit_lookup_key_path(:id => lookup_key) %> |
<%= link_to_if_authorized h(lookup_key.puppetclass), hash_for_edit_puppetclass_path(:id => lookup_key.puppetclass) if lookup_key.puppetclass %> |
<%=h lookup_key.lookup_values.count %> |
- <%= display_link_if_authorized 'Destroy', hash_for_lookup_key_path(:id => lookup_key, :auth_action => :destroy), :confirm => "Delete #{lookup_key.key}?", :method => :delete %> |
+ <%= display_link_if_authorized 'Delete', hash_for_lookup_key_path(:id => lookup_key, :auth_action => :destroy), :confirm => "Delete #{lookup_key.key}?", :method => :delete %> |
<% end %>
diff --git a/app/views/media/index.html.erb b/app/views/media/index.html.erb
index 54504b5..f871741 100644
--- a/app/views/media/index.html.erb
+++ b/app/views/media/index.html.erb
@@ -15,7 +15,7 @@
<%=h medium.path %> |
<%=h medium.operatingsystems.to_sentence %> |
- <%= display_link_if_authorized "Destroy", hash_for_medium_path(:id => medium, :auth_action => :destroy), :confirm => "Delete #{medium.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_medium_path(:id => medium, :auth_action => :destroy), :confirm => "Delete #{medium.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/models/index.html.erb b/app/views/models/index.html.erb
index 01caa57..7da9f39 100644
--- a/app/views/models/index.html.erb
+++ b/app/views/models/index.html.erb
@@ -17,7 +17,7 @@
<%=h(model.hardware_model)%> |
<%= link_to_if model.hosts.any?, model.hosts.count, hosts_path(:search=>"model = #{model.name}") %> |
- <%= display_link_if_authorized "Destroy", hash_for_model_path(:id => model, :auth_action => :destroy), :confirm => "Delete #{model.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_model_path(:id => model, :auth_action => :destroy), :confirm => "Delete #{model.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/operatingsystems/index.html.erb b/app/views/operatingsystems/index.html.erb
index e6c47fe..59039ad 100644
--- a/app/views/operatingsystems/index.html.erb
+++ b/app/views/operatingsystems/index.html.erb
@@ -12,7 +12,7 @@
<%= link_to_if_authorized(os_name(operatingsystem), hash_for_edit_operatingsystem_path(:id => operatingsystem.id)) %> |
<%= link_to @counter[operatingsystem.id] || 0, hosts_path(:search => "os = #{operatingsystem.name}") %> |
- <%= display_link_if_authorized "Destroy", hash_for_operatingsystem_path(:id => operatingsystem, :auth_action => :destroy), :confirm => "Delete #{operatingsystem.fullname}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_operatingsystem_path(:id => operatingsystem, :auth_action => :destroy), :confirm => "Delete #{operatingsystem.fullname}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/ptables/index.html.erb b/app/views/ptables/index.html.erb
index 726aee0..47943fb 100644
--- a/app/views/ptables/index.html.erb
+++ b/app/views/ptables/index.html.erb
@@ -12,7 +12,7 @@
<%=link_to_if_authorized h(ptable.name), hash_for_edit_ptable_path(:id => ptable.id) %> |
<%=h ptable.operatingsystems.to_sentence %> |
- <%= display_link_if_authorized "Destroy", hash_for_ptable_path(:id => ptable, :auth_action => :destroy), :confirm => "Delete #{ptable.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_ptable_path(:id => ptable, :auth_action => :destroy), :confirm => "Delete #{ptable.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/puppetclasses/index.html.erb b/app/views/puppetclasses/index.html.erb
index 7f18902..71e6a21 100644
--- a/app/views/puppetclasses/index.html.erb
+++ b/app/views/puppetclasses/index.html.erb
@@ -27,7 +27,7 @@
<%= link_to puppetclass.lookup_keys.count, puppetclass_lookup_keys_path(puppetclass) %>
- <%= display_link_if_authorized "Destroy", hash_for_puppetclass_path(:id => puppetclass, :auth_action => :destroy), :confirm => "Delete #{puppetclass.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_puppetclass_path(:id => puppetclass, :auth_action => :destroy), :confirm => "Delete #{puppetclass.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/reports/_list.html.erb b/app/views/reports/_list.html.erb
index 271d055..1916c16 100644
--- a/app/views/reports/_list.html.erb
+++ b/app/views/reports/_list.html.erb
@@ -23,7 +23,7 @@
<%= report_event_column(report.failed_restarts, "warning") %> |
<%= report_event_column(report.skipped, "notice") %> |
- <%= display_link_if_authorized "Destroy", hash_for_report_path(:id => report.id, :auth_action => :destroy), :confirm => "Delete report for #{report.host.name}?", :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_report_path(:id => report.id, :auth_action => :destroy), :confirm => "Delete report for #{report.host.name}?", :method => :delete %>
|
<% end %>
diff --git a/app/views/smart_proxies/autosign/index.html.erb b/app/views/smart_proxies/autosign/index.html.erb
index 990cc09..5563137 100644
--- a/app/views/smart_proxies/autosign/index.html.erb
+++ b/app/views/smart_proxies/autosign/index.html.erb
@@ -12,7 +12,7 @@
">
| <%= h cert%> |
- <%= display_link_if_authorized "Destroy", hash_for_smart_proxy_autosign_path(:smart_proxy_id => @proxy, :id => cert).merge(:auth_ation => :destroy), :confirm => 'Are you sure?', :method => :delete %>
+ <%= display_link_if_authorized "Delete", hash_for_smart_proxy_autosign_path(:smart_proxy_id => @proxy, :id => cert).merge(:auth_ation => :destroy), :confirm => 'Are you sure?', :method => :delete %>
|
<% end -%>
diff --git a/app/views/smart_proxies/index.html.erb b/app/views/smart_proxies/index.html.erb
index 1c0d387..e2950cc 100644
--- a/app/views/smart_proxies/index.html.erb
+++ b/app/views/smart_proxies/index.html.erb
@@ -23,7 +23,7 @@
<% if SETTINGS[:unattended] and proxy.features.include? Feature.find_by_name("DHCP") -%>
<%= display_link_if_authorized "Import Subnets | ", hash_for_import_subnets_path(:smart_proxy_id => proxy) %>
<% end -%>
- <%= display_link_if_authorized "Destr
