On Tuesday 27 of September 2011 15:40:22 Jiri Tomasek wrote:
---
src/app/views/catalog_entries/show.haml | 2 +-
src/app/views/catalogs/show.haml | 2 +-
src/app/views/hardware_profiles/show.haml | 2 +-
src/app/views/providers/_edit.haml | 2 +-
src/app/views/realms/show.haml | 2 +-
src/app/views/roles/show.haml | 2 +-
src/app/views/users/show.haml | 2 +-
src/features/catalog_entries.feature | 2 +-
src/features/catalogs.feature | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/app/views/catalog_entries/show.haml
b/src/app/views/catalog_entries/show.haml index 3761dce..8c9d39c 100644
--- a/src/app/views/catalog_entries/show.haml
+++ b/src/app/views/catalog_entries/show.haml
@@ -5,7 +5,7 @@
= link_to 'New Catalog Entry', new_catalog_entry_url, :class =>
'button primary', :id => 'new_catalog_entry_button' .button-group
= link_to 'Edit', edit_catalog_entry_path(@catalog_entry), :class =>
'button pill', :id => 'edit_button' - = link_to
"Delete",
catalog_entry_path(@catalog_entry), :method => 'delete', :confirm =>
"Are
you sure you want to delete?", :class => 'button pill danger', :id =>
'delete' + = button_to "Delete",
catalog_entry_path(@catalog_entry),
:method => 'delete', :confirm => "Are you sure you want to
delete?",
:class => 'button pill danger', :id => 'delete'
%section.admin-content-section.user
%header
diff --git a/src/app/views/catalogs/show.haml
b/src/app/views/catalogs/show.haml index addb834..458b838 100644
--- a/src/app/views/catalogs/show.haml
+++ b/src/app/views/catalogs/show.haml
@@ -5,7 +5,7 @@
= link_to 'New Catalog', new_catalog_url, :class => 'button
primary',
:id => 'new_catalog_entry_button' .button-group
= link_to 'Edit', edit_catalog_path(@catalog), :class => 'button
pill', :id => 'edit_button' - = link_to "Delete",
catalog_path(@catalog), :method => 'delete', :confirm => "Are you sure
you
want to delete?", :class => 'button pill danger', :id =>
'delete' + =
button_to "Delete", catalog_path(@catalog), :method => 'delete',
:confirm
=> "Are you sure you want to delete?", :class => 'button pill
danger', :id
=> 'delete'
%section.admin-content-section.user
%header
diff --git a/src/app/views/hardware_profiles/show.haml
b/src/app/views/hardware_profiles/show.haml index 598773b..8a63c0d 100644
--- a/src/app/views/hardware_profiles/show.haml
+++ b/src/app/views/hardware_profiles/show.haml
@@ -5,7 +5,7 @@
= link_to 'New Hardware Profile', new_hardware_profile_url, :class =>
'button primary', :id => 'new_role_button' .button-group
= link_to 'Edit', edit_hardware_profile_path(@hardware_profile),
:class => 'button pill', :id => 'edit_button' - = link_to
'Delete',
hardware_profile_path(@hardware_profile), :method => :delete, :confirm =>
"Are you sure you want to delete?", :class => 'button pill danger' +
= button_to 'Delete', hardware_profile_path(@hardware_profile), :method =>
:delete, :confirm => "Are you sure you want to delete?", :class =>
'button
pill danger' %section.admin-content-section.hardware_profile
%header
%h2 Properties
diff --git a/src/app/views/providers/_edit.haml
b/src/app/views/providers/_edit.haml index 2829cc3..6dd36bb 100644
--- a/src/app/views/providers/_edit.haml
+++ b/src/app/views/providers/_edit.haml
@@ -2,7 +2,7 @@
= form_for @provider, :url => provider_path(@provider), :html => {
:method => :put, :class => 'generic' } do |f| = render :partial =>
'form',
:locals => { :form => f }
%fieldset.options
- .button-group
+ #obj_actions.button-group
= f.submit "Save Changes", :class => "submit button
pill", :id =>
'save' = link_to "Test Connection", edit_provider_path(@provider,
:test_provider => true), :class => 'button pill' = link_to 'Delete
Provider', provider_path(@provider), :method => :delete, :confirm =>
t('providers.confirm_delete'), :class => "button pill danger", :id
=>
"delete" diff --git a/src/app/views/realms/show.haml
b/src/app/views/realms/show.haml index c9b933a..cbffcdf 100644
--- a/src/app/views/realms/show.haml
+++ b/src/app/views/realms/show.haml
@@ -5,7 +5,7 @@
= link_to 'New Realm', new_realm_url, :class => 'button primary',
:id
=> 'new_realm_button' .button-group
= link_to 'Edit', edit_realm_path(@realm), :class => 'button
pill',
:id => 'edit_realm_button' - = link_to 'Delete',
realm_path(@realm),
:method => :delete, :confirm => "Are you sure you want to delete?",
:class
=> 'button pill danger', :id => 'delete_realm_button' + =
button_to
'Delete', realm_path(@realm), :method => :delete, :confirm => "Are
you
sure you want to delete?", :class => 'button pill danger', :id =>
'delete_realm_button'
%section.admin-content-section.realm
%header
diff --git a/src/app/views/roles/show.haml b/src/app/views/roles/show.haml
index f3930b3..ee1c5f1 100644
--- a/src/app/views/roles/show.haml
+++ b/src/app/views/roles/show.haml
@@ -5,7 +5,7 @@
= link_to 'New Role', new_role_url, :class => 'button primary',
:id =>
'new_role_button' .button-group
= link_to 'Edit', edit_role_path(@role), :class => 'button
pill'
- = link_to 'Delete', role_path(@role), :method => :delete, :class =>
'button pill danger', + = button_to 'Delete', role_path(@role),
:method => :delete, :class => 'button pill danger',
:confirm => "Are you sure you want to delete this role?"
%section.admin-content-section.role
diff --git a/src/app/views/users/show.haml b/src/app/views/users/show.haml
index 46ef1f0..5c0d0ae 100644
--- a/src/app/views/users/show.haml
+++ b/src/app/views/users/show.haml
@@ -17,7 +17,7 @@
%dd= @user.login
#obj_actions.button-group
= link_to 'Edit', edit_user_path(@user), :class =>
'button'
- = link_to 'Delete', user_path(@user), :method => :delete,
:confirm => t('users.confirm_delete'), :class => "button danger"
+
= button_to 'Delete', user_path(@user), :method => :delete, :confirm =>
t('users.confirm_delete'), :class => "button danger" .clear
%dl.user_stats
%ul
diff --git a/src/features/catalog_entries.feature
b/src/features/catalog_entries.feature index 59f2292..4a1bead 100644
--- a/src/features/catalog_entries.feature
+++ b/src/features/catalog_entries.feature
@@ -55,7 +55,7 @@ Feature: Manage Catalog Entries
Given a catalog entry "testdepl1" exists
And I am on the catalog entries page
When I follow "testdepl1"
- And I follow "delete"
+ And I press "delete"
Then there should be only 0 catalog entries
And I should be on the catalog entries page
And I should not see "testdepl1"
diff --git a/src/features/catalogs.feature b/src/features/catalogs.feature
index 0e3fd85..3525246 100644
--- a/src/features/catalogs.feature
+++ b/src/features/catalogs.feature
@@ -39,6 +39,6 @@ Feature: Manage Catalogs
Given there is a "Bad" catalog
And I am on the catalogs page
When I follow "Bad"
- And I follow "delete"
+ And I press "delete"
Then I should be on the catalogs page
And I should not see "Bad"
ACK to patchset.
---
Tomáš Hrčka