From 902447a1baf7e9d8385c269a601361c8c3f2f14b Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 12 Feb 2013 13:07:05 +0000
Subject: parking_stall added

---
 app/views/parking_stalls/_form.html.haml       |  7 +++++++
 app/views/parking_stalls/_form_core.html.haml  |  6 ++++++
 app/views/parking_stalls/_index_core.html.haml | 17 +++++++++++++++++
 app/views/parking_stalls/edit.html.haml        |  3 +++
 app/views/parking_stalls/index.html.haml       |  6 ++++++
 app/views/parking_stalls/new.html.haml         |  3 +++
 app/views/parking_stalls/show.html.haml        | 19 +++++++++++++++++++
 7 files changed, 61 insertions(+)
 create mode 100644 app/views/parking_stalls/_form.html.haml
 create mode 100644 app/views/parking_stalls/_form_core.html.haml
 create mode 100644 app/views/parking_stalls/_index_core.html.haml
 create mode 100644 app/views/parking_stalls/edit.html.haml
 create mode 100644 app/views/parking_stalls/index.html.haml
 create mode 100644 app/views/parking_stalls/new.html.haml
 create mode 100644 app/views/parking_stalls/show.html.haml

(limited to 'app/views')

diff --git a/app/views/parking_stalls/_form.html.haml b/app/views/parking_stalls/_form.html.haml
new file mode 100644
index 0000000..5b1523b
--- /dev/null
+++ b/app/views/parking_stalls/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for(@parking_stall) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .actions
+    = f.button :submit, conditional_t('parking_stalls.form.submit')
\ No newline at end of file
diff --git a/app/views/parking_stalls/_form_core.html.haml b/app/views/parking_stalls/_form_core.html.haml
new file mode 100644
index 0000000..db68f99
--- /dev/null
+++ b/app/views/parking_stalls/_form_core.html.haml
@@ -0,0 +1,6 @@
+.inputs
+  = f.input :name, :label => t('parking_stalls.form.name.label'), :hint => conditional_hint('parking_stalls.form.name.hint')
+  = f.input :lot, :label => t('parking_stalls.form.lot.label'), :hint => conditional_hint('parking_stalls.form.lot.hint')
+  = f.input :parking_stallable_id, :label => t('parking_stalls.form.parking_stallable_id.label'), :hint => conditional_hint('parking_stalls.form.parking_stallable_id.hint')
+  = f.input :parking_stallable_type, :label => t('parking_stalls.form.parking_stallable_type.label'), :hint => conditional_hint('parking_stalls.form.parking_stallable_type.hint')
+  = f.input :comment, :label => t('parking_stalls.form.comment.label'), :hint => conditional_hint('parking_stalls.form.comment.hint')
diff --git a/app/views/parking_stalls/_index_core.html.haml b/app/views/parking_stalls/_index_core.html.haml
new file mode 100644
index 0000000..fb317a0
--- /dev/null
+++ b/app/views/parking_stalls/_index_core.html.haml
@@ -0,0 +1,17 @@
+%table.table.table-striped
+  %tr
+    %th= t('parking_stalls.index.name')
+    %th= t('parking_stalls.index.lot')
+    %th= t('parking_stalls.index.parking_stallable_id')
+    %th= t('parking_stalls.index.parking_stallable_type')
+    %th= t('parking_stalls.index.comment')
+
+  
+  - for parking_stall in parking_stalls
+    %tr
+      %td= parking_stall.name
+      %td= parking_stall.lot
+      %td= parking_stall.parking_stallable_id
+      %td= parking_stall.parking_stallable_type
+      %td= parking_stall.comment
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => parking_stall}
\ No newline at end of file
diff --git a/app/views/parking_stalls/edit.html.haml b/app/views/parking_stalls/edit.html.haml
new file mode 100644
index 0000000..ec5d97f
--- /dev/null
+++ b/app/views/parking_stalls/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("parking_stalls.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/parking_stalls/index.html.haml b/app/views/parking_stalls/index.html.haml
new file mode 100644
index 0000000..9472ff0
--- /dev/null
+++ b/app/views/parking_stalls/index.html.haml
@@ -0,0 +1,6 @@
+- content_for :title, t("parking_stalls.index.page_title")
+
+- if @parking_stalls && @parking_stalls.count > 0
+  = render "index_core", :parking_stalls => @parking_stalls
+
+= render :partial => 'shared/create_link', :locals => {:child_class => ParkingStall}
\ No newline at end of file
diff --git a/app/views/parking_stalls/new.html.haml b/app/views/parking_stalls/new.html.haml
new file mode 100644
index 0000000..c068e52
--- /dev/null
+++ b/app/views/parking_stalls/new.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("parking_stalls.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/parking_stalls/show.html.haml b/app/views/parking_stalls/show.html.haml
new file mode 100644
index 0000000..a95c111
--- /dev/null
+++ b/app/views/parking_stalls/show.html.haml
@@ -0,0 +1,19 @@
+- content_for :title, t("parking_stalls.show.page_title")
+
+%p
+  %strong= t('parking_stalls.show.name') + ":"
+  = @parking_stall.name
+%p
+  %strong= t('parking_stalls.show.lot') + ":"
+  = @parking_stall.lot
+%p
+  %strong= t('parking_stalls.show.parking_stallable_id') + ":"
+  = @parking_stall.parking_stallable_id
+%p
+  %strong= t('parking_stalls.show.parking_stallable_type') + ":"
+  = @parking_stall.parking_stallable_type
+%p
+  %strong= t('parking_stalls.show.comment') + ":"
+  = @parking_stall.comment
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @parking_stall }
\ No newline at end of file
-- 
cgit v1.2.3


From 36d1a38594361dcd021c23ae9c5040a37d0918df Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Tue, 12 Feb 2013 15:53:49 +0100
Subject: make parking stall child of user/tenant

---
 app/views/parking_stalls/_form.html.haml       | 2 +-
 app/views/parking_stalls/_form_core.html.haml  | 2 --
 app/views/parking_stalls/_index_core.html.haml | 6 +-----
 app/views/parking_stalls/index.html.haml       | 2 +-
 app/views/parking_stalls/show.html.haml        | 8 +-------
 5 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'app/views')

diff --git a/app/views/parking_stalls/_form.html.haml b/app/views/parking_stalls/_form.html.haml
index 5b1523b..60b60b7 100644
--- a/app/views/parking_stalls/_form.html.haml
+++ b/app/views/parking_stalls/_form.html.haml
@@ -1,4 +1,4 @@
-= simple_form_for(@parking_stall) do |f|
+= simple_form_for([@parent, @parking_stall]) do |f|
   = f.error_notification
 
   = render "form_core", :f => f
diff --git a/app/views/parking_stalls/_form_core.html.haml b/app/views/parking_stalls/_form_core.html.haml
index db68f99..add5c53 100644
--- a/app/views/parking_stalls/_form_core.html.haml
+++ b/app/views/parking_stalls/_form_core.html.haml
@@ -1,6 +1,4 @@
 .inputs
   = f.input :name, :label => t('parking_stalls.form.name.label'), :hint => conditional_hint('parking_stalls.form.name.hint')
   = f.input :lot, :label => t('parking_stalls.form.lot.label'), :hint => conditional_hint('parking_stalls.form.lot.hint')
-  = f.input :parking_stallable_id, :label => t('parking_stalls.form.parking_stallable_id.label'), :hint => conditional_hint('parking_stalls.form.parking_stallable_id.hint')
-  = f.input :parking_stallable_type, :label => t('parking_stalls.form.parking_stallable_type.label'), :hint => conditional_hint('parking_stalls.form.parking_stallable_type.hint')
   = f.input :comment, :label => t('parking_stalls.form.comment.label'), :hint => conditional_hint('parking_stalls.form.comment.hint')
diff --git a/app/views/parking_stalls/_index_core.html.haml b/app/views/parking_stalls/_index_core.html.haml
index fb317a0..9f25217 100644
--- a/app/views/parking_stalls/_index_core.html.haml
+++ b/app/views/parking_stalls/_index_core.html.haml
@@ -2,8 +2,6 @@
   %tr
     %th= t('parking_stalls.index.name')
     %th= t('parking_stalls.index.lot')
-    %th= t('parking_stalls.index.parking_stallable_id')
-    %th= t('parking_stalls.index.parking_stallable_type')
     %th= t('parking_stalls.index.comment')
 
   
@@ -11,7 +9,5 @@
     %tr
       %td= parking_stall.name
       %td= parking_stall.lot
-      %td= parking_stall.parking_stallable_id
-      %td= parking_stall.parking_stallable_type
       %td= parking_stall.comment
-      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => parking_stall}
\ No newline at end of file
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => parking_stall.parking_stallable, :child => parking_stall}
\ No newline at end of file
diff --git a/app/views/parking_stalls/index.html.haml b/app/views/parking_stalls/index.html.haml
index 9472ff0..7f82bbe 100644
--- a/app/views/parking_stalls/index.html.haml
+++ b/app/views/parking_stalls/index.html.haml
@@ -3,4 +3,4 @@
 - if @parking_stalls && @parking_stalls.count > 0
   = render "index_core", :parking_stalls => @parking_stalls
 
-= render :partial => 'shared/create_link', :locals => {:child_class => ParkingStall}
\ No newline at end of file
+= render :partial => 'shared/create_link', :locals => {:parent => @parent, :child_class => ParkingStall}
\ No newline at end of file
diff --git a/app/views/parking_stalls/show.html.haml b/app/views/parking_stalls/show.html.haml
index a95c111..583a0ee 100644
--- a/app/views/parking_stalls/show.html.haml
+++ b/app/views/parking_stalls/show.html.haml
@@ -6,14 +6,8 @@
 %p
   %strong= t('parking_stalls.show.lot') + ":"
   = @parking_stall.lot
-%p
-  %strong= t('parking_stalls.show.parking_stallable_id') + ":"
-  = @parking_stall.parking_stallable_id
-%p
-  %strong= t('parking_stalls.show.parking_stallable_type') + ":"
-  = @parking_stall.parking_stallable_type
 %p
   %strong= t('parking_stalls.show.comment') + ":"
   = @parking_stall.comment
 
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @parking_stall }
\ No newline at end of file
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @parking_stall.parking_stallable, :child => @parking_stall }
-- 
cgit v1.2.3


From 62f3f7373844185e763e1430926ebf880b0d5cb5 Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Tue, 12 Feb 2013 17:03:15 +0100
Subject: display whois information

---
 app/views/intruders/show.html.haml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'app/views')

diff --git a/app/views/intruders/show.html.haml b/app/views/intruders/show.html.haml
index 4941e89..325c5e3 100644
--- a/app/views/intruders/show.html.haml
+++ b/app/views/intruders/show.html.haml
@@ -21,6 +21,10 @@
 %p
   %strong= t('intruders.show.contact_ip') + ":"
   = @intruder.contact_ip
+  - if ! @intruder.contact_ip.blank? && Object.const_defined?('Whois')
+    %a.btn.btn-small.btn-success{ :href => intruder_path(@intruder, :whois => @intruder.contact_ip) }
+      %i.icon-info-sign.icon-white
+      = 'Whois'
 %p
   %strong= t('intruders.show.contact_port') + ":"
   = @intruder.contact_port
@@ -46,7 +50,8 @@
   %strong= t('intruders.show.comment') + ":"
   = @intruder.comment
 
-%p
-  %pre= @intruder.whois
-
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @intruder }
+
+- if ! @whois.blank?
+  %p
+    %pre= @whois
-- 
cgit v1.2.3


From bc8ae7a653c7bc182bbdbff91498fa4504b7b9d9 Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Tue, 12 Feb 2013 23:31:23 +0100
Subject: intruder view

---
 app/views/intruders/show.html.haml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/views/intruders/show.html.haml b/app/views/intruders/show.html.haml
index 325c5e3..df50872 100644
--- a/app/views/intruders/show.html.haml
+++ b/app/views/intruders/show.html.haml
@@ -21,10 +21,6 @@
 %p
   %strong= t('intruders.show.contact_ip') + ":"
   = @intruder.contact_ip
-  - if ! @intruder.contact_ip.blank? && Object.const_defined?('Whois')
-    %a.btn.btn-small.btn-success{ :href => intruder_path(@intruder, :whois => @intruder.contact_ip) }
-      %i.icon-info-sign.icon-white
-      = 'Whois'
 %p
   %strong= t('intruders.show.contact_port') + ":"
   = @intruder.contact_port
@@ -55,3 +51,8 @@
 - if ! @whois.blank?
   %p
     %pre= @whois
+
+- elsif ! @intruder.contact_ip.blank? && Object.const_defined?('Whois')
+  %a.btn.btn-small.btn-success{ :href => intruder_path(@intruder, :whois => @intruder.contact_ip) }
+    %i.icon-info-sign.icon-white
+    = 'Whois'
-- 
cgit v1.2.3


From 63963e63d8e211b15bedfd6719d67259440520a2 Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Tue, 12 Feb 2013 23:54:20 +0100
Subject: index view

---
 app/views/intruders/_index_core.html.haml | 33 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'app/views')

diff --git a/app/views/intruders/_index_core.html.haml b/app/views/intruders/_index_core.html.haml
index 0070c4d..31bbd11 100644
--- a/app/views/intruders/_index_core.html.haml
+++ b/app/views/intruders/_index_core.html.haml
@@ -1,37 +1,38 @@
 %table.table.table-striped
   %tr
-    %th= t('intruders.index.list_type')
-    %th= t('intruders.index.key')
+    %th
+    %th= t('intruders.index.contact_ip')
+    %th= t('intruders.index.contact_port')
     %th= t('intruders.index.points')
     %th= t('intruders.index.bans')
     %th= t('intruders.index.ban_last')
     %th= t('intruders.index.ban_end')
-    %th= t('intruders.index.contact_ip')
-    %th= t('intruders.index.contact_port')
     %th= t('intruders.index.contact_count')
     %th= t('intruders.index.contact_last')
     %th= t('intruders.index.contacts_per_second')
-    %th= t('intruders.index.contacts_per_second_max')
     %th= t('intruders.index.user_agent')
     %th= t('intruders.index.to_user')
-    %th= t('intruders.index.comment')
 
   
   - for intruder in intruders
     %tr
-      %td= intruder.list_type
-      %td= intruder.key
-      %td= intruder.points
-      %td= intruder.bans
-      %td= intruder.ban_last
-      %td= intruder.ban_end
+      %td= intruder.list_type.chars.first
       %td= intruder.contact_ip
       %td= intruder.contact_port
+      %td= intruder.points
+      %td= intruder.bans
+      %td 
+        - if intruder.ban_last
+          = l intruder.ban_last, :format => :short
+      %td
+        - if intruder.ban_end
+          = l intruder.ban_end, :format => :short
+
       %td= intruder.contact_count
-      %td= intruder.contact_last
+      %td
+        - if intruder.contact_last
+          = l intruder.contact_last, :format => :short
       %td= intruder.contacts_per_second
-      %td= intruder.contacts_per_second_max
       %td= intruder.user_agent
       %td= intruder.to_user
-      %td= intruder.comment
-      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => intruder}
\ No newline at end of file
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => intruder}
-- 
cgit v1.2.3


From 1b9b5327df5a81957b2042869213bb464c6e03ca Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Wed, 13 Feb 2013 08:47:26 +0100
Subject: dial action added

---
 app/views/config_snom/show.xml.haml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml
index 33204dc..1102ad1 100644
--- a/app/views/config_snom/show.xml.haml
+++ b/app/views/config_snom/show.xml.haml
@@ -176,7 +176,9 @@
             %action
               - softkey[:actions].each do |action|
                 - if action[:type] == :url
-                  %url{:target => action[:target], :when => action[:when]}
+                  %url{:target => action[:target], :when => action[:when], :states => action[:states]}
+                - elsif action[:type] == :dial
+                  %dial{:target => action[:target], :when => action[:when], :states => action[:states], :request_uri => '$(remote_uri)'}
 
   %uploads
     - if @state_settings_url
-- 
cgit v1.2.3


From 79f0dfa8dda5062b66dfc22f07f42ea6604c8de2 Mon Sep 17 00:00:00 2001
From: "Mario \"Kuroir\" Ricalde" <kuroir@gmail.com>
Date: Wed, 13 Feb 2013 01:49:43 -0600
Subject: Nav, user display size enforce and alignment.

The avatar is now fixed to an acceptable size, which is enforced on the
rendering level, rather than by the actual image. Also fixed the
alignment issues.
---
 app/views/layouts/_navbar.html.haml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/views')

diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 7084090..8e09859 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -28,9 +28,9 @@
 
       - if current_user
         %ul.nav.pull-right
-          %li
+          %li.display
             - if current_user.image?
-              =image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded')
+              = image_tag(current_user.image_url(:mini).to_s, :class => 'img-rounded')
             - else
               - if current_user.male?
                 = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
@@ -39,15 +39,15 @@
 
           - if current_page?(tenant_user_path(current_user.current_tenant, current_user))
             %li.active
-              %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} 
+              %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
                 = current_user
           - else
             %li
-              %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)} 
+              %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
                 = current_user
 
           - if single_sign_on_system? == false
             %li
-              %a.navbar-link{:href => log_out_path} 
+              %a.navbar-link{:href => log_out_path}
                 %i.icon-off.icon-white
-            
+
-- 
cgit v1.2.3


From 791bf973b02b626f876b7e5819e2037dcff90f84 Mon Sep 17 00:00:00 2001
From: "Mario \"Kuroir\" Ricalde" <kuroir@gmail.com>
Date: Wed, 13 Feb 2013 05:39:21 -0600
Subject: Simple Form Fixes for Form Actions

---
 app/views/access_authorizations/_form.html.haml       | 4 ++--
 app/views/acd_agents/_form.html.haml                  | 4 ++--
 app/views/addresses/_form.html.haml                   | 4 ++--
 app/views/automatic_call_distributors/_form.html.haml | 4 ++--
 app/views/backup_jobs/_form.html.haml                 | 4 ++--
 app/views/call_forwards/_form.html.haml               | 4 ++--
 app/views/call_routes/_form.html.haml                 | 4 ++--
 app/views/callthroughs/_form.html.haml                | 2 +-
 app/views/conference_invitees/_form.html.haml         | 4 ++--
 app/views/conferences/_form.html.haml                 | 4 ++--
 app/views/fax_accounts/_form.html.haml                | 4 ++--
 app/views/fax_documents/_form.html.haml               | 4 ++--
 app/views/gateway_parameters/_form.html.haml          | 4 ++--
 app/views/gateway_settings/_form.html.haml            | 2 +-
 app/views/gateways/_form.html.haml                    | 4 ++--
 app/views/gemeinschaft_setups/new.de.html.haml        | 4 ++--
 app/views/gemeinschaft_setups/new.html.haml           | 4 ++--
 app/views/gs_cluster_sync_log_entries/_form.html.haml | 4 ++--
 app/views/gs_nodes/_form.html.haml                    | 4 ++--
 app/views/gs_parameters/_form.html.haml               | 4 ++--
 app/views/gui_functions/_form.html.haml               | 4 ++--
 app/views/hunt_group_members/_form.html.haml          | 4 ++--
 app/views/hunt_groups/_form.html.haml                 | 4 ++--
 app/views/intruders/_form.html.haml                   | 4 ++--
 app/views/manufacturers/_form.html.haml               | 4 ++--
 app/views/parking_stalls/_form.html.haml              | 4 ++--
 app/views/phone_book_entries/_form.html.haml          | 4 ++--
 app/views/phone_books/_form.html.haml                 | 4 ++--
 app/views/phone_models/_form.html.haml                | 4 ++--
 app/views/phone_number_ranges/_form.html.haml         | 4 ++--
 app/views/phone_numbers/_form.html.haml               | 2 +-
 app/views/phone_sip_accounts/_form.html.haml          | 4 ++--
 app/views/phones/_form.html.haml                      | 4 ++--
 app/views/ringtones/_form.html.haml                   | 4 ++--
 app/views/route_elements/_form.html.haml              | 4 ++--
 app/views/sessions/new.html.haml                      | 2 +-
 app/views/sip_accounts/_form.html.haml                | 4 ++--
 app/views/sip_domains/_form.html.haml                 | 4 ++--
 app/views/softkeys/_form.html.haml                    | 4 ++--
 app/views/tenants/_form.html.haml                     | 4 ++--
 app/views/tenants/_index_core.html.haml               | 4 ++--
 app/views/user_group_memberships/_form.html.haml      | 4 ++--
 app/views/user_groups/_form.html.haml                 | 4 ++--
 app/views/users/_form.html.haml                       | 4 ++--
 app/views/voicemail_messages/_index_core.html.haml    | 6 +++---
 app/views/voicemail_settings/_form.html.haml          | 4 ++--
 app/views/whitelists/_form.html.haml                  | 4 ++--
 47 files changed, 91 insertions(+), 91 deletions(-)

(limited to 'app/views')

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')
-- 
cgit v1.2.3


From d216accd6f00ec90e19f3171440ae7c5d7cdb53a Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 13 Feb 2013 14:13:04 +0100
Subject: Better UI for FaxDocument#show

---
 app/views/fax_documents/show.html.haml | 62 +++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 24 deletions(-)

(limited to 'app/views')

diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index 41d3bff..de8c1cc 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -2,35 +2,49 @@
 - child = @fax_document
 - parent = @fax_document.fax_account
 
-%p
-  %strong= t('fax_documents.index.state') + ":"
-  = t("fax_documents.states.#{@fax_document.state}")
-
-%p
-  %strong= t('fax_documents.index.result_code') + ":"
-  = @fax_document.result_code
-
-%p
-  %strong= t('fax_documents.index.result_text') + ":"
-  = t("fax_documents.result_codes.code_#{@fax_document.result_code}")
-
-%p
-  %strong= t('fax_documents.show.document_transferred_pages') + ":"
-  = @fax_document.document_transferred_pages
-%p
-  %strong= t('fax_documents.show.remote_station_id') + ":"
-  = @fax_document.remote_station_id
-%p
-  %strong= t('fax_documents.show.fax_resolution') + ":"
-  = @fax_document.fax_resolution
+%table.table.table-striped
+  %tr
+    %td
+      %strong= t('fax_documents.index.state') + ":"
+    %td
+      = t("fax_documents.states.#{@fax_document.state}")
+  %tr
+    %td
+      %strong= t('fax_documents.index.result_code') + ":"
+    %td
+      = @fax_document.result_code
+  %tr
+    %td
+      %strong= t('fax_documents.index.result_text') + ":"
+    %td
+      = t("fax_documents.result_codes.code_#{@fax_document.result_code}")
+  %tr
+    %td
+      %strong= t('fax_documents.show.document_transferred_pages') + ":"
+    %td
+      = @fax_document.document_transferred_pages
+  %tr
+    %td
+      %strong= t('fax_documents.show.remote_station_id') + ":"
+    %td
+      = @fax_document.remote_station_id
+  %tr
+    %td
+      %strong= t('fax_documents.show.fax_resolution') + ":"
+    %td
+      = @fax_document.fax_resolution
 
 - if @fax_document.fax_thumbnails.count > 0
   - i = @fax_document.fax_thumbnails.count
   - i = 10 if i > 10
-  - @fax_document.fax_thumbnails.limit(i).each do |fax_thumbnail|
-    =image_tag fax_thumbnail.thumbnail_url(:medium), :class => 'FaxThumbnail', :alt => "Thumbnail of page \##{fax_thumbnail.position}"
+  %p
+    - @fax_document.fax_thumbnails.limit(i).each do |fax_thumbnail|
+      =image_tag fax_thumbnail.thumbnail_url(:medium), :class => 'FaxThumbnail', :alt => "Thumbnail of page \##{fax_thumbnail.position}"
 
 - if @fax_document.document.path
-  = link_to t("fax_documents.index.actions.download_pdf"), "#{request.protocol}#{request.host_with_port}#{request.fullpath.split("?")[0]}.pdf"
+  %p
+    %a{:href => "#{request.protocol}#{request.host_with_port}#{request.fullpath.split("?")[0]}.pdf"}
+      %i{:class => 'icon-download'}
+      = t("fax_documents.index.actions.download_pdf")
   
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document }
-- 
cgit v1.2.3


From 3db09ff394b92b5d168c32c355d4529fd3861d36 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 13 Feb 2013 15:29:43 +0100
Subject: Improvements in the fax_document model and in FaxDocument#show.

---
 app/views/fax_documents/show.html.haml | 97 +++++++++++++++++++---------------
 1 file changed, 53 insertions(+), 44 deletions(-)

(limited to 'app/views')

diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index de8c1cc..3419d5c 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -2,49 +2,58 @@
 - child = @fax_document
 - parent = @fax_document.fax_account
 
-%table.table.table-striped
-  %tr
-    %td
-      %strong= t('fax_documents.index.state') + ":"
-    %td
-      = t("fax_documents.states.#{@fax_document.state}")
-  %tr
-    %td
-      %strong= t('fax_documents.index.result_code') + ":"
-    %td
-      = @fax_document.result_code
-  %tr
-    %td
-      %strong= t('fax_documents.index.result_text') + ":"
-    %td
-      = t("fax_documents.result_codes.code_#{@fax_document.result_code}")
-  %tr
-    %td
-      %strong= t('fax_documents.show.document_transferred_pages') + ":"
-    %td
-      = @fax_document.document_transferred_pages
-  %tr
-    %td
-      %strong= t('fax_documents.show.remote_station_id') + ":"
-    %td
-      = @fax_document.remote_station_id
-  %tr
-    %td
-      %strong= t('fax_documents.show.fax_resolution') + ":"
-    %td
-      = @fax_document.fax_resolution
+.row
+  .span12
+    %table.table.table-striped
+      %tr
+        %td
+          %strong= t('fax_documents.index.state') + ":"
+        %td
+          = t("fax_documents.states.#{@fax_document.state}")
+      %tr
+        %td
+          %strong= t('fax_documents.index.result_code') + ":"
+        %td
+          = @fax_document.result_code
+      %tr
+        %td
+          %strong= t('fax_documents.index.result_text') + ":"
+        %td
+          = t("fax_documents.result_codes.code_#{@fax_document.result_code}")
+      %tr
+        %td
+          %strong= t('fax_documents.show.document_transferred_pages') + ":"
+        %td
+          = @fax_document.document_transferred_pages
+      %tr
+        %td
+          %strong= t('fax_documents.show.remote_station_id') + ":"
+        %td
+          = @fax_document.remote_station_id
+      %tr
+        %td
+          %strong= t('fax_documents.show.fax_resolution') + ":"
+        %td
+          = @fax_document.fax_resolution
 
-- if @fax_document.fax_thumbnails.count > 0
-  - i = @fax_document.fax_thumbnails.count
-  - i = 10 if i > 10
-  %p
-    - @fax_document.fax_thumbnails.limit(i).each do |fax_thumbnail|
-      =image_tag fax_thumbnail.thumbnail_url(:medium), :class => 'FaxThumbnail', :alt => "Thumbnail of page \##{fax_thumbnail.position}"
+    - if @fax_document.document?
+      %p
+        %a{:href => @fax_document.document.url}
+          %i{:class => 'icon-download'}
+          = t("fax_documents.index.actions.download_pdf") + " (#{number_to_human_size(@fax_document.document.size, :precision => 2)})"
 
-- if @fax_document.document.path
-  %p
-    %a{:href => "#{request.protocol}#{request.host_with_port}#{request.fullpath.split("?")[0]}.pdf"}
-      %i{:class => 'icon-download'}
-      = t("fax_documents.index.actions.download_pdf")
-  
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document }
+.row
+  .span12
+    - if @fax_document.fax_thumbnails.any?
+      %ul.thumbnails
+        - @fax_document.fax_thumbnails.each do |fax_thumbnail|
+          %li.span4
+            %div.thumbnail
+              %a.thumbnail{:href => fax_thumbnail.thumbnail.url}
+                =image_tag(fax_thumbnail.thumbnail.url, :alt => "Page #{fax_thumbnail.position}")
+              %p
+                = "#{fax_thumbnail.position}/#{@fax_document.fax_thumbnails.count}"
+
+.row
+  .span12
+    = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document }
-- 
cgit v1.2.3


From 12a6b6ec57d67da3d4969378a0d930042bcc97bd Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Wed, 13 Feb 2013 17:19:47 +0100
Subject: UI improvments for FaxDocument#index and FaxDocument#show

---
 app/views/fax_documents/_index_core.html.haml | 51 +++++++++++++++++++--------
 app/views/fax_documents/show.html.haml        | 16 ++++++---
 2 files changed, 48 insertions(+), 19 deletions(-)

(limited to 'app/views')

diff --git a/app/views/fax_documents/_index_core.html.haml b/app/views/fax_documents/_index_core.html.haml
index 8559f1c..5355521 100644
--- a/app/views/fax_documents/_index_core.html.haml
+++ b/app/views/fax_documents/_index_core.html.haml
@@ -2,25 +2,34 @@
   %thead
     %tr
       %th= t('fax_documents.index.sent_at')
-      %th= t('fax_documents.index.state')
-      %th= t('fax_documents.index.result')
       %th
         = t('fax_documents.index.phone_number')
         %br
         = t('fax_documents.index.remote_station_id')
       %th= t('fax_documents.index.thumbnails')
+      %th
+      %th
 
   %tbody
     - for fax_document in fax_documents
-      %tr{:id => "fax_document_#{fax_document.id}"}
-        - if fax_document.sent_at
-          %td
-            = "#{fax_document.inbound ? '&#8680;' : '&#8678;'}".html_safe
-            = l fax_document.sent_at, :format => :short
-          %td= t("fax_documents.states.#{fax_document.state}")
-          %td= t("fax_documents.result_codes.code_#{fax_document.result_code}") + " (#{fax_document.result_code})"
+      - case fax_document.state
+        - when 'unsuccessful'
+          - current_status = 'error'
+        - when 'sending'
+          - current_status = 'success'
+        - when 'queued_for_sending'
+          - current_status = 'warning'
         - else
-          %td{ :colspan => 3 }= t("fax_documents.states.#{fax_document.state}")
+          - current_status = ''
+
+      %tr{:class => current_status}
+        %td
+          - case fax_document.state
+            - when 'successful'
+              = "#{fax_document.inbound ? '&#8680;' : '&#8678;'}".html_safe
+              = l fax_document.sent_at, :format => :short
+            - else
+              = t("fax_documents.states.#{fax_document.state}")
         %td
           - if fax_document.inbound
             = "#{fax_document.caller_id_number} #{fax_document.caller_id_name}"
@@ -28,9 +37,21 @@
             = fax_document.destination_phone_number
           %br
           = fax_document.remote_station_id
-        %td 
-          - fax_document.fax_thumbnails.limit(5).each do |fax_thumbnail|
-            =image_tag fax_thumbnail.thumbnail_url(:mini), :class => 'FaxThumbnail', :alt => "Thumbnail of page \##{fax_thumbnail.position}"
-          - if can?(:show, fax_document) && !fax_document.document.blank? && File.readable?(fax_document.document.path)
-            = link_to t('fax_documents.index.actions.download'), fax_account_fax_document_path(@fax_account, fax_document, :format => :pdf), :method => :get
+        %td
+          %ul.thumbnails
+            - fax_document.fax_thumbnails.limit(3).each do |fax_thumbnail|
+              %li.span1
+                %div.thumbnail
+                  %a.thumbnail{:href => fax_thumbnail.thumbnail.url}
+                    =image_tag(fax_thumbnail.thumbnail.url, :alt => "Page #{fax_thumbnail.position}")
+                  %p
+                    %small
+                      = "#{fax_thumbnail.position}/#{fax_document.fax_thumbnails.count}"
+
+          - if fax_document.document?
+            %p
+              %a{:href => fax_document.document.url}
+                %i{:class => 'icon-download'}
+                = t("fax_documents.index.actions.download_pdf") + " (#{number_to_human_size(fax_document.document.size, :precision => 2)})"
+
         =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => fax_document.fax_account, :child => fax_document}
diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index 3419d5c..9925c2f 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -1,11 +1,19 @@
 - content_for :title, t("fax_documents.show.page_title")
-- child = @fax_document
-- parent = @fax_document.fax_account
 
 .row
   .span12
     %table.table.table-striped
-      %tr
+      - case @fax_document.state
+        - when 'unsuccessful'
+          - current_status = 'error'
+        - when 'sending'
+          - current_status = 'success'
+        - when 'queued_for_sending'
+          - current_status = 'warning'
+        - else
+          - current_status = ''
+
+      %tr{:class => current_status}
         %td
           %strong= t('fax_documents.index.state') + ":"
         %td
@@ -46,7 +54,7 @@
   .span12
     - if @fax_document.fax_thumbnails.any?
       %ul.thumbnails
-        - @fax_document.fax_thumbnails.each do |fax_thumbnail|
+        - @fax_document.fax_thumbnails.limit(50).each do |fax_thumbnail|
           %li.span4
             %div.thumbnail
               %a.thumbnail{:href => fax_thumbnail.thumbnail.url}
-- 
cgit v1.2.3


From a1aafe9eec98f91fd76d104964ad98fcafc94a80 Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Thu, 14 Feb 2013 10:42:26 +0100
Subject: language added

---
 app/views/sip_accounts/_form_core.html.haml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/views')

diff --git a/app/views/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml
index 1b96d27..1a8876a 100644
--- a/app/views/sip_accounts/_form_core.html.haml
+++ b/app/views/sip_accounts/_form_core.html.haml
@@ -15,3 +15,4 @@
   = f.input :clip_no_screening, :label => t('sip_accounts.form.clip_no_screening.label'), :hint => conditional_hint('sip_accounts.form.clip_no_screening.hint')
   - if CallForward.where(:phone_number_id => @sip_account.phone_number_ids).count == 0 || @sip_account.callforward_rules_act_per_sip_account == true
     = f.input :callforward_rules_act_per_sip_account, :label => t('sip_accounts.form.callforward_rules_act_per_sip_account.label'), :hint => conditional_hint('sip_accounts.form.callforward_rules_act_per_sip_account.hint')
+  = f.input :language_code, :collection => Language.all.collect{|l| [l.to_s, l.code]}, :label => t('sip_accounts.form.language_code.label'), :hint => conditional_hint('sip_accounts.form.language_id.hint'), :include_blank => false
-- 
cgit v1.2.3


From 124a421b19e08447fa790b65cc969dadd7408539 Mon Sep 17 00:00:00 2001
From: spag <spag@golwen.net>
Date: Thu, 14 Feb 2013 14:46:35 +0100
Subject: fixed subscriptions on newer phone firmware versions

---
 app/views/config_snom/show.xml.haml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'app/views')

diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml
index 1102ad1..3d0edf1 100644
--- a/app/views/config_snom/show.xml.haml
+++ b/app/views/config_snom/show.xml.haml
@@ -90,6 +90,23 @@
     %backlight_idle{:perm => 'RW'}= '0'
     %dim_timer{:perm => 'RW'}= '300'
 
+    / LED
+    %led_on{:perm => 'RW'}= 'ON BUSY IN_A_CALL CALLING IN_A_MEETING URGENT_INTERRUPTIONS_ONLY HOLDING DND ACTIVE INACTIVE BE_RIGHT_BACK AWAY UNAVAILABLE AVAILABLE PhoneHasCall CurrentIdentityHasVoiceMessages PhoneHasVoiceMessages'
+    %led_blink_slow{:perm => 'RW'}= 'PARKED HOLDING_BOSSADMIN Wrap-Up'
+    %led_blink_medium{:perm => 'RW'}= ''
+    %led_blink_fast{:perm => 'RW'}= 'RINGING PhoneHasCallInStateRinging'
+    %led_blink_short_off{:perm => 'RW'}= 'PhoneHasMissedCalls'
+    %led_red{:perm => 'RW'}= 'BUSY IN_A_CALL CALLING IN_A_MEETING URGENT_INTERRUPTIONS_ONLY HOLDING DND'
+    %led_green{:perm => 'RW'}= 'Wrap-Up'
+    %led_orange{:perm => 'RW'}= 'AWAY INACTIVE BE_RIGHT_BACK INACTIVE'
+    %led_blue{:perm => 'RW'}= ''
+    %led_red_green{:perm => 'RW'}= ''
+    %led_red_orange{:perm => 'RW'}= ''
+    %led_green_orange{:perm => 'RW'}= ''
+    %led_call_indicator_usage{:perm => 'RW'}= 'PhoneHasCallInStateRinging PhoneHasCall PhoneHasMissedCalls'
+    %led_message_usage{:perm => 'RW'}= 'CurrentIdentityHasVoiceMessages PhoneHasVoiceMessages'
+
+
     - if @phone.phone_model.name == 'Snom 870'
       / Snom 870 idle icons
       %idle_icon_01{:perm => 'RW'}= '9'
@@ -165,9 +182,9 @@
           - if softkey[:subscription]
             %subscription{:type => 'dialog', :to => softkey[:subscription][:to], :for => softkey[:subscription][:for]}
               %NotifyParsingRules{:type => 'applies'}
-                %level1{:translates_to => 'OK'}= "/dialog-info[@entity=\"sip:#{softkey[:subscription][:to]}\"]"
+                %level1{:translates_to => 'OK'}= "/dialog-info[@entity=\"#{softkey[:subscription][:to]}\"]"
               %NotifyParsingRules{:type => 'state'}
-                %level1{:translates_to => 'available'}= '/dialog-info/dialog/state[.="terminated"]'
+                %level1{:translates_to => 'unknown'}= '/dialog-info/dialog/state[.="terminated"]'
                 %level2{:translates_to => 'ringing'}= '/dialog-info/dialog/state[.="early"]'
                 %level3{:translates_to => 'active'}= '/dialog-info/dialog/state[.="confirmed"]'
                 %level4{:fetch_content => 'true'}= '/dialog-info/dialog/state'
-- 
cgit v1.2.3


From 3d11d0a3a047a12bfd40b61252e269cabac76225 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Fri, 15 Feb 2013 14:49:16 +0100
Subject: Basic structure for sim_cards and sim_card_providers.

---
 app/views/sim_card_providers/_form.html.haml       |  7 +++
 app/views/sim_card_providers/_form_core.html.haml  |  9 +++
 app/views/sim_card_providers/_index_core.html.haml | 21 +++++++
 app/views/sim_card_providers/edit.html.haml        |  3 +
 app/views/sim_card_providers/index.html.haml       |  6 ++
 app/views/sim_card_providers/new.html.haml         |  3 +
 app/views/sim_card_providers/show.html.haml        | 72 ++++++++++++++++++++++
 app/views/sim_cards/_form.html.haml                |  7 +++
 app/views/sim_cards/_form_core.html.haml           |  3 +
 app/views/sim_cards/_index_core.html.haml          | 16 +++++
 app/views/sim_cards/edit.html.haml                 |  3 +
 app/views/sim_cards/index.html.haml                |  6 ++
 app/views/sim_cards/new.html.haml                  |  3 +
 app/views/sim_cards/show.html.haml                 | 32 ++++++++++
 app/views/tenants/_admin_area.de.html.haml         |  3 +
 app/views/tenants/_admin_area.en.html.haml         |  3 +
 .../tenants/_table_of_sim_card_providers.html.haml |  7 +++
 app/views/users/show.html.haml                     |  3 +
 18 files changed, 207 insertions(+)
 create mode 100644 app/views/sim_card_providers/_form.html.haml
 create mode 100644 app/views/sim_card_providers/_form_core.html.haml
 create mode 100644 app/views/sim_card_providers/_index_core.html.haml
 create mode 100644 app/views/sim_card_providers/edit.html.haml
 create mode 100644 app/views/sim_card_providers/index.html.haml
 create mode 100644 app/views/sim_card_providers/new.html.haml
 create mode 100644 app/views/sim_card_providers/show.html.haml
 create mode 100644 app/views/sim_cards/_form.html.haml
 create mode 100644 app/views/sim_cards/_form_core.html.haml
 create mode 100644 app/views/sim_cards/_index_core.html.haml
 create mode 100644 app/views/sim_cards/edit.html.haml
 create mode 100644 app/views/sim_cards/index.html.haml
 create mode 100644 app/views/sim_cards/new.html.haml
 create mode 100644 app/views/sim_cards/show.html.haml
 create mode 100644 app/views/tenants/_table_of_sim_card_providers.html.haml

(limited to 'app/views')

diff --git a/app/views/sim_card_providers/_form.html.haml b/app/views/sim_card_providers/_form.html.haml
new file mode 100644
index 0000000..73953e0
--- /dev/null
+++ b/app/views/sim_card_providers/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for(@sim_card_provider) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .form-actions
+    = f.button :submit, conditional_t('sim_card_providers.form.submit')
diff --git a/app/views/sim_card_providers/_form_core.html.haml b/app/views/sim_card_providers/_form_core.html.haml
new file mode 100644
index 0000000..fc36579
--- /dev/null
+++ b/app/views/sim_card_providers/_form_core.html.haml
@@ -0,0 +1,9 @@
+.inputs
+  = f.input :name, :label => t('sim_card_providers.form.name.label'), :hint => conditional_hint('sim_card_providers.form.name.hint')
+  = f.input :homepage_url, :label => t('sim_card_providers.form.homepage_url.label'), :hint => conditional_hint('sim_card_providers.form.homepage_url.hint')
+  = f.input :docu_url, :label => t('sim_card_providers.form.docu_url.label'), :hint => conditional_hint('sim_card_providers.form.docu_url.hint')
+  = f.input :api_server_url, :label => t('sim_card_providers.form.api_server_url.label'), :hint => conditional_hint('sim_card_providers.form.api_server_url.hint')
+  = f.input :api_username, :label => t('sim_card_providers.form.api_username.label'), :hint => conditional_hint('sim_card_providers.form.api_username.hint')
+  = f.input :api_password, :label => t('sim_card_providers.form.api_password.label'), :hint => conditional_hint('sim_card_providers.form.api_password.hint')
+  = f.input :sip_server, :label => t('sim_card_providers.form.sip_server.label'), :hint => conditional_hint('sim_card_providers.form.sip_server.hint')
+  = f.input :include_order_card_function, :label => t('sim_card_providers.form.include_order_card_function.label'), :hint => conditional_hint('sim_card_providers.form.include_order_card_function.hint')
diff --git a/app/views/sim_card_providers/_index_core.html.haml b/app/views/sim_card_providers/_index_core.html.haml
new file mode 100644
index 0000000..6a24695
--- /dev/null
+++ b/app/views/sim_card_providers/_index_core.html.haml
@@ -0,0 +1,21 @@
+%table.table.table-striped
+  %tr
+    %th= t('sim_card_providers.index.name')
+    %th= t('sim_card_providers.index.api_server_url')
+    %th= t('sim_card_providers.index.api_username')
+    %th= t('sim_card_providers.index.api_password')
+    %th= t('sim_card_providers.index.sip_server')
+    %th
+
+  - for sim_card_provider in sim_card_providers
+    %tr
+      %td
+        - if sim_card_provider.homepage_url.blank?
+          = sim_card_provider.name
+        - else
+          = link_to sim_card_provider.name, sim_card_provider.homepage_url 
+      %td= sim_card_provider.api_server_url
+      %td= sim_card_provider.api_username
+      %td= sim_card_provider.api_password
+      %td= sim_card_provider.sip_server
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => sim_card_provider}
\ No newline at end of file
diff --git a/app/views/sim_card_providers/edit.html.haml b/app/views/sim_card_providers/edit.html.haml
new file mode 100644
index 0000000..49b1f93
--- /dev/null
+++ b/app/views/sim_card_providers/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("sim_card_providers.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/sim_card_providers/index.html.haml b/app/views/sim_card_providers/index.html.haml
new file mode 100644
index 0000000..2264e53
--- /dev/null
+++ b/app/views/sim_card_providers/index.html.haml
@@ -0,0 +1,6 @@
+- content_for :title, t("sim_card_providers.index.page_title")
+
+- if @sim_card_providers && @sim_card_providers.count > 0
+  = render "index_core", :sim_card_providers => @sim_card_providers
+
+= render :partial => 'shared/create_link', :locals => {:child_class => SimCardProvider}
\ No newline at end of file
diff --git a/app/views/sim_card_providers/new.html.haml b/app/views/sim_card_providers/new.html.haml
new file mode 100644
index 0000000..04c0445
--- /dev/null
+++ b/app/views/sim_card_providers/new.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("sim_card_providers.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/sim_card_providers/show.html.haml b/app/views/sim_card_providers/show.html.haml
new file mode 100644
index 0000000..37635d9
--- /dev/null
+++ b/app/views/sim_card_providers/show.html.haml
@@ -0,0 +1,72 @@
+- content_for :title, t("sim_card_providers.show.page_title")
+
+.row
+  .span6
+    %table.table.table-striped
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.name') + ":"
+        %td
+          = @sim_card_provider.name
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.homepage_url') + ":"
+        %td
+          = @sim_card_provider.homepage_url
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.docu_url') + ":"
+        %td
+          = @sim_card_provider.docu_url
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.api_server_url') + ":"
+        %td
+          = @sim_card_provider.api_server_url
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.api_username') + ":"
+        %td
+          = @sim_card_provider.api_username
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.api_password') + ":"
+        %td
+          = @sim_card_provider.api_password
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.ref') + ":"
+        %td
+          = @sim_card_provider.ref
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.sip_server') + ":"
+        %td
+          = @sim_card_provider.sip_server
+      %tr
+        %td
+          %strong= t('sim_card_providers.show.include_order_card_function') + ":"
+        %td
+          = @sim_card_provider.include_order_card_function
+
+    = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @sim_card_provider }
+
+.row
+  .span12
+    %h2= t("sim_cards.index.page_title")
+
+    %table.table.table-striped
+      %tr
+        %th= t('sim_cards.index.sip_account_id')
+        %th= t('sim_cards.index.auth_key')
+        %th= t('sim_cards.index.state')
+        %th
+      
+      - for sim_card in @sim_card_provider.sim_cards
+        %tr
+          %td= sim_card.sip_account
+          %td= sim_card.auth_key
+          %td= sim_card.state
+          =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @sim_card_provider, :child => sim_card}
+
+    = render :partial => 'shared/create_link', :locals => {:parent => @sim_card_provider, :child_class => SimCard}
\ No newline at end of file
diff --git a/app/views/sim_cards/_form.html.haml b/app/views/sim_cards/_form.html.haml
new file mode 100644
index 0000000..7d3cfbe
--- /dev/null
+++ b/app/views/sim_cards/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for([@sim_card_provider, @sim_card]) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .form-actions
+    = f.button :submit, conditional_t('sim_cards.form.submit')
diff --git a/app/views/sim_cards/_form_core.html.haml b/app/views/sim_cards/_form_core.html.haml
new file mode 100644
index 0000000..7cba4e9
--- /dev/null
+++ b/app/views/sim_cards/_form_core.html.haml
@@ -0,0 +1,3 @@
+.inputs
+  = f.input :sim_number, :label => t('sim_cards.form.sim_number.label'), :hint => conditional_hint('sim_cards.form.sim_number.hint')
+  = f.association :sip_account, :collection => @available_sip_accounts, :label => t('phone_sip_accounts.form.sip_account_id.label'), :hint => conditional_hint('phone_sip_accounts.form.sip_account_id.hint'), :include_blank => false
\ No newline at end of file
diff --git a/app/views/sim_cards/_index_core.html.haml b/app/views/sim_cards/_index_core.html.haml
new file mode 100644
index 0000000..c36b22b
--- /dev/null
+++ b/app/views/sim_cards/_index_core.html.haml
@@ -0,0 +1,16 @@
+%table.table.table-striped
+  %tr
+    %th= t('sim_cards.index.sip_account_id')
+    %th= t('sip_accounts.index.phone_numbers')
+    %th= t('sim_cards.index.auth_key')
+    %th= t('sim_cards.index.state')
+    %th
+  
+  - for sim_card in sim_cards
+    %tr
+      %td= sim_card.sip_account
+      %td
+        = render 'phone_numbers/listing', :phone_numbers => sim_card.sip_account.phone_numbers.order(:number)
+      %td= sim_card.auth_key
+      %td= sim_card.state
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @parent, :child => sim_card}
\ No newline at end of file
diff --git a/app/views/sim_cards/edit.html.haml b/app/views/sim_cards/edit.html.haml
new file mode 100644
index 0000000..97ee10e
--- /dev/null
+++ b/app/views/sim_cards/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("sim_cards.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/sim_cards/index.html.haml b/app/views/sim_cards/index.html.haml
new file mode 100644
index 0000000..803bd72
--- /dev/null
+++ b/app/views/sim_cards/index.html.haml
@@ -0,0 +1,6 @@
+- content_for :title, t("sim_cards.index.page_title")
+
+- if @sim_cards && @sim_cards.count > 0
+  = render "index_core", :sim_cards => @sim_cards
+
+= render :partial => 'shared/create_link', :locals => {:parent => @parent, :child_class => SimCard}
\ No newline at end of file
diff --git a/app/views/sim_cards/new.html.haml b/app/views/sim_cards/new.html.haml
new file mode 100644
index 0000000..1eef168
--- /dev/null
+++ b/app/views/sim_cards/new.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("sim_cards.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/sim_cards/show.html.haml b/app/views/sim_cards/show.html.haml
new file mode 100644
index 0000000..88822f1
--- /dev/null
+++ b/app/views/sim_cards/show.html.haml
@@ -0,0 +1,32 @@
+- content_for :title, t("sim_cards.show.page_title")
+
+.row
+  .span6
+    %table.table.table-striped
+      %tr
+        %td
+          %strong= t('sim_cards.show.sip_account_id') + ":"
+        %td
+          = @sim_card.sip_account
+      %tr
+        %td
+          %strong= t('sip_accounts.index.phone_numbers')
+        %td
+          = render 'phone_numbers/listing', :phone_numbers => @sim_card.sip_account.phone_numbers.order(:number)
+      %tr
+        %td
+          %strong= t('sim_cards.show.auth_key') + ":"
+        %td
+          = @sim_card.auth_key
+      %tr
+        %td
+          %strong= t('sim_cards.show.state') + ":"
+        %td
+          = @sim_card.state
+      %tr
+        %td
+          %strong= t('sim_cards.show.log') + ":"
+        %td
+          = @sim_card.log
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @parent, :child => @sim_card }
\ No newline at end of file
diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml
index 2aed4e1..8acc95d 100644
--- a/app/views/tenants/_admin_area.de.html.haml
+++ b/app/views/tenants/_admin_area.de.html.haml
@@ -35,6 +35,9 @@
             = succeed '.' do
               =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer)
 
+      - if GsParameter.get('SIM_CARDS') == true
+        = render :partial => 'tenants/table_of_sim_card_providers'
+
       = render :partial => 'call_routes', :locals => {:tenant => tenant}
 
       = render :partial => 'gateways', :locals => {:tenant => tenant, :gateways => gateways}
diff --git a/app/views/tenants/_admin_area.en.html.haml b/app/views/tenants/_admin_area.en.html.haml
index 8e7bfea..c40e3ca 100644
--- a/app/views/tenants/_admin_area.en.html.haml
+++ b/app/views/tenants/_admin_area.en.html.haml
@@ -35,6 +35,9 @@
             = succeed '.' do
               =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer)
 
+      - if GsParameter.get('SIM_CARDS') == true
+        = render :partial => 'tenants/table_of_sim_card_providers'
+
       = render :partial => 'call_routes', :locals => {:tenant => tenant}
 
       = render :partial => 'gateways', :locals => {:tenant => tenant, :gateways => gateways}
diff --git a/app/views/tenants/_table_of_sim_card_providers.html.haml b/app/views/tenants/_table_of_sim_card_providers.html.haml
new file mode 100644
index 0000000..135bb65
--- /dev/null
+++ b/app/views/tenants/_table_of_sim_card_providers.html.haml
@@ -0,0 +1,7 @@
+- cache(['tenant_show_table_of_sim_card_providers', I18n.locale, SimCardProvider.count, SimCardProvider.reorder(:updated_at).last]) do
+  -# SIM card providers
+  -#
+  %h2= t('sim_card_providers.index.page_title')
+  - if SimCardProvider.any?
+    = render "sim_card_providers/index_core", :sim_card_providers => SimCardProvider.all
+  = render :partial => 'shared/create_link', :locals => {:child_class => SimCardProvider}
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index c63c791..ba38547 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -67,6 +67,9 @@
     - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do
       = render :partial => 'phones', :locals => {:user => @user}
 
+    / - cache(['user_show_sim_cards_overview', I18n.locale, @user, @user.phones]) do
+    /   = render :partial => 'phones', :locals => {:user => @user}
+
     - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do
       = render :partial => 'fax_accounts', :locals => {:user => @user}
 
-- 
cgit v1.2.3


From 14e8e9923666991703f747a4abfd6fbfb96d2dc1 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Fri, 15 Feb 2013 15:03:37 +0100
Subject: Show sim_cards of a user. Misc.

---
 app/views/sim_cards/_form_core.html.haml  | 2 +-
 app/views/sim_cards/_index_core.html.haml | 2 +-
 app/views/users/show.html.haml            | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'app/views')

diff --git a/app/views/sim_cards/_form_core.html.haml b/app/views/sim_cards/_form_core.html.haml
index 7cba4e9..7223294 100644
--- a/app/views/sim_cards/_form_core.html.haml
+++ b/app/views/sim_cards/_form_core.html.haml
@@ -1,3 +1,3 @@
 .inputs
-  = f.input :sim_number, :label => t('sim_cards.form.sim_number.label'), :hint => conditional_hint('sim_cards.form.sim_number.hint')
+  = f.input :sim_number, :label => t('sim_cards.form.sim_number.label'), :hint => conditional_hint('sim_cards.form.sim_number.hint'), :autofocus => true
   = f.association :sip_account, :collection => @available_sip_accounts, :label => t('phone_sip_accounts.form.sip_account_id.label'), :hint => conditional_hint('phone_sip_accounts.form.sip_account_id.hint'), :include_blank => false
\ No newline at end of file
diff --git a/app/views/sim_cards/_index_core.html.haml b/app/views/sim_cards/_index_core.html.haml
index c36b22b..460c8ba 100644
--- a/app/views/sim_cards/_index_core.html.haml
+++ b/app/views/sim_cards/_index_core.html.haml
@@ -13,4 +13,4 @@
         = render 'phone_numbers/listing', :phone_numbers => sim_card.sip_account.phone_numbers.order(:number)
       %td= sim_card.auth_key
       %td= sim_card.state
-      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @parent, :child => sim_card}
\ No newline at end of file
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => sim_card.sim_card_provider, :child => sim_card}
\ No newline at end of file
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index ba38547..dca8cff 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -67,8 +67,10 @@
     - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do
       = render :partial => 'phones', :locals => {:user => @user}
 
-    / - cache(['user_show_sim_cards_overview', I18n.locale, @user, @user.phones]) do
-    /   = render :partial => 'phones', :locals => {:user => @user}
+    - if GsParameter.get('SIM_CARDS') == true
+      - cache(['user_show_sim_cards_overview', I18n.locale, @user, @user.sim_cards]) do
+        %h2=t('sim_cards.index.page_title')
+        = render :partial => 'sim_cards/index_core', :locals => {:parent => @user.sim_cards.first.sim_card_provider, :sim_cards => @user.sim_cards}
 
     - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do
       = render :partial => 'fax_accounts', :locals => {:user => @user}
-- 
cgit v1.2.3


From b1cbfe7a7bd5e966be14b71be4e201cc9e2b1aa6 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Fri, 15 Feb 2013 15:56:16 +0100
Subject: Activate a new sim_card.

---
 app/views/sim_cards/_index_core.html.haml | 2 ++
 app/views/sim_cards/show.html.haml        | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'app/views')

diff --git a/app/views/sim_cards/_index_core.html.haml b/app/views/sim_cards/_index_core.html.haml
index 460c8ba..16440ff 100644
--- a/app/views/sim_cards/_index_core.html.haml
+++ b/app/views/sim_cards/_index_core.html.haml
@@ -1,5 +1,6 @@
 %table.table.table-striped
   %tr
+    %th= t('sim_cards.show.sim_number')
     %th= t('sim_cards.index.sip_account_id')
     %th= t('sip_accounts.index.phone_numbers')
     %th= t('sim_cards.index.auth_key')
@@ -8,6 +9,7 @@
   
   - for sim_card in sim_cards
     %tr
+      %td= sim_card.sim_number
       %td= sim_card.sip_account
       %td
         = render 'phone_numbers/listing', :phone_numbers => sim_card.sip_account.phone_numbers.order(:number)
diff --git a/app/views/sim_cards/show.html.haml b/app/views/sim_cards/show.html.haml
index 88822f1..4752aab 100644
--- a/app/views/sim_cards/show.html.haml
+++ b/app/views/sim_cards/show.html.haml
@@ -3,6 +3,11 @@
 .row
   .span6
     %table.table.table-striped
+      %tr
+        %td
+          %strong= t('sim_cards.show.sim_number') + ":"
+        %td
+          = @sim_card.sim_number
       %tr
         %td
           %strong= t('sim_cards.show.sip_account_id') + ":"
-- 
cgit v1.2.3


From 8474fe8ce8fe660ae65a59ed4fcad31c2e5647a2 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Fri, 15 Feb 2013 16:07:47 +0100
Subject: Bugfix

---
 app/views/users/show.html.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index dca8cff..0f6cc2c 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -70,7 +70,8 @@
     - if GsParameter.get('SIM_CARDS') == true
       - cache(['user_show_sim_cards_overview', I18n.locale, @user, @user.sim_cards]) do
         %h2=t('sim_cards.index.page_title')
-        = render :partial => 'sim_cards/index_core', :locals => {:parent => @user.sim_cards.first.sim_card_provider, :sim_cards => @user.sim_cards}
+        = render :partial => 'sim_cards/index_core', :locals => {:parent => SimCardProvider.first, :sim_cards => @user.sim_cards}
+        = render :partial => 'shared/create_link', :locals => {:parent => SimCardProvider.first, :child_class => SimCard}
 
     - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do
       = render :partial => 'fax_accounts', :locals => {:user => @user}
-- 
cgit v1.2.3