[PATCH 4/4] Unified buttons across the whole Conductor

jcoufal at redhat.com jcoufal at redhat.com
Mon Oct 8 12:40:21 UTC 2012


From: Jaromir Coufal <jcoufal at redhat.com>

- Orders
- Save/Cancel at each form
- Table headers unified (texts, orders, button types)
- Component detail headers (orders, types, etc.)
---
 src/app/views/catalogs/_form.html.haml                   |  2 +-
 src/app/views/catalogs/_list.html.haml                   |  4 ++--
 src/app/views/catalogs/show.html.haml                    |  8 ++++----
 src/app/views/deployables/_form.html.haml                |  2 +-
 src/app/views/deployables/_from_url.html.haml            |  2 +-
 src/app/views/deployables/_new_from_image.html.haml      |  2 +-
 src/app/views/deployables/_upload.html.haml              |  2 +-
 src/app/views/deployables/show.html.haml                 |  2 +-
 src/app/views/deployments/_launch_new.html.haml          |  2 +-
 src/app/views/deployments/_list.html.haml                |  2 +-
 src/app/views/deployments/_overview.html.haml            |  2 +-
 src/app/views/deployments/launch_from_catalog.html.haml  |  4 ++--
 src/app/views/deployments/show.html.haml                 |  4 ++--
 src/app/views/hardware_profiles/_form.html.haml          |  5 +++--
 src/app/views/hardware_profiles/_list.html.haml          |  4 ++--
 src/app/views/hardware_profiles/show.html.haml           |  4 ++--
 src/app/views/images/_list.html.haml                     |  4 ++--
 src/app/views/images/_list_for_environment.html.haml     |  4 ++--
 src/app/views/images/_push_all_button.html.mustache      |  2 +-
 src/app/views/images/edit_xml.html.haml                  |  2 +-
 src/app/views/images/import.html.haml                    |  1 +
 src/app/views/images/new.html.haml                       |  4 ++--
 src/app/views/images/overview.html.haml                  |  4 +++-
 src/app/views/images/show.html.haml                      | 10 +++++-----
 src/app/views/instances/_instance_card.html.mustache     |  4 ++--
 src/app/views/instances/show.html.haml                   |  2 +-
 src/app/views/permissions/_form.html.haml                |  2 +-
 src/app/views/permissions/_objects.html.haml             | 11 ++++++-----
 src/app/views/permissions/_permissions.html.haml         | 12 ++++++------
 src/app/views/pool_families/_form.html.haml              |  2 +-
 src/app/views/pool_families/_list.html.haml              | 13 +++++++------
 src/app/views/pool_families/_provider_accounts.html.haml |  2 +-
 src/app/views/pool_families/show.html.haml               |  4 ++--
 src/app/views/pools/_form.html.haml                      |  2 +-
 src/app/views/pools/_list.html.haml                      |  2 +-
 src/app/views/pools/show.html.haml                       |  4 ++--
 src/app/views/provider_accounts/_list.html.haml          |  4 ++--
 src/app/views/provider_accounts/_provider_form.html.haml |  4 +---
 src/app/views/provider_accounts/edit.html.haml           |  2 +-
 src/app/views/provider_accounts/new.html.haml            |  3 ++-
 src/app/views/provider_accounts/show.html.haml           |  5 +++--
 src/app/views/providers/_edit.html.haml                  |  7 +++----
 src/app/views/providers/index.html.haml                  |  2 +-
 src/app/views/providers/new.html.haml                    |  3 ++-
 src/app/views/realms/_form.html.haml                     |  3 ++-
 src/app/views/realms/_list.html.haml                     |  4 ++--
 src/app/views/settings/index.html.haml                   |  2 +-
 src/app/views/settings/self_service.html.haml            |  6 +++---
 src/app/views/user_groups/_form.html.haml                |  3 ++-
 src/app/views/user_groups/_list.html.haml                |  4 ++--
 src/app/views/user_groups/add_members.html.haml          |  2 +-
 src/app/views/user_groups/show.html.haml                 |  6 +++---
 src/app/views/users/_form.html.haml                      |  4 ++--
 src/app/views/users/_list.html.haml                      |  4 ++--
 src/config/locales/en.yml                                |  2 +-
 55 files changed, 110 insertions(+), 102 deletions(-)

diff --git a/src/app/views/catalogs/_form.html.haml b/src/app/views/catalogs/_form.html.haml
index 111569c..8dac92f 100644
--- a/src/app/views/catalogs/_form.html.haml
+++ b/src/app/views/catalogs/_form.html.haml
@@ -11,5 +11,5 @@
       = form.select(:pool_id, @pools.collect{|p| [p.name, p.id]}, :prompt =>  t("catalogs.form.select_pool"))
 
 %fieldset.options
+  = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
   = link_to t('cancel'), catalogs_path, :class => 'button danger'
-  = submit_tag t('save'), :name => 'save', :class => 'button', :id => 'save_button'
diff --git a/src/app/views/catalogs/_list.html.haml b/src/app/views/catalogs/_list.html.haml
index f13c9b0..5483164 100644
--- a/src/app/views/catalogs/_list.html.haml
+++ b/src/app/views/catalogs/_list.html.haml
@@ -1,7 +1,7 @@
 - content_for :form_header do
-  %li= restful_submit_tag t("delete"), "destroy", multi_destroy_catalogs_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
   - if @can_create
-    %li= link_to t("catalogs.new_catalog"), new_catalog_path, :id => 'new_catalog_button', :class => 'button'
+    %li= link_to t("catalogs.new_catalog"), new_catalog_path, :id => 'new_catalog_button', :class => 'button primary'
+  %li= restful_submit_tag t("delete"), "destroy", multi_destroy_catalogs_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
 
 - content_for :filter_controls do
   %li
diff --git a/src/app/views/catalogs/show.html.haml b/src/app/views/catalogs/show.html.haml
index 9956fe3..63f0acf 100644
--- a/src/app/views/catalogs/show.html.haml
+++ b/src/app/views/catalogs/show.html.haml
@@ -8,8 +8,8 @@
       = link_to t('catalogs.new_catalog'), new_catalog_url, :class => 'button primary', :id => 'new_catalog_button'
     .button-group
       - if check_privilege(Privilege::MODIFY, @catalog)
-        = link_to t('edit'), edit_catalog_path(@catalog), :class => 'button pill', :id => 'edit_button'
-        = button_to t("delete"), catalog_path(@catalog), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete'
+        = link_to t('edit'), edit_catalog_path(@catalog), :class => 'button', :id => 'edit_button'
+        = button_to t("delete"), catalog_path(@catalog), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger', :id => 'delete'
   %h1.no-icon= @title
 
 %section.content-section.user
@@ -32,9 +32,9 @@
 
   .content
     - content_for :form_header do
-      %li= restful_submit_tag t("remove"), "destroy", multi_destroy_catalog_deployables_path(@catalog), 'DELETE', :id => 'delete_button', :class => 'button danger'
       - if check_privilege(Privilege::CREATE, Deployable)
-        %li= link_to t("catalog_entries.new_catalog_entry"), new_catalog_deployable_path(@catalog), :class => 'button', :id => 'new_deployable_button'
+        %li= link_to t("catalog_entries.new_catalog_entry"), new_catalog_deployable_path(@catalog), :class => 'button primary', :id => 'new_deployable_button'
+      %li= restful_submit_tag t("remove"), "destroy", multi_destroy_catalog_deployables_path(@catalog), 'DELETE', :id => 'delete_button', :class => 'button danger'
 
     - content_for :filter_controls do
       %li
diff --git a/src/app/views/deployables/_form.html.haml b/src/app/views/deployables/_form.html.haml
index 0a7e11d..e98dc09 100644
--- a/src/app/views/deployables/_form.html.haml
+++ b/src/app/views/deployables/_form.html.haml
@@ -29,5 +29,5 @@
         %span.text_instead_input= link_to t("deployables.properties.edit_deployable_xml"), edit_polymorphic_path([@catalog, @deployable], :edit_xml=>true)
 
 %fieldset.options
+  = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
   = link_to t('cancel'), polymorphic_path([@catalog, @deployable]), :class => 'button danger'
-  = submit_tag t('save'), :name => 'save', :class => 'button', :id => 'save_button'
diff --git a/src/app/views/deployables/_from_url.html.haml b/src/app/views/deployables/_from_url.html.haml
index c238c0f..7869a59 100644
--- a/src/app/views/deployables/_from_url.html.haml
+++ b/src/app/views/deployables/_from_url.html.haml
@@ -29,8 +29,8 @@
         = check_box_tag(:edit_xml, true, false)
 
   %fieldset.options
+    = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
     -if @catalog.present?
       = link_to t('cancel'), catalog_path(@catalog), :class => 'button danger'
     -else
       = link_to t('cancel'), deployables_path, :class => 'button danger'
-    = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
diff --git a/src/app/views/deployables/_new_from_image.html.haml b/src/app/views/deployables/_new_from_image.html.haml
index a56f290..f76cb44 100644
--- a/src/app/views/deployables/_new_from_image.html.haml
+++ b/src/app/views/deployables/_new_from_image.html.haml
@@ -38,8 +38,8 @@
                             = catalog.name
 
       %fieldset.options.align-center
-        = link_to t('deployables.form.cancel'), catalogs_path, :class => 'button danger'
         = submit_tag "#{t'deployables.form.save'}", :name => 'save', :class => 'button primary', :id => 'save_button', :disabled => @save_disabled
+        = link_to t('deployables.form.cancel'), catalogs_path, :class => 'button danger'
 
 :javascript
   function listChecked() {
diff --git a/src/app/views/deployables/_upload.html.haml b/src/app/views/deployables/_upload.html.haml
index 24e621f..3d36203 100644
--- a/src/app/views/deployables/_upload.html.haml
+++ b/src/app/views/deployables/_upload.html.haml
@@ -29,8 +29,8 @@
         = check_box_tag(:edit_xml, true, false)
 
   %fieldset.options
+    = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
     -if @catalog.present?
       = link_to t('cancel'), catalog_path(@catalog), :class => 'button danger'
     -else
       = link_to t('cancel'), deployables_path, :class => 'button danger'
-    = submit_tag t('save'), :name => 'save', :class => 'button primary', :id => 'save_button'
diff --git a/src/app/views/deployables/show.html.haml b/src/app/views/deployables/show.html.haml
index a2ab532..5c8f490 100644
--- a/src/app/views/deployables/show.html.haml
+++ b/src/app/views/deployables/show.html.haml
@@ -83,7 +83,7 @@
           = f.label :catalog_id, t('.choose_catalog')
           = f.select :catalog_id, options_for_select(@catalogs_options.map {|c| [c.name, c.id]})
           = f.hidden_field(:deployable_id, :value => @deployable.id)
-          = f.submit t('.add_catalog'), :id => :add_catalog, :class => 'button pill', :disabled => @catalogs_options.empty?
+          = f.submit t('.add_catalog'), :id => :add_catalog, :class => 'button primary', :disabled => @catalogs_options.empty?
     %h2.catalogs= t('.catalogs')
   .content
     .centered
diff --git a/src/app/views/deployments/_launch_new.html.haml b/src/app/views/deployments/_launch_new.html.haml
index 746fba5..bcfdf99 100644
--- a/src/app/views/deployments/_launch_new.html.haml
+++ b/src/app/views/deployments/_launch_new.html.haml
@@ -40,7 +40,7 @@
           %span#realm-description
 
       %fieldset.options
-        = submit_tag t('.next'), :class => 'button', :id => "next_button"
+        = submit_tag t('.next'), :class => 'button primary', :id => "next_button"
         = link_to t('cancel'), @backlink || pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
 
 
diff --git a/src/app/views/deployments/_list.html.haml b/src/app/views/deployments/_list.html.haml
index 70a8454..d98dc12 100644
--- a/src/app/views/deployments/_list.html.haml
+++ b/src/app/views/deployments/_list.html.haml
@@ -1,6 +1,6 @@
 - content_for :form_header do
   %li= restful_submit_tag "#{t'deployments.list.stop_selected'}", 'stop', multi_stop_deployments_path, 'POST', :class => 'button', :id => "stop_button", 'data-none_selected' => t('deployments.flash.error.none_selected')
-  %li= restful_submit_tag "#{t'deployments.list.delete_selected'}", 'destroy', multi_destroy_deployments_path, 'DELETE', :class => 'button danger', :id => "delete_button", 'data-none_selected' => t('deployments.flash.error.none_selected')
+  %li= restful_submit_tag "#{t'delete'}", 'destroy', multi_destroy_deployments_path, 'DELETE', :class => 'button danger', :id => "delete_button", 'data-none_selected' => t('deployments.flash.error.none_selected')
   = hidden_field_tag 'backlink', request.url
 
 - content_for :filter_controls do
diff --git a/src/app/views/deployments/_overview.html.haml b/src/app/views/deployments/_overview.html.haml
index ea767b3..bb5741f 100644
--- a/src/app/views/deployments/_overview.html.haml
+++ b/src/app/views/deployments/_overview.html.haml
@@ -59,8 +59,8 @@
               - @deployment.deployable_xml.assemblies.each do |assembly|
                 %li.image-id= assembly.image_id
       %fieldset.options.align-center
-        = link_to t(:cancel), pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
         = submit_tag t(:back), :class => 'button'
+        = link_to t(:cancel), pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
         = submit_tag t('.launch'), :id => 'launch_deployment_button', :disabled => (@errors && @errors.any?)
 -# Quota checking to go here as well, once I understand how it works with new code
 
diff --git a/src/app/views/deployments/launch_from_catalog.html.haml b/src/app/views/deployments/launch_from_catalog.html.haml
index cc2cf12..7d7f911 100644
--- a/src/app/views/deployments/launch_from_catalog.html.haml
+++ b/src/app/views/deployments/launch_from_catalog.html.haml
@@ -17,7 +17,7 @@
               %p= deployable.description
             .controls
               = link_to t(".details"),"#", :class => "collapse"
-              = button_to t(".select"), launch_time_params_deployments_path(:deployment => { :name => deployable.name, :pool_id => @catalog.pool.id }, :deployable_id => deployable.id ), :class=> "button pill"
+              = button_to t(".select"), launch_time_params_deployments_path(:deployment => { :name => deployable.name, :pool_id => @catalog.pool.id }, :deployable_id => deployable.id ), :class=> "button primary"
           .details.collapsible.collapsed
             %p= deployable.description
             %table
@@ -43,4 +43,4 @@
 
   .align-center
     %div= will_paginate @deployables
-    %div= link_to t('cancel'), root_path, :class => 'button pill', :id => 'edit_button'
+    %div= link_to t('cancel'), root_path, :class => 'button danger', :id => 'edit_button'
diff --git a/src/app/views/deployments/show.html.haml b/src/app/views/deployments/show.html.haml
index da6d3b0..97a12ec 100644
--- a/src/app/views/deployments/show.html.haml
+++ b/src/app/views/deployments/show.html.haml
@@ -4,11 +4,11 @@
   .obj_actions
     - if check_privilege(Privilege::MODIFY, @deployment)
       .button-group
-        = link_to t('edit'), edit_deployment_path(@deployment), :class => 'button pill',
+        = link_to t('edit'), edit_deployment_path(@deployment), :class => 'button',
                                                                 :id => 'edit_deployment_button'
         = button_to t('delete'), deployment_path(@deployment), :method => :delete,
                                                                :confirm => t("deployments.confirm_delete"),
-                                                               :class => "button pill danger",
+                                                               :class => "button danger",
                                                                :id => 'delete'
   %h1.deployments= @title
 
diff --git a/src/app/views/hardware_profiles/_form.html.haml b/src/app/views/hardware_profiles/_form.html.haml
index a33ccaa..669a383 100644
--- a/src/app/views/hardware_profiles/_form.html.haml
+++ b/src/app/views/hardware_profiles/_form.html.haml
@@ -23,5 +23,6 @@
               = hwpp_form.text_field(:value)
 
 %fieldset.options
-  = hwp_form.submit t('hardware_profiles.form.check_matches'), :class => 'danger button', :id => 'check_matches'
-  = hwp_form.submit t('save'), :class => 'submit button', :id => 'save_button'
+  = hwp_form.submit t('save'), :class => 'submit button primary', :id => 'save_button'
+  = hwp_form.submit t('hardware_profiles.form.check_matches'), :class => 'button', :id => 'check_matches'
+  = link_to t('cancel'), hardware_profiles_path, :class => "button danger"
diff --git a/src/app/views/hardware_profiles/_list.html.haml b/src/app/views/hardware_profiles/_list.html.haml
index 138fef9..648c1a8 100644
--- a/src/app/views/hardware_profiles/_list.html.haml
+++ b/src/app/views/hardware_profiles/_list.html.haml
@@ -1,7 +1,7 @@
 - content_for :form_header do
-  %li= restful_submit_tag t('hardware_profiles.list.delete_selected'), "destroy", multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
   - if check_privilege(Privilege::CREATE, HardwareProfile)
-    %li= link_to t('hardware_profiles.list.new_hardware'), new_hardware_profile_path, :id => 'new_hardware_profile_button', :class => 'button'
+    %li= link_to t('hardware_profiles.list.new_hardware'), new_hardware_profile_path, :id => 'new_hardware_profile_button', :class => 'button primary'
+  %li= restful_submit_tag t('delete'), "destroy", multi_destroy_hardware_profiles_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
 
 - content_for :filter_controls do
   %li
diff --git a/src/app/views/hardware_profiles/show.html.haml b/src/app/views/hardware_profiles/show.html.haml
index 04f1899..9079348 100644
--- a/src/app/views/hardware_profiles/show.html.haml
+++ b/src/app/views/hardware_profiles/show.html.haml
@@ -5,8 +5,8 @@
       = link_to t('hardware_profiles.list.new_hardware'), new_hardware_profile_url, :class => 'button primary', :id => 'new_role_button'
     .button-group
       - if check_privilege(Privilege::MODIFY, @hardware_profile) && !@hardware_profile.provider_hardware_profile?
-        = link_to t('edit'), edit_hardware_profile_path(@hardware_profile), :class => 'button pill', :id => 'edit_button'
-        = button_to t('delete'), hardware_profile_path(@hardware_profile), :method => :delete, :confirm => "Are you sure you want to delete?", :class => 'button pill danger'
+        = link_to t('edit'), edit_hardware_profile_path(@hardware_profile), :class => 'button', :id => 'edit_button'
+        = button_to t('delete'), hardware_profile_path(@hardware_profile), :method => :delete, :confirm => "Are you sure you want to delete?", :class => 'button danger'
   %h1.hardware_profiles= @title
 %section.content-section.hardware_profile
   %header
diff --git a/src/app/views/images/_list.html.haml b/src/app/views/images/_list.html.haml
index 97bcb4f..67d8420 100644
--- a/src/app/views/images/_list.html.haml
+++ b/src/app/views/images/_list.html.haml
@@ -1,9 +1,9 @@
 - content_for :form_header do
   - if @pool_family and check_privilege(Privilege::USE, @pool_family)
-    %li= restful_submit_tag t("delete"), "destroy", multi_destroy_images_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
     - if @pool_family.pools.any?
       %li= link_to t('images.import.import_image'), new_image_path(:tab => 'import', :environment => @pool_family), { :class => 'button primary', :id => 'import_image_button'}
       %li= link_to t('images.index.new'), new_image_path(:environment => @pool_family), { :class => 'button primary', :id => 'import_image_button'}
+    %li= restful_submit_tag t("delete"), "destroy", multi_destroy_images_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
 
 = filter_table(@header, @images) do |image|
   - if @pool_family.nil? and image.environment
@@ -21,4 +21,4 @@
   });
 
 %script#imageRowTemplate{ :type => 'text/html' }
-  = render :partial => 'images/image_row'
\ No newline at end of file
+  = render :partial => 'images/image_row'
diff --git a/src/app/views/images/_list_for_environment.html.haml b/src/app/views/images/_list_for_environment.html.haml
index 0b281f7..7cfa2a1 100644
--- a/src/app/views/images/_list_for_environment.html.haml
+++ b/src/app/views/images/_list_for_environment.html.haml
@@ -1,9 +1,9 @@
 - content_for :form_header do
   - if @pool_family and check_privilege(Privilege::USE, @pool_family)
-    %li= restful_submit_tag t("delete"), "destroy", multi_destroy_images_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
     - if @pool_family.pools.any?
       %li= link_to t('images.import.import_image'), new_image_path(:tab => 'import', :environment => @pool_family), { :class => 'button primary', :id => 'import_image_button'}
       %li= link_to t('images.index.new'), new_image_path(:environment => @pool_family), { :class => 'button primary', :id => 'import_image_button'}
+    %li= restful_submit_tag t("delete"), "destroy", multi_destroy_images_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
 
 = filter_table(@header, @images) do |image|
   - if @pool_family.nil? and image.environment
@@ -21,4 +21,4 @@
   });
 
 %script#imageRowTemplate{ :type => 'text/html' }
-  = render :partial => 'images/image_row_for_environment'
\ No newline at end of file
+  = render :partial => 'images/image_row_for_environment'
diff --git a/src/app/views/images/_push_all_button.html.mustache b/src/app/views/images/_push_all_button.html.mustache
index 1f1db0a..e8bc88b 100644
--- a/src/app/views/images/_push_all_button.html.mustache
+++ b/src/app/views/images/_push_all_button.html.mustache
@@ -1 +1 @@
-<%= button_to(t('images.show.push_all'), '{{push_all_path}}', :class => 'button pill') %>
+<%= button_to(t('images.show.push_all'), '{{push_all_path}}', :class => 'button primary') %>
diff --git a/src/app/views/images/edit_xml.html.haml b/src/app/views/images/edit_xml.html.haml
index a2b7ac7..8650111 100644
--- a/src/app/views/images/edit_xml.html.haml
+++ b/src/app/views/images/edit_xml.html.haml
@@ -18,5 +18,5 @@
 
       .centered
         %fieldset.align-center
-          = link_to t(:cancel), pool_families_path, :class => 'button danger'
           = submit_tag t('.save_and_continue'), :class => 'button primary', :id => 'save_image'
+          = link_to t(:cancel), pool_families_path, :class => 'button danger'
diff --git a/src/app/views/images/import.html.haml b/src/app/views/images/import.html.haml
index 3109c5a..7e80917 100644
--- a/src/app/views/images/import.html.haml
+++ b/src/app/views/images/import.html.haml
@@ -27,3 +27,4 @@
 
       %fieldset.options
         = submit_tag t(:continue), :id => "file_button", :class => "button primary", :disabled => @accounts.empty?
+        = link_to t(:cancel), pool_families_path, :class => "button danger"
diff --git a/src/app/views/images/new.html.haml b/src/app/views/images/new.html.haml
index 2ea9cba..2df2f54 100644
--- a/src/app/views/images/new.html.haml
+++ b/src/app/views/images/new.html.haml
@@ -40,8 +40,8 @@
                 = check_box_tag :edit, 1, true
 
           %fieldset.align-center
-            = link_to t(:cancel), pool_families_path, :class => "button danger"
             = submit_tag t(:continue), :id => "file_button", :class => "button primary", :disabled => @accounts.empty?
+            = link_to t(:cancel), pool_families_path, :class => "button danger"
 
       %section#image-url-form
         = form_tag(edit_xml_images_path, { :multipart => true, :class => 'generic horizontal' }) do
@@ -61,8 +61,8 @@
                 = check_box_tag :edit, 1, true
 
           %fieldset.align-center
-            = link_to t(:cancel), pool_families_path, :class => "button danger"
             = submit_tag t(:continue), :id => "url_button", :class => "button primary", :disabled => @accounts.empty?
+            = link_to t(:cancel), pool_families_path, :class => "button danger"
 
 :javascript
   (function() {
diff --git a/src/app/views/images/overview.html.haml b/src/app/views/images/overview.html.haml
index 4d606b9..5022709 100644
--- a/src/app/views/images/overview.html.haml
+++ b/src/app/views/images/overview.html.haml
@@ -16,8 +16,10 @@
       .lefted.image-upload-overview
         %h2= t('.valid_image')
         %p.description= t('.description', :name => @name)
+        %p.description
 
       .centered
         %fieldset.align-center
-          = submit_tag t('.back'), :name => 'back', :id => 'back_button', :class => 'button'
           = submit_tag t('.save_template'), :name => 'save', :id => 'save_button', :class => 'button primary'
+          = submit_tag t('.edit_xml'), :name => 'back', :id => 'back_button', :class => 'button'
+          = link_to t(:cancel), pool_families_path, :class => 'button danger'
diff --git a/src/app/views/images/show.html.haml b/src/app/views/images/show.html.haml
index 041dccf..1641a11 100644
--- a/src/app/views/images/show.html.haml
+++ b/src/app/views/images/show.html.haml
@@ -6,10 +6,10 @@
       = link_to t('images.index.images'), images_path
     - if @environment and check_privilege(Privilege::USE, @environment)
       .button-group
-        = link_to t('images.show.new_deployable_from_image'), new_deployable_path(:create_from_image => @image.id), :class => 'button pill'
+        = link_to t('images.show.new_deployable_from_image'), new_deployable_path(:create_from_image => @image.id), :class => 'button'
         - unless @image.imported?
-          = link_to t('images.show.template_xml'), template_image_path(@image.uuid), :class => 'button pill'
-        = button_to t("delete"), image_path(@image.id), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete'
+          = link_to t('images.show.template_xml'), template_image_path(@image.uuid), :class => 'button'
+        = button_to t("delete"), image_path(@image.id), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger', :id => 'delete'
   %h1.no-icon= @image.imported? ? @image.name + " (Imported)" : @image.name
 
 - user_can_build = (@environment and check_privilege(Privilege::USE, @environment))
@@ -45,10 +45,10 @@
             - build_text = 'images.show.build'
           - if @account_groups_listing.size > 1
             - build_text << '_all'
-          = button_to t(build_text), rebuild_all_image_path(@image.id), :class => 'button pill' unless @account_groups_listing.blank?
+          = button_to t(build_text), rebuild_all_image_path(@image.id), :class => 'button' unless @account_groups_listing.blank?
           #push-all-btn
             - if @push_all_enabled
-              = button_to t('images.show.push_all'), push_all_image_path(@image.id, :build_id => @build.id), :class => 'button pill'
+              = button_to t('images.show.push_all'), push_all_image_path(@image.id, :build_id => @build.id), :class => 'button'
     %h2= t('images.show.provider_images')
 
   .content
diff --git a/src/app/views/instances/_instance_card.html.mustache b/src/app/views/instances/_instance_card.html.mustache
index 2745fbc..d37b613 100644
--- a/src/app/views/instances/_instance_card.html.mustache
+++ b/src/app/views/instances/_instance_card.html.mustache
@@ -31,14 +31,14 @@
       {{#stop_enabled}}
         <li>
           <%= button_to(t('deployments.pretty_view_show.stop'), stop_instance_path('replace_id').sub('replace_id', '{{id}}'),
-                        :disabled => false, :class => 'button danger') %>
+                        :disabled => false, :class => 'button') %>
         </li>
       {{/stop_enabled}}
 
       {{#reboot_enabled}}
         <li>
           <%= button_to(t('deployments.pretty_view_show.reboot'), reboot_instance_path('replace_id').sub('replace_id', '{{id}}'),
-                        :disabled => false, :class => 'button danger') %>
+                        :disabled => false, :class => 'button') %>
         </li>
       {{/reboot_enabled}}
     </ul>
diff --git a/src/app/views/instances/show.html.haml b/src/app/views/instances/show.html.haml
index 920c860..ab92025 100644
--- a/src/app/views/instances/show.html.haml
+++ b/src/app/views/instances/show.html.haml
@@ -2,7 +2,7 @@
 %header.page-header
   .obj_actions
     - if check_privilege(Privilege::MODIFY, @instance)
-      = link_to t('edit'), edit_instance_path(@instance), :class => 'button pill',
+      = link_to t('edit'), edit_instance_path(@instance), :class => 'button',
                                                           :id => 'edit_instance_button'
   %h1.deployments= @instance.name
 
diff --git a/src/app/views/permissions/_form.html.haml b/src/app/views/permissions/_form.html.haml
index 6b1c04f..ffda9c4 100644
--- a/src/app/views/permissions/_form.html.haml
+++ b/src/app/views/permissions/_form.html.haml
@@ -23,8 +23,8 @@
   = hidden_field_tag :permission_object_id, @permission_object.id
   = hidden_field_tag :path_prefix, @path_prefix
   = hidden_field_tag :use_tabs, @use_tabs
+  = restful_submit_tag t('permissions.form.grant_access'), "create", permissions_path, 'POST', :id => 'save_button', :class => 'button primary'
   = link_to t('cancel'), @return_path, :class => 'button danger'
-  = restful_submit_tag t('permissions.form.grant_access'), "create", permissions_path, 'POST', :id => 'save_button', :class => 'button'
 = filter_table(@header, @entities,
                :filter_controls => :entities_filter_controls) do |entity|
   %tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/permissions/_objects.html.haml b/src/app/views/permissions/_objects.html.haml
index bb316fa..bf96145 100644
--- a/src/app/views/permissions/_objects.html.haml
+++ b/src/app/views/permissions/_objects.html.haml
@@ -1,4 +1,10 @@
 - content_for :permissions_form_header do
+  %span{:id => ("tab-container-1-nav" unless @inline)}
+    - if @show_inherited
+      %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :page => 1), { :class => 'button primary', :id => 'direct_permission_button'}
+    - else
+      %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :page => 1), { :class => 'button primary', :id => 'inherited_permission_button'}
+
   - if not(@show_inherited) && check_privilege(Privilege::PERM_SET)
     %li= restful_submit_tag t('permissions.revoke_access'), "destroy", multi_destroy_permissions_path, 'DELETE', :id => 'revoke_button', :class => 'button danger'
     %li= restful_submit_tag t('edit'), "multi_update", multi_update_permissions_path, 'POST', :id => 'perm_edit_button', :class => 'hidden'
@@ -7,11 +13,6 @@
     = hidden_field_tag :path_prefix, @path_prefix
     = hidden_field_tag :return_path, url_for(@entity.entity_target)
     = hidden_field_tag :use_tabs, @use_tabs ? @use_tabs : (@tabs ? 'yes' : 'no')
-  %span{:id => ("tab-container-1-nav" unless @inline)}
-    - if @show_inherited
-      %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :page => 1), { :class => 'button primary', :id => 'direct_permission_button'}
-    - else
-      %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :page => 1), { :class => 'button primary', :id => 'inherited_permission_button'}
 
 - content_for :permissions_filter_controls do
   %li
diff --git a/src/app/views/permissions/_permissions.html.haml b/src/app/views/permissions/_permissions.html.haml
index aadac1d..ed5723c 100644
--- a/src/app/views/permissions/_permissions.html.haml
+++ b/src/app/views/permissions/_permissions.html.haml
@@ -17,14 +17,14 @@
   %span{:id => ("tab-container-1-nav" unless @inline)}
     - unless @permission_object == BasePermissionObject.general_permission_scope
       - if @show_inherited
-        %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :show_global => false, :page => 1), { :class => 'button primary', :id => 'direct_permission_button'}
-        %li= link_to t('permissions.global_access'), params.merge(:show_inherited => false, :show_global => true, :page => 1), { :class => 'button primary', :id => 'global_permission_button'}
+        %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :show_global => false, :page => 1), { :class => 'button', :id => 'direct_permission_button'}
+        %li= link_to t('permissions.global_access'), params.merge(:show_inherited => false, :show_global => true, :page => 1), { :class => 'button', :id => 'global_permission_button'}
       - elsif @show_global
-        %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :show_global => false, :page => 1), { :class => 'button primary', :id => 'direct_permission_button'}
-        %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :show_global => false, :page => 1), { :class => 'button primary', :id => 'inherited_permission_button'}
+        %li= link_to t('permissions.direct_access'), params.merge(:show_inherited => false, :show_global => false, :page => 1), { :class => 'button', :id => 'direct_permission_button'}
+        %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :show_global => false, :page => 1), { :class => 'button', :id => 'inherited_permission_button'}
       - else
-        %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :show_global => false, :page => 1), { :class => 'button primary', :id => 'inherited_permission_button'}
-        %li= link_to t('permissions.global_access'), params.merge(:show_inherited => false, :show_global => true, :page => 1), { :class => 'button primary', :id => 'global_permission_button'}
+        %li= link_to t('permissions.inherited_access'), params.merge(:show_inherited => true, :show_global => false, :page => 1), { :class => 'button', :id => 'inherited_permission_button'}
+        %li= link_to t('permissions.global_access'), params.merge(:show_inherited => false, :show_global => true, :page => 1), { :class => 'button', :id => 'global_permission_button'}
 
 - content_for :permissions_filter_controls do
   %li
diff --git a/src/app/views/pool_families/_form.html.haml b/src/app/views/pool_families/_form.html.haml
index 906bc6f..19d1bc8 100644
--- a/src/app/views/pool_families/_form.html.haml
+++ b/src/app/views/pool_families/_form.html.haml
@@ -13,5 +13,5 @@
         = quota_form.text_field :maximum_running_instances
 
 %fieldset.options
+  = form.submit t(:save),  :class => "submit button primary"
   = link_to t('cancel'), pool_families_path, :class => 'button danger'
-  = form.submit t(:save),  :class => "submit button"
diff --git a/src/app/views/pool_families/_list.html.haml b/src/app/views/pool_families/_list.html.haml
index e55c3d8..4c98eb1 100644
--- a/src/app/views/pool_families/_list.html.haml
+++ b/src/app/views/pool_families/_list.html.haml
@@ -1,7 +1,7 @@
 %header
   .section-controls
     - if check_privilege(Privilege::CREATE, PoolFamily)
-      = link_to t("pool_families.index.new_pool_family"), new_pool_family_path, :class => 'button pill', :id => 'new_pool_family_button'
+      = link_to t("pool_families.index.new_pool_family"), new_pool_family_path, :class => 'button primary', :id => 'new_pool_family_button'
   %h2.pools= @title
 
 .content
@@ -15,10 +15,11 @@
               = link_to pool_family.name, pool_family
             .section-controls
               - if check_privilege(Privilege::CREATE, Pool, pool_family)
-                = link_to t("pools.new_pool"), new_pool_path(:pool_family_id => pool_family.id), :class => 'pool_family_button'
+                = link_to t("pools.new_pool"), new_pool_path(:pool_family_id => pool_family.id), :class => 'button primary'
               - if pool_family.pools.any? && check_privilege(Privilege::USE, pool_family)
-                = link_to t("images.import.import_image"), new_image_path(:environment => pool_family.id, :tab => 'import'), :class => 'new_image_button'
-                = link_to t("images.new.new_image"), new_image_path( :environment => pool_family.id), :class => 'new_image_button'
+                .button-group
+                  = link_to t("images.import.import_image"), new_image_path(:environment => pool_family.id, :tab => 'import'), :class => 'button primary'
+                  = link_to t("images.new.new_image"), new_image_path( :environment => pool_family.id), :class => 'button primary'
       - unless pool_family.pools.blank?
         %tr
           %th= t("pool_families.index.pool_name")
@@ -49,8 +50,8 @@
             %td= link_to pool.catalogs.first.name, catalog_path(pool.catalogs.first) if pool.catalogs.any?
             %td
               - if check_privilege(Privilege::MODIFY, pool)
-                = link_to t(:edit), edit_pool_path(pool), :class => 'pool_family_button'
-        %tr
+                = link_to t(:edit), edit_pool_path(pool), :class => 'button'
+        %tr.total
           %td= t("pool_families.index.total_statistics")
           %td= family_stats[:deployments]
           %td= family_stats[:total_instances]
diff --git a/src/app/views/pool_families/_provider_accounts.html.haml b/src/app/views/pool_families/_provider_accounts.html.haml
index cfda880..5b8f138 100644
--- a/src/app/views/pool_families/_provider_accounts.html.haml
+++ b/src/app/views/pool_families/_provider_accounts.html.haml
@@ -1,7 +1,7 @@
 - content_for :form_header do
   - if check_privilege(Privilege::MODIFY)
     %li= link_to t('provider_accounts.add_provider_account'), add_provider_accounts_pool_family_path(@pool_family), { :class => 'button primary', :id => 'add_provider_accounts_button'}
-    %li= restful_submit_tag t('provider_accounts.remove_provider_accounts'), "destroy", remove_provider_accounts_pool_family_path(@pool_family), 'POST', :id => 'remove_button', :class => 'button danger'
+    %li= restful_submit_tag t('delete'), "destroy", remove_provider_accounts_pool_family_path(@pool_family), 'POST', :id => 'remove_button', :class => 'button danger'
 
 = filter_table(provider_accounts_header(:without_alert => true), @pool_family.provider_accounts) do |account|
   %tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/pool_families/show.html.haml b/src/app/views/pool_families/show.html.haml
index 7233a73..c3a7a07 100644
--- a/src/app/views/pool_families/show.html.haml
+++ b/src/app/views/pool_families/show.html.haml
@@ -2,8 +2,8 @@
 %header.page-header
   .obj_actions
     .button-group
-      = link_to t('edit'), edit_pool_family_path(@pool_family), :class => 'button pill'
-      = button_to t('delete'), pool_family_path(@pool_family), :method => :delete, :confirm => t("pool_families.confirm_delete"), :class => "button pill danger", :id => 'delete_pool_family_button'
+      = link_to t('edit'), edit_pool_family_path(@pool_family), :class => 'button'
+      = button_to t('delete'), pool_family_path(@pool_family), :method => :delete, :confirm => t("pool_families.confirm_delete"), :class => "button danger", :id => 'delete_pool_family_button'
   %h1.pool_families= @title
 
 %section.content-section.pool_families
diff --git a/src/app/views/pools/_form.html.haml b/src/app/views/pools/_form.html.haml
index 94fa0cd..d8054e5 100644
--- a/src/app/views/pools/_form.html.haml
+++ b/src/app/views/pools/_form.html.haml
@@ -23,7 +23,7 @@
       = form.label :enabled, "#{t('pools.form.pool_enabled')}?", :class => 'checkbox'
 
   %fieldset.options
-    = form.submit t("save"), :class => 'button', :id => 'save_button'
+    = form.submit t("save"), :class => 'button primary', :id => 'save_button'
     - if @pool.pool_family
       = link_to t('cancel'), pool_families_path, :class => 'button danger'
     - else
diff --git a/src/app/views/pools/_list.html.haml b/src/app/views/pools/_list.html.haml
index bd1edd5..331684b 100644
--- a/src/app/views/pools/_list.html.haml
+++ b/src/app/views/pools/_list.html.haml
@@ -1,6 +1,6 @@
 - content_for :form_header do
   - if check_privilege(Privilege::CREATE, Pool)
-    %li= link_to "#{t'pools.new_pool'}", new_pool_path, { :class => 'button', :id => 'new_pool_button' }
+    %li= link_to "#{t'pools.new_pool'}", new_pool_path, { :class => 'button primary', :id => 'new_pool_button' }
   %li= restful_submit_tag "#{t'pools.index.destroy'}", "destroy", multi_destroy_pools_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
 
 - content_for :filter_controls do
diff --git a/src/app/views/pools/show.html.haml b/src/app/views/pools/show.html.haml
index 03317b1..a2f13d3 100644
--- a/src/app/views/pools/show.html.haml
+++ b/src/app/views/pools/show.html.haml
@@ -10,8 +10,8 @@
       = render :partial => 'layouts/catalog_dropdown', :locals => {:catalogs => @pool.catalogs}
     .button-group
       - if check_privilege(Privilege::MODIFY, @pool)
-        = link_to t('edit'), edit_pool_path(@pool), :class => 'button pill', :id => 'edit_pool_button'
-        = button_to t('delete'), pool_path(@pool), :method => :delete, :confirm => t('pools.index.confirm_delete'), :class => "button pill danger", :id => 'delete_pool_button'
+        = link_to t('edit'), edit_pool_path(@pool), :class => 'button', :id => 'edit_pool_button'
+        = button_to t('delete'), pool_path(@pool), :method => :delete, :confirm => t('pools.index.confirm_delete'), :class => "button danger", :id => 'delete_pool_button'
   %h1.pools= @title
 
 = render :partial => 'scoreboard_show'
diff --git a/src/app/views/provider_accounts/_list.html.haml b/src/app/views/provider_accounts/_list.html.haml
index 31f73c7..459630e 100644
--- a/src/app/views/provider_accounts/_list.html.haml
+++ b/src/app/views/provider_accounts/_list.html.haml
@@ -1,8 +1,8 @@
 .content
   - content_for :form_header do
-    %li= restful_submit_tag t('delete'), "destroy", multi_destroy_provider_provider_accounts_path(@provider), 'DELETE', :id => 'delete_button', :class => 'button danger'
     - if check_privilege(Privilege::CREATE, ProviderAccount, @provider)
-      %li= link_to t('provider_accounts.new_provider_account'), new_provider_provider_account_path(@provider), :id => 'new_provider_account', :class => 'button'
+      %li= link_to t('provider_accounts.new_provider_account'), new_provider_provider_account_path(@provider), :id => 'new_provider_account', :class => 'button primary'
+    %li= restful_submit_tag t('delete'), "destroy", multi_destroy_provider_provider_accounts_path(@provider), 'DELETE', :id => 'delete_button', :class => 'button danger'
 
   - content_for :filter_controls do
     %li
diff --git a/src/app/views/provider_accounts/_provider_form.html.haml b/src/app/views/provider_accounts/_provider_form.html.haml
index 2573a35..0a763c8 100644
--- a/src/app/views/provider_accounts/_provider_form.html.haml
+++ b/src/app/views/provider_accounts/_provider_form.html.haml
@@ -24,10 +24,8 @@
   = label_tag t("quotas.quota")
   .input
     = text_field :quota, :maximum_running_instances, :title => t('provider_accounts.form.quota_instances'), :value => @quota.maximum_running_instances || t('provider_accounts.properties.unlimited'), :id => "quota_instances"
-    (
-    %button.linkbutton.nospace{ :type => 'button', :onclick => "set_unlimited_quota(\"quota_instances\");" }
+    %button.linkbutton.nospace{ :type => 'button', :onclick => "set_unlimited_quota(\"quota_instances\");", :class => "button" }
       = t('provider_accounts.form.unlimited_quota')
-    )
 
 :javascript
   function set_unlimited_quota(elem_id) {
diff --git a/src/app/views/provider_accounts/edit.html.haml b/src/app/views/provider_accounts/edit.html.haml
index f2ce8a2..912e7b4 100644
--- a/src/app/views/provider_accounts/edit.html.haml
+++ b/src/app/views/provider_accounts/edit.html.haml
@@ -16,4 +16,4 @@
         = render :partial => "form", :locals => { :form => f }
         %fieldset.options
           = f.submit t('save'), :class => "button", :id => 'save'
-          = link_to t('provider_accounts.edit.delete_account'), provider_provider_account_path(@provider, @provider_account), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger'
+          = link_to t('cancel'), provider_provider_account_path(@provider, @provider_account), :class => 'button danger'
diff --git a/src/app/views/provider_accounts/new.html.haml b/src/app/views/provider_accounts/new.html.haml
index b350d52..1954f11 100644
--- a/src/app/views/provider_accounts/new.html.haml
+++ b/src/app/views/provider_accounts/new.html.haml
@@ -12,4 +12,5 @@
       = form_for([@provider, @provider_account], :url => provider_provider_accounts_path(@provider), :html => {:multipart => true, :class => 'generic horizontal'})  do |f|
         = render :partial => "form", :locals => { :form => f }
         %fieldset.options
-          = f.submit t('save'), :class => "button", :id => 'save'
+          = f.submit t('save'), :class => "button primary", :id => 'save'
+          = link_to t('cancel'), edit_provider_path(@provider, :details_tab => 'accounts'), :class => "button danger"
diff --git a/src/app/views/provider_accounts/show.html.haml b/src/app/views/provider_accounts/show.html.haml
index a46ec37..ee80fdd 100644
--- a/src/app/views/provider_accounts/show.html.haml
+++ b/src/app/views/provider_accounts/show.html.haml
@@ -5,8 +5,9 @@
       =t'return_to'
       = link_to t('provider_accounts.new.cloud_providers'), edit_provider_path(@provider, :details_tab => 'accounts')
     .button-group
-      = link_to t('edit'), edit_provider_provider_account_path(@provider, @provider_account), :class => "button pill", :title => "Edit Provider Account"
-      = link_to t('provider_accounts.show.test_connection'), provider_provider_account_path(@provider, @provider_account, :test_account => true), :class => 'button pill'
+      = link_to t('edit'), edit_provider_provider_account_path(@provider, @provider_account), :class => "button", :title => "Edit Provider Account"
+      = link_to t('provider_accounts.show.test_connection'), provider_provider_account_path(@provider, @provider_account, :test_account => true), :class => 'button'
+      = link_to t('provider_accounts.edit.delete_account'), provider_provider_account_path(@provider, @provider_account), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger'
   %h1.provider_accounts= @title
 
 %section.content-section
diff --git a/src/app/views/providers/_edit.html.haml b/src/app/views/providers/_edit.html.haml
index bf920c8..d7eacb5 100644
--- a/src/app/views/providers/_edit.html.haml
+++ b/src/app/views/providers/_edit.html.haml
@@ -4,7 +4,6 @@
     = render :partial => 'form', :locals => { :form => f, :readonly => !can_edit }
     %fieldset.options
       - if can_edit
-        .button-group
-          = f.submit "#{t'providers.form.save_changes'}", :class => "submit button pill", :id => 'save'
-          = link_to "#{t'providers.form.test_connection'}", edit_provider_path(@provider, :test_provider => true), :class => 'button pill'
-          = link_to "#{t'providers.form.delete_provider'}", provider_path(@provider), :method => :delete, :confirm => t('providers.confirm_delete'), :class => "button pill danger", :id => "delete"
+        = f.submit "#{t'providers.form.save_changes'}", :class => "submit button primary", :id => 'save'
+        = link_to "#{t'providers.form.test_connection'}", edit_provider_path(@provider, :test_provider => true), :class => 'button'
+        = link_to "#{t'providers.form.delete_provider'}", provider_path(@provider), :method => :delete, :confirm => t('providers.confirm_delete'), :class => "button danger", :id => "delete"
diff --git a/src/app/views/providers/index.html.haml b/src/app/views/providers/index.html.haml
index be644b0..e9f5c7f 100644
--- a/src/app/views/providers/index.html.haml
+++ b/src/app/views/providers/index.html.haml
@@ -5,7 +5,7 @@
   .content
     - content_for :form_header do
       - if check_privilege(Privilege::CREATE, Provider)
-        %li= link_to t("providers.index.create_new_provider"), new_provider_path, :class => 'button', :id => "create_new_provider"
+        %li= link_to t("providers.index.create_new_provider"), new_provider_path, :class => 'button primary', :id => "create_new_provider"
 
     - content_for :filter_controls do
       %li
diff --git a/src/app/views/providers/new.html.haml b/src/app/views/providers/new.html.haml
index b2465b1..54144a1 100644
--- a/src/app/views/providers/new.html.haml
+++ b/src/app/views/providers/new.html.haml
@@ -18,4 +18,5 @@
     = form_for @provider, :url => providers_path, :html => {:class => 'generic horizontal'} do |f|
       = render :partial => "form", :locals => { :form => f, :cancel_path => providers_path, :readonly => false }
       %fieldset.options
-        = f.submit t("providers.new.save_provider"), :class => "submit button pill", :id => 'save'
+        = f.submit t("providers.new.save_provider"), :class => "submit button primary", :id => 'save'
+        = link_to t('cancel'), providers_path, :class => 'button danger'
diff --git a/src/app/views/realms/_form.html.haml b/src/app/views/realms/_form.html.haml
index d1ba61c..48beaf6 100644
--- a/src/app/views/realms/_form.html.haml
+++ b/src/app/views/realms/_form.html.haml
@@ -11,4 +11,5 @@
       = form.text_area :description, :title => 'description', :value => @realm.description, :class => 'long'
 
 %fieldset.options
-  = form.submit t('save'), :class => "submit button"
+  = form.submit t('save'), :class => "submit button primary"
+  = link_to t('cancel'), realms_path, :class => 'button danger'
diff --git a/src/app/views/realms/_list.html.haml b/src/app/views/realms/_list.html.haml
index 70d12ab..cd6c514 100644
--- a/src/app/views/realms/_list.html.haml
+++ b/src/app/views/realms/_list.html.haml
@@ -2,9 +2,9 @@
   -# If we add per-realm permissions, move delete permission check to controller
   -# (vs. the all-or-nothing check here)
   - if check_privilege(Privilege::MODIFY, Realm)
-    %li= restful_submit_tag t('realms.list.delete_selected'), "destroy", multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
     - if @provider.nil?
-      %li= link_to t('realms.new_realm'), new_realm_path, :id => 'new_realm_button', :class => 'button'
+      %li= link_to t('realms.new_realm'), new_realm_path, :id => 'new_realm_button', :class => 'button primary'
+    %li= restful_submit_tag t('delete'), "destroy", multi_destroy_realms_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
 
 - content_for :filter_controls do
   %li
diff --git a/src/app/views/settings/index.html.haml b/src/app/views/settings/index.html.haml
index cd7bbdc..994a2c3 100644
--- a/src/app/views/settings/index.html.haml
+++ b/src/app/views/settings/index.html.haml
@@ -9,4 +9,4 @@
     - if check_privilege(Privilege::MODIFY)
       %p
         = t('.permissions_desc')
-        = link_to t(:continue), self_service_settings_path, :class => 'button pill'
+        = link_to t(:continue), self_service_settings_path, :class => 'button'
diff --git a/src/app/views/settings/self_service.html.haml b/src/app/views/settings/self_service.html.haml
index 7194c58..898e9ab 100644
--- a/src/app/views/settings/self_service.html.haml
+++ b/src/app/views/settings/self_service.html.haml
@@ -20,6 +20,6 @@
           %label= t('.instances_quota')
           = text_field :self_service_default_quota, :maximum_running_instances, :class => 'grid_5'
       %fieldset.options
-        .obj_actions.button-group
-          = link_to t('reset'), self_service_settings_path, :class => 'button pill'
-          = submit_tag t(:save), :class => "button pill"
+        .obj_actions
+          = submit_tag t(:save), :class => "button primary"
+          = link_to t('reset'), self_service_settings_path, :class => 'button danger'
diff --git a/src/app/views/user_groups/_form.html.haml b/src/app/views/user_groups/_form.html.haml
index 9fe8169..cf8f92d 100644
--- a/src/app/views/user_groups/_form.html.haml
+++ b/src/app/views/user_groups/_form.html.haml
@@ -22,4 +22,5 @@
       = form.text_area :description, :class => 'long'
 
 %fieldset.options
-  = form.submit "#{t'user_groups.form.save_user_group'}",  :class => "submit button pill"
+  = form.submit "#{t'user_groups.form.save_user_group'}",  :class => "submit button primary"
+  = link_to t('cancel'), @user_group, :class => "button danger"
diff --git a/src/app/views/user_groups/_list.html.haml b/src/app/views/user_groups/_list.html.haml
index c9af5d7..1ae61b4 100644
--- a/src/app/views/user_groups/_list.html.haml
+++ b/src/app/views/user_groups/_list.html.haml
@@ -2,8 +2,8 @@
   %h2#user_groups.groups= @title
 
 - content_for :form_header do
-  %li= restful_submit_tag "#{t'user_groups.list.delete_selected'}", "destroy", multi_destroy_user_groups_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
-  %li= link_to t("user_groups.list.add_user_group"), new_user_group_path, :class => 'button', :id => 'add_user_group_button' unless UserGroup.active_membership_sources.nil?
+  %li= link_to t("user_groups.list.add_user_group"), new_user_group_path, :class => 'button primary', :id => 'add_user_group_button' unless UserGroup.active_membership_sources.nil?
+  %li= restful_submit_tag "#{t'delete'}", "destroy", multi_destroy_user_groups_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
 
 - content_for :filter_controls do
   %li
diff --git a/src/app/views/user_groups/add_members.html.haml b/src/app/views/user_groups/add_members.html.haml
index 828ffb7..48c1ed7 100644
--- a/src/app/views/user_groups/add_members.html.haml
+++ b/src/app/views/user_groups/add_members.html.haml
@@ -12,8 +12,8 @@
       %strong= t("user_groups.choose_members")
   .content
     - content_for :form_footer do
+      = restful_submit_tag t('user_groups.show.add_members'), "add", add_members_user_group_path(@user_group), 'POST', :id => 'save_button', :class => 'button primary'
       = link_to t('cancel'), user_group_path(@user_group), :class => 'button danger'
-      = restful_submit_tag t('user_groups.show.add_members'), "add", add_members_user_group_path(@user_group), 'POST', :id => 'save_button', :class => 'button'
     = filter_table(members_header, @users) do |user|
       %tr{:class => cycle('nostripe','stripe')}
         %td{:class => 'checkbox'}
diff --git a/src/app/views/user_groups/show.html.haml b/src/app/views/user_groups/show.html.haml
index 7b9c351..cf427ea 100644
--- a/src/app/views/user_groups/show.html.haml
+++ b/src/app/views/user_groups/show.html.haml
@@ -8,8 +8,8 @@
       = link_to t('user_groups.new.new_user_group'), new_user_group_url, :class => 'button primary', :id => 'new_user_group_button' unless UserGroup.active_membership_sources.nil?
     .button-group
       - if check_privilege(Privilege::MODIFY, User)
-        = link_to t('edit'), edit_user_group_path(@user_group), :class => 'button pill', :id => 'edit_button'
-        = button_to t("delete"), user_group_path(@user_group), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete'
+        = link_to t('edit'), edit_user_group_path(@user_group), :class => 'button', :id => 'edit_button'
+        = button_to t("delete"), user_group_path(@user_group), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger', :id => 'delete'
   %h1.no-icon= @title
 
 %section.content-section.user
@@ -37,8 +37,8 @@
     .content
       - content_for :form_header do
         - if check_privilege(Privilege::CREATE, Deployable)
+          %li= link_to t("user_groups.show.add_members"), add_members_user_group_path(@user_group), :class => 'button primary', :id => 'add_members_button'
           %li= restful_submit_tag t("remove"), "destroy", remove_members_user_group_path(@user_group), 'DELETE', :id => 'delete_button', :class => 'button danger'
-          %li= link_to t("user_groups.show.add_members"), add_members_user_group_path(@user_group), :class => 'button', :id => 'add_members_button'
 
       - content_for :filter_controls do
         %li
diff --git a/src/app/views/users/_form.html.haml b/src/app/views/users/_form.html.haml
index abbb89a..9c5ee24 100644
--- a/src/app/views/users/_form.html.haml
+++ b/src/app/views/users/_form.html.haml
@@ -37,8 +37,8 @@
           = quota_form.text_field :maximum_running_instances
 
 %fieldset.options
-  = form.submit t('users.form.save_user'),  :class => "submit button pill"
-  = link_to t('cancel'), @user, :class => "button pill danger"
+  = form.submit t('users.form.save_user'),  :class => "submit button primary"
+  = link_to t('cancel'), @user, :class => "button danger"
 
 :javascript
   $('.check_change').change(function(){
diff --git a/src/app/views/users/_list.html.haml b/src/app/views/users/_list.html.haml
index 830c446..18f9a55 100644
--- a/src/app/views/users/_list.html.haml
+++ b/src/app/views/users/_list.html.haml
@@ -2,8 +2,8 @@
   %h2#users.users= @title
 
 - content_for :form_header do
-  %li= restful_submit_tag "#{t'users.list.delete_selected'}", "destroy", multi_destroy_users_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
-  %li= link_to t("users.list.add_user"), new_user_path, :class => 'button', :id => 'add_user_button'
+  %li= link_to t("users.list.add_user"), new_user_path, :class => 'button primary', :id => 'add_user_button'
+  %li= restful_submit_tag "#{t'delete'}", "destroy", multi_destroy_users_path, 'DELETE', :id => 'delete_button', :class => 'button danger'
 
 - content_for :filter_controls do
   %li
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 0fcc5c8..8234f27 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -1019,7 +1019,7 @@ en:
         The markup and image references in "%{name}" were succesfully
         validated. You may now save the image and create a Deployable.
       make_deployable: Automatically make "%{name}" Deployable.
-      back: Back
+      edit_xml: View and Edit Template XML
       save_template: Save Image Template
     not_on_provider: The requested image was not found on the Provider.
   template_xml:
-- 
1.7.11.4




More information about the aeolus-devel mailing list