Simple Form Fixes for Form Actions

50 files changed, 96 insertions, 96 deletions

diff --git a/app/views/access_authorizations/_form.html.haml b/app/views/access_authorizations/_form.html.haml
index fa417d9..fba4297 100644
--- a/app/views/access_authorizations/_form.html.haml
+++ b/app/views/access_authorizations/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('access_authorizations.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('access_authorizations.form.submit')
diff --git a/app/views/acd_agents/_form.html.haml b/app/views/acd_agents/_form.html.haml
index 3b78bac..df1c2ef 100644
--- a/app/views/acd_agents/_form.html.haml
+++ b/app/views/acd_agents/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('acd_agents.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('acd_agents.form.submit')
diff --git a/app/views/addresses/_form.html.haml b/app/views/addresses/_form.html.haml
index eff9930..4c58009 100644
--- a/app/views/addresses/_form.html.haml
+++ b/app/views/addresses/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('addresses.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('addresses.form.submit')
diff --git a/app/views/automatic_call_distributors/_form.html.haml b/app/views/automatic_call_distributors/_form.html.haml
index fcf133c..d4cf97c 100644
--- a/app/views/automatic_call_distributors/_form.html.haml
+++ b/app/views/automatic_call_distributors/_form.html.haml
@@ -4,5 +4,5 @@
   = render "form_core", :f => f, :join_on => @join_on, :leave_on => @leave_on, :strategies => @strategies
 
 
-  .actions
-    = f.button :submit, conditional_t('automatic_call_distributors.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('automatic_call_distributors.form.submit')
diff --git a/app/views/backup_jobs/_form.html.haml b/app/views/backup_jobs/_form.html.haml
index e0adceb..41d0dc8 100644
--- a/app/views/backup_jobs/_form.html.haml
+++ b/app/views/backup_jobs/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('backup_jobs.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('backup_jobs.form.submit')
diff --git a/app/views/call_forwards/_form.html.haml b/app/views/call_forwards/_form.html.haml
index 7310af3..58ffd78 100644
--- a/app/views/call_forwards/_form.html.haml
+++ b/app/views/call_forwards/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('call_forwards.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('call_forwards.form.submit')
diff --git a/app/views/call_routes/_form.html.haml b/app/views/call_routes/_form.html.haml
index 1415852..0a96060 100644
--- a/app/views/call_routes/_form.html.haml
+++ b/app/views/call_routes/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('call_routes.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('call_routes.form.submit')
diff --git a/app/views/callthroughs/_form.html.haml b/app/views/callthroughs/_form.html.haml
index 99f92d0..870d3f0 100644
--- a/app/views/callthroughs/_form.html.haml
+++ b/app/views/callthroughs/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
+  .form-actions
     = f.button :submit, conditional_t('callthroughs.form.submit')
diff --git a/app/views/conference_invitees/_form.html.haml b/app/views/conference_invitees/_form.html.haml
index 400580d..6ec987b 100644
--- a/app/views/conference_invitees/_form.html.haml
+++ b/app/views/conference_invitees/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('conference_invitees.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('conference_invitees.form.submit')
diff --git a/app/views/conferences/_form.html.haml b/app/views/conferences/_form.html.haml
index 4bee1a4..0a88a00 100644
--- a/app/views/conferences/_form.html.haml
+++ b/app/views/conferences/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('conferences.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('conferences.form.submit')
diff --git a/app/views/fax_accounts/_form.html.haml b/app/views/fax_accounts/_form.html.haml
index 0a5a4c0..de66709 100644
--- a/app/views/fax_accounts/_form.html.haml
+++ b/app/views/fax_accounts/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('fax_accounts.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('fax_accounts.form.submit')
diff --git a/app/views/fax_documents/_form.html.haml b/app/views/fax_documents/_form.html.haml
index e240371..1b1c3be 100644
--- a/app/views/fax_documents/_form.html.haml
+++ b/app/views/fax_documents/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('fax_documents.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('fax_documents.form.submit')
diff --git a/app/views/gateway_parameters/_form.html.haml b/app/views/gateway_parameters/_form.html.haml
index 79342d2..bb98ce0 100644
--- a/app/views/gateway_parameters/_form.html.haml
+++ b/app/views/gateway_parameters/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('gateway_parameters.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('gateway_parameters.form.submit')
diff --git a/app/views/gateway_settings/_form.html.haml b/app/views/gateway_settings/_form.html.haml
index af26d2a..ad4b34b 100644
--- a/app/views/gateway_settings/_form.html.haml
+++ b/app/views/gateway_settings/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
+  .form-actions
     = f.button :submit, conditional_t('gateway_settings.form.submit')
diff --git a/app/views/gateways/_form.html.haml b/app/views/gateways/_form.html.haml
index 5f6d5dd..705d417 100644
--- a/app/views/gateways/_form.html.haml
+++ b/app/views/gateways/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('gateways.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('gateways.form.submit')
diff --git a/app/views/gemeinschaft_setups/new.de.html.haml b/app/views/gemeinschaft_setups/new.de.html.haml
index f977291..3c215d1 100644
--- a/app/views/gemeinschaft_setups/new.de.html.haml
+++ b/app/views/gemeinschaft_setups/new.de.html.haml
@@ -26,5 +26,5 @@
   = f.simple_fields_for :sip_domain, @sip_domain do |s|
     = render "sip_domains/form_core", :f => s
 
-  .actions
-    = f.button :submit, conditional_t('gemeinschaft_setups.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('gemeinschaft_setups.form.submit')
diff --git a/app/views/gemeinschaft_setups/new.html.haml b/app/views/gemeinschaft_setups/new.html.haml
index 44d9c5b..deac19d 100644
--- a/app/views/gemeinschaft_setups/new.html.haml
+++ b/app/views/gemeinschaft_setups/new.html.haml
@@ -26,5 +26,5 @@
   = f.simple_fields_for :sip_domain, @sip_domain do |s|
     = render "sip_domains/form_core", :f => s
 
-  .actions
-    = f.button :submit, conditional_t('gemeinschaft_setups.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('gemeinschaft_setups.form.submit')
diff --git a/app/views/gs_cluster_sync_log_entries/_form.html.haml b/app/views/gs_cluster_sync_log_entries/_form.html.haml
index 2c47d88..28f1848 100644
--- a/app/views/gs_cluster_sync_log_entries/_form.html.haml
+++ b/app/views/gs_cluster_sync_log_entries/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('gs_cluster_sync_log_entries.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('gs_cluster_sync_log_entries.form.submit')
diff --git a/app/views/gs_nodes/_form.html.haml b/app/views/gs_nodes/_form.html.haml
index 28a4e5d..5ff6d40 100644
--- a/app/views/gs_nodes/_form.html.haml
+++ b/app/views/gs_nodes/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('gs_nodes.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('gs_nodes.form.submit')
diff --git a/app/views/gs_parameters/_form.html.haml b/app/views/gs_parameters/_form.html.haml
index ea69e95..eb578ff 100644
--- a/app/views/gs_parameters/_form.html.haml
+++ b/app/views/gs_parameters/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('gs_parameters.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('gs_parameters.form.submit')
diff --git a/app/views/gui_functions/_form.html.haml b/app/views/gui_functions/_form.html.haml
index 0b2a201..b1b68f9 100644
--- a/app/views/gui_functions/_form.html.haml
+++ b/app/views/gui_functions/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('gui_functions.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('gui_functions.form.submit')
diff --git a/app/views/hunt_group_members/_form.html.haml b/app/views/hunt_group_members/_form.html.haml
index 1ab7850..7cdef92 100644
--- a/app/views/hunt_group_members/_form.html.haml
+++ b/app/views/hunt_group_members/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('hunt_group_members.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('hunt_group_members.form.submit')
diff --git a/app/views/hunt_groups/_form.html.haml b/app/views/hunt_groups/_form.html.haml
index bc2663b..86cd433 100644
--- a/app/views/hunt_groups/_form.html.haml
+++ b/app/views/hunt_groups/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('hunt_groups.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('hunt_groups.form.submit')
diff --git a/app/views/intruders/_form.html.haml b/app/views/intruders/_form.html.haml
index 26aab1c..02647f0 100644
--- a/app/views/intruders/_form.html.haml
+++ b/app/views/intruders/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('intruders.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('intruders.form.submit')
diff --git a/app/views/manufacturers/_form.html.haml b/app/views/manufacturers/_form.html.haml
index d89c603..ce4eea4 100644
--- a/app/views/manufacturers/_form.html.haml
+++ b/app/views/manufacturers/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('manufacturers.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('manufacturers.form.submit')
diff --git a/app/views/parking_stalls/_form.html.haml b/app/views/parking_stalls/_form.html.haml
index 60b60b7..f72c190 100644
--- a/app/views/parking_stalls/_form.html.haml
+++ b/app/views/parking_stalls/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('parking_stalls.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('parking_stalls.form.submit')
diff --git a/app/views/phone_book_entries/_form.html.haml b/app/views/phone_book_entries/_form.html.haml
index c73d10a..b579bf4 100644
--- a/app/views/phone_book_entries/_form.html.haml
+++ b/app/views/phone_book_entries/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('phone_book_entries.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('phone_book_entries.form.submit')
diff --git a/app/views/phone_books/_form.html.haml b/app/views/phone_books/_form.html.haml
index 245426b..df5d060 100644
--- a/app/views/phone_books/_form.html.haml
+++ b/app/views/phone_books/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('phone_books.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('phone_books.form.submit')
diff --git a/app/views/phone_models/_form.html.haml b/app/views/phone_models/_form.html.haml
index 45c176f..2b09f6d 100644
--- a/app/views/phone_models/_form.html.haml
+++ b/app/views/phone_models/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('phone_models.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('phone_models.form.submit')
diff --git a/app/views/phone_number_ranges/_form.html.haml b/app/views/phone_number_ranges/_form.html.haml
index a86d45b..d624619 100644
--- a/app/views/phone_number_ranges/_form.html.haml
+++ b/app/views/phone_number_ranges/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('phone_number_ranges.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('phone_number_ranges.form.submit')
diff --git a/app/views/phone_numbers/_form.html.haml b/app/views/phone_numbers/_form.html.haml
index 2812e21..8ef1e90 100644
--- a/app/views/phone_numbers/_form.html.haml
+++ b/app/views/phone_numbers/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
+  .form-actions
     = f.button :submit, conditional_t('phone_numbers.form.submit')
diff --git a/app/views/phone_sip_accounts/_form.html.haml b/app/views/phone_sip_accounts/_form.html.haml
index c2558b8..8b214de 100644
--- a/app/views/phone_sip_accounts/_form.html.haml
+++ b/app/views/phone_sip_accounts/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('phone_sip_accounts.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('phone_sip_accounts.form.submit')
diff --git a/app/views/phones/_form.html.haml b/app/views/phones/_form.html.haml
index 9bfa226..3cb62e6 100644
--- a/app/views/phones/_form.html.haml
+++ b/app/views/phones/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('phones.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('phones.form.submit')
diff --git a/app/views/ringtones/_form.html.haml b/app/views/ringtones/_form.html.haml
index 7dbfcb0..789362f 100644
--- a/app/views/ringtones/_form.html.haml
+++ b/app/views/ringtones/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('ringtones.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('ringtones.form.submit')
diff --git a/app/views/route_elements/_form.html.haml b/app/views/route_elements/_form.html.haml
index 8feacaa..b59be36 100644
--- a/app/views/route_elements/_form.html.haml
+++ b/app/views/route_elements/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('route_elements.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('route_elements.form.submit')
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index f386a5d..75dd3de 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -4,5 +4,5 @@
   = t.input :login_data, :label => t('sessions.form.email'), :autofocus => true
   = t.input :password, :label => t('sessions.form.password'), :required => false
   = t.input :reset_password, :label => t('sessions.form.reset_password'), :as => :boolean
-  .actions
+  .form-actions
     = t.button :submit, :value => 'Login'
diff --git a/app/views/sip_accounts/_form.html.haml b/app/views/sip_accounts/_form.html.haml
index f209bf4..d40ce10 100644
--- a/app/views/sip_accounts/_form.html.haml
+++ b/app/views/sip_accounts/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('sip_accounts.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('sip_accounts.form.submit')
diff --git a/app/views/sip_domains/_form.html.haml b/app/views/sip_domains/_form.html.haml
index 2d662af..83ba7ad 100644
--- a/app/views/sip_domains/_form.html.haml
+++ b/app/views/sip_domains/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('sip_domains.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('sip_domains.form.submit')
diff --git a/app/views/softkeys/_form.html.haml b/app/views/softkeys/_form.html.haml
index 5b799b6..c029ead 100644
--- a/app/views/softkeys/_form.html.haml
+++ b/app/views/softkeys/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('softkeys.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('softkeys.form.submit')
diff --git a/app/views/tenants/_form.html.haml b/app/views/tenants/_form.html.haml
index 1641e78..981293c 100644
--- a/app/views/tenants/_form.html.haml
+++ b/app/views/tenants/_form.html.haml
@@ -20,5 +20,5 @@
     - if GsParameter.get('STRICT_DID_HANDLING') == true
       = f.input :did_list, :label => t('tenants.form.did_list.label'), :hint => conditional_hint('tenants.form.did_list.hint')
 
-  .actions
-    = f.button :submit, conditional_t('tenants.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('tenants.form.submit')
diff --git a/app/views/tenants/_index_core.html.haml b/app/views/tenants/_index_core.html.haml
index a220b1b..2430b67 100644
--- a/app/views/tenants/_index_core.html.haml
+++ b/app/views/tenants/_index_core.html.haml
@@ -13,6 +13,6 @@
           - if current_user && current_user.current_tenant != tenant && current_user.tenants.include?(tenant)
             = simple_form_for([current_user.current_tenant, current_user]) do |f|
               = f.hidden_field :current_tenant_id, :value => tenant.id
-              .actions
+              .form-actions
                 = f.button :submit, conditional_t('tenants.switch_to_tenant')
-        =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => tenant}
\ No newline at end of file
+        =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => tenant}
diff --git a/app/views/user_group_memberships/_form.html.haml b/app/views/user_group_memberships/_form.html.haml
index 3c0fee1..e810597 100644
--- a/app/views/user_group_memberships/_form.html.haml
+++ b/app/views/user_group_memberships/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('user_group_memberships.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('user_group_memberships.form.submit')
diff --git a/app/views/user_groups/_form.html.haml b/app/views/user_groups/_form.html.haml
index 3263fdd..5076e74 100644
--- a/app/views/user_groups/_form.html.haml
+++ b/app/views/user_groups/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('user_groups.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('user_groups.form.submit')
diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml
index 9a75677..90d0e02 100644
--- a/app/views/users/_form.html.haml
+++ b/app/views/users/_form.html.haml
@@ -4,7 +4,7 @@
 
     = render "form_core", :f => f
 
-    .actions
+    .form-actions
       = f.button :submit, conditional_t('users.form.submit')
 - else
   = simple_form_for(@user) do |f|
@@ -12,5 +12,5 @@
 
     = render "form_core", :f => f
 
-    .actions
+    .form-actions
       = f.button :submit, conditional_t('users.form.submit')
diff --git a/app/views/voicemail_messages/_index_core.html.haml b/app/views/voicemail_messages/_index_core.html.haml
index f03002d..5e82761 100644
--- a/app/views/voicemail_messages/_index_core.html.haml
+++ b/app/views/voicemail_messages/_index_core.html.haml
@@ -24,18 +24,18 @@
           %td
             - if ! voicemail_message.flags.blank?
               = t("voicemail_messages.index.flags.#{voicemail_message.flags}")
-          %td.actions
+          %td.form-actions
             - if can?(:show, voicemail_message) && File.readable?(voicemail_message.file_path)
               = link_to t('voicemail_messages.index.actions.download'), sip_account_voicemail_message_path(@sip_account, voicemail_message, :format => :wav), :method => :get
           %td.actions  
             - if @sip_account.registration && can?(:call, voicemail_message)
               = link_to t('voicemail_messages.index.actions.call'), call_sip_account_voicemail_message_path(@sip_account, voicemail_message), :method => :put
-          %td.actions
+          %td.form-actions
             - if can?(:edit, voicemail_message) && voicemail_message.read_epoch > 0
               = link_to t('voicemail_messages.index.actions.mark_unread'), mark_unread_sip_account_voicemail_message_path(@sip_account, voicemail_message), :method => :put
             - else
               = link_to t('voicemail_messages.index.actions.mark_read'), mark_read_sip_account_voicemail_message_path(@sip_account, voicemail_message), :method => :put
-          %td.actions
+          %td.form-actions
             - if can? :destroy, voicemail_message
               = link_to t('voicemail_messages.index.actions.destroy'), sip_account_voicemail_message_path(@sip_account, voicemail_message), :method => :delete
 
diff --git a/app/views/voicemail_settings/_form.html.haml b/app/views/voicemail_settings/_form.html.haml
index 6d5f845..cd43b2d 100644
--- a/app/views/voicemail_settings/_form.html.haml
+++ b/app/views/voicemail_settings/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('voicemail_settings.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('voicemail_settings.form.submit')
diff --git a/app/views/whitelists/_form.html.haml b/app/views/whitelists/_form.html.haml
index c7f787a..71dbe6b 100644
--- a/app/views/whitelists/_form.html.haml
+++ b/app/views/whitelists/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('whitelists.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('whitelists.form.submit')
diff --git a/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml b/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml
index 992ee9c..e740959 100644
--- a/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml
+++ b/lib/generators/nifty/authentication/templates/views/haml/_form.html.haml
@@ -12,5 +12,5 @@
   .field
     = f.label :password_confirmation, "Confirm Password"
     = f.password_field :password_confirmation
-  .actions
+  .form-actions
     = f.submit (@<%= user_singular_name %>.new_record? ? "Sign up" : "Update")
diff --git a/lib/generators/nifty/authentication/templates/views/haml/login.html.haml b/lib/generators/nifty/authentication/templates/views/haml/login.html.haml
index 3aebb44..877d8f9 100644
--- a/lib/generators/nifty/authentication/templates/views/haml/login.html.haml
+++ b/lib/generators/nifty/authentication/templates/views/haml/login.html.haml
@@ -11,7 +11,7 @@
   .field
     = f.label :password
     = f.password_field :password
-  .actions
+  .form-actions
     = f.submit "Log in"
 <%- else -%>
 - form_tag <%= session_plural_name %>_path do
@@ -21,6 +21,6 @@
   .field
     = label_tag :password
     = password_field_tag :password
-  .actions
+  .form-actions
     = submit_tag "Log in"
 <%- end -%>
diff --git a/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml b/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml
index 57cb828..b12f1cb 100644
--- a/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml
+++ b/lib/generators/nifty/scaffold/templates/views/haml/_form.html.haml
@@ -3,5 +3,5 @@
 
   = render "form_core", :f => f
 
-  .actions
-    = f.button :submit, conditional_t('<%= plural_name %>.form.submit')
\ No newline at end of file
+  .form-actions
+    = f.button :submit, conditional_t('<%= plural_name %>.form.submit')