From db9dbf03d88cfbd68ce99a242730b9e870339539 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 7 Mar 2013 13:15:35 +0100
Subject: Added Switchboard scaffold.

---
 app/views/switchboards/_form.html.haml       |  7 +++++++
 app/views/switchboards/_form_core.html.haml  |  2 ++
 app/views/switchboards/_index_core.html.haml | 10 ++++++++++
 app/views/switchboards/edit.html.haml        |  3 +++
 app/views/switchboards/index.html.haml       |  8 ++++++++
 app/views/switchboards/new.html.haml         |  3 +++
 app/views/switchboards/show.html.haml        | 12 ++++++++++++
 7 files changed, 45 insertions(+)
 create mode 100644 app/views/switchboards/_form.html.haml
 create mode 100644 app/views/switchboards/_form_core.html.haml
 create mode 100644 app/views/switchboards/_index_core.html.haml
 create mode 100644 app/views/switchboards/edit.html.haml
 create mode 100644 app/views/switchboards/index.html.haml
 create mode 100644 app/views/switchboards/new.html.haml
 create mode 100644 app/views/switchboards/show.html.haml

(limited to 'app/views')

diff --git a/app/views/switchboards/_form.html.haml b/app/views/switchboards/_form.html.haml
new file mode 100644
index 0000000..bb09713
--- /dev/null
+++ b/app/views/switchboards/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for([@user, @switchboard]) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .form-actions
+    = f.button :submit, conditional_t('switchboards.form.submit')
diff --git a/app/views/switchboards/_form_core.html.haml b/app/views/switchboards/_form_core.html.haml
new file mode 100644
index 0000000..61b5934
--- /dev/null
+++ b/app/views/switchboards/_form_core.html.haml
@@ -0,0 +1,2 @@
+.inputs
+  = f.input :name, :label => t('switchboards.form.name.label'), :hint => conditional_hint('switchboards.form.name.hint'), :autofocus => true
diff --git a/app/views/switchboards/_index_core.html.haml b/app/views/switchboards/_index_core.html.haml
new file mode 100644
index 0000000..858f624
--- /dev/null
+++ b/app/views/switchboards/_index_core.html.haml
@@ -0,0 +1,10 @@
+%table.table.table-striped
+  %tr
+    %th= t('switchboards.index.name')
+    %th
+
+  
+  - for switchboard in switchboards
+    %tr
+      %td= switchboard.name
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => user, :child => switchboard}
\ No newline at end of file
diff --git a/app/views/switchboards/edit.html.haml b/app/views/switchboards/edit.html.haml
new file mode 100644
index 0000000..1ab0efe
--- /dev/null
+++ b/app/views/switchboards/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("switchboards.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/switchboards/index.html.haml b/app/views/switchboards/index.html.haml
new file mode 100644
index 0000000..4f29d7d
--- /dev/null
+++ b/app/views/switchboards/index.html.haml
@@ -0,0 +1,8 @@
+- content_for :title, t("switchboards.index.page_title")
+
+.row
+  .span6
+    - if @switchboards && @switchboards.count > 0
+      = render :partial => "index_core", :locals => {:switchboards => @switchboards, :user => @user}
+
+    = render :partial => 'shared/create_link', :locals => {:parent => @user, :child_class => Switchboard}
\ No newline at end of file
diff --git a/app/views/switchboards/new.html.haml b/app/views/switchboards/new.html.haml
new file mode 100644
index 0000000..9f5918f
--- /dev/null
+++ b/app/views/switchboards/new.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("switchboards.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/switchboards/show.html.haml b/app/views/switchboards/show.html.haml
new file mode 100644
index 0000000..746e180
--- /dev/null
+++ b/app/views/switchboards/show.html.haml
@@ -0,0 +1,12 @@
+- content_for :title, t("switchboards.show.page_title")
+
+.row
+  .span6
+    %table.table.table-striped
+      %tr
+        %td
+          %strong= t('switchboards.show.name') + ":"
+        %td
+          = @switchboard.name
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @user, :child => @switchboard }
\ No newline at end of file
-- 
cgit v1.2.3


From 678baf479066ad6b517b3a97925a7e37bf5327e4 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 7 Mar 2013 07:38:44 -0500
Subject: softkey form fixed

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

(limited to 'app/views')

diff --git a/app/views/softkeys/_form_core.html.haml b/app/views/softkeys/_form_core.html.haml
index f447aa6..0e251f3 100644
--- a/app/views/softkeys/_form_core.html.haml
+++ b/app/views/softkeys/_form_core.html.haml
@@ -4,10 +4,11 @@
     hold_function_name = "#{I18n.t('softkeys.functions.hold')}"
     deactivated_function_name = "#{I18n.t('softkeys.functions.deactivated')}"
 
+
 .inputs
   = f.input :softkey_function_id, :as => :select, :collection => @softkey_functions.map {|x| [I18n.t("softkeys.functions.#{x}"), x.id] }, :label => t('softkeys.form.function.label'), :hint => conditional_hint('softkeys.form.function.hint'), :include_blank => false
   - call_forwards = @softkey.possible_call_forwards
   - if call_forwards && call_forwards.count > 0
-    = f.association :softkeyable, :collection => call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false 
+    = f.input :softkeyable_id, :collection => call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false
   = f.input :number, :label => t('softkeys.form.number.label'), :hint => conditional_hint('softkeys.form.number.hint')
   = f.input :label, :label => t('softkeys.form.label.label'), :hint => conditional_hint('softkeys.form.label.hint')
-- 
cgit v1.2.3


From 800cf2f11ab5d7f03a52d5ca35e893654ef520ab Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 7 Mar 2013 15:22:06 -0500
Subject: call forwards view added

---
 app/views/hunt_groups/show.html.haml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/views')

diff --git a/app/views/hunt_groups/show.html.haml b/app/views/hunt_groups/show.html.haml
index 3ffe4f3..99eb3e0 100644
--- a/app/views/hunt_groups/show.html.haml
+++ b/app/views/hunt_groups/show.html.haml
@@ -19,6 +19,13 @@
   %br
 = render :partial => 'shared/create_link', :locals => {:parent => @hunt_group, :child_class => PhoneNumber}
 
+- if @hunt_group.call_forwards.count > 0 || can?(:create, @hunt_group.call_forwards.build)
+  %h2= t('call_forwards.index.page_title')
+  - if @hunt_group.call_forwards.count > 0
+    = render "call_forwards/index_core", :call_forwards => @hunt_group.call_forwards
+    %br
+  = render :partial => 'shared/create_link', :locals => { :parent => @hunt_group, :child_class => CallForward }
+
 %h2= t('hunt_groups.form.hunt_group_members.label')
 - if @hunt_group.hunt_group_members.count > 0
   = render 'hunt_group_members/index_core', :hunt_group_members => @hunt_group.hunt_group_members
-- 
cgit v1.2.3


From 2abc9cfb22e55b709a21b041e04a8221f605e9d7 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 7 Mar 2013 15:57:02 -0500
Subject: call forwards view added

---
 app/views/automatic_call_distributors/show.html.haml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/views')

diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml
index a461652..18fd8b8 100644
--- a/app/views/automatic_call_distributors/show.html.haml
+++ b/app/views/automatic_call_distributors/show.html.haml
@@ -63,6 +63,13 @@
   = render 'phone_numbers/index_core', :phone_numbers => @automatic_call_distributor.phone_numbers
   = render :partial => 'shared/create_link', :locals => {:parent => @automatic_call_distributor, :child_class => PhoneNumber, :short_link => true}
 
+- if @automatic_call_distributor.call_forwards.count > 0 || can?(:create, @automatic_call_distributor.call_forwards.build)
+  %h3= t('call_forwards.index.page_title')
+  - if @automatic_call_distributor.call_forwards.count > 0
+    = render "call_forwards/index_core", :call_forwards => @automatic_call_distributor.call_forwards
+    %br
+  = render :partial => 'shared/create_link', :locals => { :parent => @automatic_call_distributor, :child_class => CallForward }
+
 - if can?( :index, @automatic_call_distributor.acd_agents )
   %h3= t('automatic_call_distributors.index.acd_agents')
   = render 'acd_agents/index_core', :acd_agents => @automatic_call_distributor.acd_agents
-- 
cgit v1.2.3


From 4d7d5ad238990582d6c90a25272f2141ea9a3b28 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Fri, 8 Mar 2013 05:50:02 -0500
Subject: toggle action added to acd_agents

---
 app/views/acd_agents/_index_core.html.haml | 13 +++++++++++--
 app/views/sip_accounts/show.html.haml      |  7 +++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'app/views')

diff --git a/app/views/acd_agents/_index_core.html.haml b/app/views/acd_agents/_index_core.html.haml
index c8967cd..f1172f2 100644
--- a/app/views/acd_agents/_index_core.html.haml
+++ b/app/views/acd_agents/_index_core.html.haml
@@ -1,8 +1,8 @@
 %table.table.table-striped
   %thead
     %tr
+      %th
       %th= t('acd_agents.index.name')
-      %th= t('acd_agents.index.status')
       %th= t('acd_agents.index.last_call')
       %th= t('acd_agents.index.calls_answered')
       %th= t('acd_agents.index.destination')
@@ -10,8 +10,17 @@
   %tbody
     - for acd_agent in acd_agents
       %tr
+        %td
+          - if acd_agent.status == 'active'
+            %a.btn.btn-small.btn-success{ :href => toggle_acd_agent_path(acd_agent) }
+              %i.icon-ok.icon-white
+          - elsif acd_agent.status == 'inactive'
+            %a.btn.btn-small.btn-danger{ :href => toggle_acd_agent_path(acd_agent) }
+              %i.icon-ban-circle.icon-white
+          - else
+            %a.btn.btn-small.btn-warning{ :href => toggle_acd_agent_path(acd_agent) }
+              = acd_agent.status
         %td= acd_agent.name
-        %td= acd_agent.status
         %td= acd_agent.last_call
         %td= acd_agent.calls_answered
         %td= acd_agent.destination
diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml
index 365aea8..9f84c92 100644
--- a/app/views/sip_accounts/show.html.haml
+++ b/app/views/sip_accounts/show.html.haml
@@ -99,3 +99,10 @@
 - if @sip_account.calls.count > 0
   %h2= t("calls.index.page_title")
   = render "calls/index_core", :calls => @sip_account.calls, :parent => @sip_account
+
+- if (can?(:read, AcdAgent) && @sip_account.acd_agents.count > 0) || can?(:create, @sip_account.acd_agents.build)
+  %h2= t('acd_agents.index.page_title')
+  - if @sip_account.acd_agents.count > 0
+    = render "acd_agents/index_core", :acd_agents => @sip_account.acd_agents
+    %br
+  = render :partial => 'shared/create_link', :locals => { :parent => @sip_account, :child_class => AcdAgent }
-- 
cgit v1.2.3


From 6374c0b3e38dfc74eb1b4a5a1fcc5229eacdcaf2 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Fri, 8 Mar 2013 12:09:17 +0100
Subject: Added SwitchboardEntry scaffold. switchboard has_many
 switchboard_entries

---
 app/views/switchboard_entries/_form.html.haml      |  7 +++++++
 app/views/switchboard_entries/_form_core.html.haml |  3 +++
 .../switchboard_entries/_index_core.html.haml      | 16 ++++++++++++++++
 app/views/switchboard_entries/edit.html.haml       |  3 +++
 app/views/switchboard_entries/index.html.haml      |  6 ++++++
 app/views/switchboard_entries/new.html.haml        |  3 +++
 app/views/switchboard_entries/show.html.haml       | 22 ++++++++++++++++++++++
 7 files changed, 60 insertions(+)
 create mode 100644 app/views/switchboard_entries/_form.html.haml
 create mode 100644 app/views/switchboard_entries/_form_core.html.haml
 create mode 100644 app/views/switchboard_entries/_index_core.html.haml
 create mode 100644 app/views/switchboard_entries/edit.html.haml
 create mode 100644 app/views/switchboard_entries/index.html.haml
 create mode 100644 app/views/switchboard_entries/new.html.haml
 create mode 100644 app/views/switchboard_entries/show.html.haml

(limited to 'app/views')

diff --git a/app/views/switchboard_entries/_form.html.haml b/app/views/switchboard_entries/_form.html.haml
new file mode 100644
index 0000000..b3d56ec
--- /dev/null
+++ b/app/views/switchboard_entries/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for([@switchboard, @switchboard_entry]) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .form-actions
+    = f.button :submit, conditional_t('switchboard_entries.form.submit')
diff --git a/app/views/switchboard_entries/_form_core.html.haml b/app/views/switchboard_entries/_form_core.html.haml
new file mode 100644
index 0000000..6f340c2
--- /dev/null
+++ b/app/views/switchboard_entries/_form_core.html.haml
@@ -0,0 +1,3 @@
+.inputs
+  = f.association :sip_account, :collection => @sip_accounts, :label => t('switchboard_entries.form.sip_account_id.label'), :hint => conditional_hint('switchboard_entries.form.sip_account_id.hint'), :autofocus => true, :include_blank => false
+  = f.input :name, :label => t('switchboard_entries.form.name.label'), :hint => conditional_hint('switchboard_entries.form.name.hint')
diff --git a/app/views/switchboard_entries/_index_core.html.haml b/app/views/switchboard_entries/_index_core.html.haml
new file mode 100644
index 0000000..406db71
--- /dev/null
+++ b/app/views/switchboard_entries/_index_core.html.haml
@@ -0,0 +1,16 @@
+%table.table.table-striped
+  %tr
+    %th
+    %th= t('switchboard_entries.index.sip_account_id')
+    %th= t('switchboard_entries.index.name')
+    %th
+
+  %tbody{ :id => "switchboard_entries", :'data-update-url' => sort_switchboard_switchboard_entries_path(switchboard_entries.first.switchboard) }
+    - for switchboard_entry in switchboard_entries
+      = content_tag_for :tr, switchboard_entry do
+        %td
+          %span.handle
+            %i.icon-resize-vertical
+        %td= switchboard_entry.sip_account
+        %td= switchboard_entry.name
+        =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => switchboard_entry.switchboard, :child => switchboard_entry}
\ No newline at end of file
diff --git a/app/views/switchboard_entries/edit.html.haml b/app/views/switchboard_entries/edit.html.haml
new file mode 100644
index 0000000..8885e25
--- /dev/null
+++ b/app/views/switchboard_entries/edit.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("switchboard_entries.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/switchboard_entries/index.html.haml b/app/views/switchboard_entries/index.html.haml
new file mode 100644
index 0000000..302b778
--- /dev/null
+++ b/app/views/switchboard_entries/index.html.haml
@@ -0,0 +1,6 @@
+- content_for :title, t("switchboard_entries.index.page_title")
+
+- if @switchboard_entries && @switchboard_entries.count > 0
+  = render "index_core", :switchboard_entries => @switchboard_entries
+
+= render :partial => 'shared/create_link', :locals => {:parent => @switchboard, :child_class => SwitchboardEntry}
\ No newline at end of file
diff --git a/app/views/switchboard_entries/new.html.haml b/app/views/switchboard_entries/new.html.haml
new file mode 100644
index 0000000..0801a65
--- /dev/null
+++ b/app/views/switchboard_entries/new.html.haml
@@ -0,0 +1,3 @@
+- content_for :title, t("switchboard_entries.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/switchboard_entries/show.html.haml b/app/views/switchboard_entries/show.html.haml
new file mode 100644
index 0000000..b519781
--- /dev/null
+++ b/app/views/switchboard_entries/show.html.haml
@@ -0,0 +1,22 @@
+- content_for :title, t("switchboard_entries.show.page_title")
+
+.row
+  .span6
+    %table.table.table-striped
+      %tr
+        %td
+          %strong= t('switchboard_entries.show.sip_account_id') + ":"
+        %td
+          = @switchboard_entry.sip_account
+      %tr
+        %td
+          %strong= t('switchboard_entries.show.name') + ":"
+        %td
+          = @switchboard_entry.name
+      %tr
+        %td
+          %strong= t('switchboard_entries.show.position') + ":"
+        %td
+          = @switchboard_entry.position
+
+    = render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @switchboard, :child => @switchboard_entry }
\ No newline at end of file
-- 
cgit v1.2.3


From 21d0843117c0962bd962fc50fccaf276a5b3067f Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 08:43:23 +0100
Subject: Misc

---
 app/views/switchboards/show.html.haml | 53 ++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 10 deletions(-)

(limited to 'app/views')

diff --git a/app/views/switchboards/show.html.haml b/app/views/switchboards/show.html.haml
index 746e180..b81980c 100644
--- a/app/views/switchboards/show.html.haml
+++ b/app/views/switchboards/show.html.haml
@@ -1,12 +1,45 @@
-- content_for :title, t("switchboards.show.page_title")
+- content_for :title, @switchboard.name
+
 
 .row
-  .span6
-    %table.table.table-striped
-      %tr
-        %td
-          %strong= t('switchboards.show.name') + ":"
-        %td
-          = @switchboard.name
-
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @user, :child => @switchboard }
\ No newline at end of file
+  .span12
+    .well.pull-right
+      %p
+        =current_user
+
+    %ul.thumbnails
+      - @switchboard.switchboard_entries.each do |switchboard_entry|
+        %li.span1
+          %div.thumbnail
+            %a.thumbnail{:href => tenant_user_path(switchboard_entry.sip_account.sip_accountable.current_tenant, switchboard_entry.sip_account.sip_accountable)}
+              - if switchboard_entry.sip_account.sip_accountable.image?
+                = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:mini).to_s, :class => 'img-rounded')
+              - else
+                - if switchboard_entry.sip_account.sip_accountable.male?
+                  = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
+                - else
+                  = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
+            %p
+              %small
+                = truncate(switchboard_entry.to_s, :length => 10)
+                %span{:class => "label #{(switchboard_entry.sip_account.registration ? '' : 'label-inverse')}"}
+                  - if !switchboard_entry.sip_account.registration
+                    %i.icon-ban-circle.icon-white
+                  - if switchboard_entry.sip_account.phone_numbers.count > 1
+                    - phone_numbers = []
+                    - switchboard_entry.sip_account.phone_numbers.order(:position).each do |phone_number|
+                      - if phone_number.number.length < 6
+                        - phone_numbers << phone_number
+                    - if phone_numbers.size == 0
+                      - phone_numbers = switchboard_entry.sip_account.phone_numbers.order(:position)
+                  - else
+                    - phone_numbers = switchboard_entry.sip_account.phone_numbers
+                  = render 'phone_numbers/listing', :phone_numbers => phone_numbers
+
+- if can? :edit, @switchboard
+  .row
+    .span12
+      %a.btn.btn-small.btn-warning{:href => switchboard_switchboard_entries_path(@switchboard) }
+        %i.icon-edit.icon-white
+        %span.hidden-phone
+          =t("switchboard_entries.index.page_title")
-- 
cgit v1.2.3


From 13e16223977966f9751e7b8e3fb587e2df0a0801 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 09:52:31 +0100
Subject: Add a second configuration option.

---
 app/views/switchboards/edit.html.haml   | 11 ++++++++++-
 app/views/users/_switchboards.html.haml |  7 +++++++
 app/views/users/show.html.haml          |  3 +++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/_switchboards.html.haml

(limited to 'app/views')

diff --git a/app/views/switchboards/edit.html.haml b/app/views/switchboards/edit.html.haml
index 1ab0efe..f2e69f4 100644
--- a/app/views/switchboards/edit.html.haml
+++ b/app/views/switchboards/edit.html.haml
@@ -1,3 +1,12 @@
 - content_for :title, t("switchboards.edit.page_title")
 
-= render "form"
\ No newline at end of file
+.row
+  .span12
+    = render "form"
+
+.row
+  .span12
+    - if @switchboard.switchboard_entries && @switchboard.switchboard_entries.count > 0
+      = render "switchboard_entries/index_core", :switchboard_entries => @switchboard.switchboard_entries
+
+    = render :partial => 'shared/create_link', :locals => {:parent => @switchboard, :child_class => SwitchboardEntry}
\ No newline at end of file
diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml
new file mode 100644
index 0000000..f79d6b8
--- /dev/null
+++ b/app/views/users/_switchboards.html.haml
@@ -0,0 +1,7 @@
+-# Switchboards
+-#
+- if (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard )
+  %h2= t('switchboards.index.page_title')
+  - if can?( :index, Switchboard ) && user.switchboards.count > 0
+    = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user}
+  = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Conference}
\ No newline at end of file
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index ea90ab4..98f7cc6 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -87,3 +87,6 @@
 
     - cache(['user_show_conferences_overview', I18n.locale, @user, @user.conferences]) do
       = render :partial => 'conferences', :locals => {:user => @user}
+
+    - cache(['user_switchboards_overview', I18n.locale, @user, @user.switchboards]) do
+      = render :partial => 'switchboards', :locals => {:user => @user}
\ No newline at end of file
-- 
cgit v1.2.3


From f0932e38b890b08397020a5994ddde7110d7b8db Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 10:50:49 +0100
Subject: refactoring

---
 .../_switchboard_entry.html.haml                   | 26 +++++++++++++++++++
 app/views/switchboards/show.html.haml              | 29 +---------------------
 2 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 app/views/switchboard_entries/_switchboard_entry.html.haml

(limited to 'app/views')

diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
new file mode 100644
index 0000000..2902a83
--- /dev/null
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -0,0 +1,26 @@
+%li.span1{:id => "switchboard_entry_id_#{switchboard_entry.id}"}
+  %div.thumbnail
+    %a.thumbnail{:href => tenant_user_path(switchboard_entry.sip_account.sip_accountable.current_tenant, switchboard_entry.sip_account.sip_accountable)}
+      - if switchboard_entry.sip_account.sip_accountable.image?
+        = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:mini).to_s, :class => 'img-rounded')
+      - else
+        - if switchboard_entry.sip_account.sip_accountable.male?
+          = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
+        - else
+          = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
+    %p
+      %small
+        = truncate(switchboard_entry.to_s, :length => 10)
+        %span{:class => "label #{(switchboard_entry.sip_account.registration ? '' : 'label-inverse')}"}
+          - if !switchboard_entry.sip_account.registration
+            %i.icon-ban-circle.icon-white
+          - if switchboard_entry.sip_account.phone_numbers.count > 1
+            - phone_numbers = []
+            - switchboard_entry.sip_account.phone_numbers.order(:position).each do |phone_number|
+              - if phone_number.number.length < 6
+                - phone_numbers << phone_number
+            - if phone_numbers.size == 0
+              - phone_numbers = switchboard_entry.sip_account.phone_numbers.order(:position)
+          - else
+            - phone_numbers = switchboard_entry.sip_account.phone_numbers
+          = render 'phone_numbers/listing', :phone_numbers => phone_numbers
diff --git a/app/views/switchboards/show.html.haml b/app/views/switchboards/show.html.haml
index b81980c..18671c2 100644
--- a/app/views/switchboards/show.html.haml
+++ b/app/views/switchboards/show.html.haml
@@ -1,6 +1,5 @@
 - content_for :title, @switchboard.name
 
-
 .row
   .span12
     .well.pull-right
@@ -8,33 +7,7 @@
         =current_user
 
     %ul.thumbnails
-      - @switchboard.switchboard_entries.each do |switchboard_entry|
-        %li.span1
-          %div.thumbnail
-            %a.thumbnail{:href => tenant_user_path(switchboard_entry.sip_account.sip_accountable.current_tenant, switchboard_entry.sip_account.sip_accountable)}
-              - if switchboard_entry.sip_account.sip_accountable.image?
-                = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:mini).to_s, :class => 'img-rounded')
-              - else
-                - if switchboard_entry.sip_account.sip_accountable.male?
-                  = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
-                - else
-                  = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
-            %p
-              %small
-                = truncate(switchboard_entry.to_s, :length => 10)
-                %span{:class => "label #{(switchboard_entry.sip_account.registration ? '' : 'label-inverse')}"}
-                  - if !switchboard_entry.sip_account.registration
-                    %i.icon-ban-circle.icon-white
-                  - if switchboard_entry.sip_account.phone_numbers.count > 1
-                    - phone_numbers = []
-                    - switchboard_entry.sip_account.phone_numbers.order(:position).each do |phone_number|
-                      - if phone_number.number.length < 6
-                        - phone_numbers << phone_number
-                    - if phone_numbers.size == 0
-                      - phone_numbers = switchboard_entry.sip_account.phone_numbers.order(:position)
-                  - else
-                    - phone_numbers = switchboard_entry.sip_account.phone_numbers
-                  = render 'phone_numbers/listing', :phone_numbers => phone_numbers
+      = render :partial => "switchboard_entries/switchboard_entry", :collection => @switchboard_entries
 
 - if can? :edit, @switchboard
   .row
-- 
cgit v1.2.3


From 63339834ec520efae48f16f4d16b90d74e7bcdfd Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 12:36:25 +0100
Subject: Added labels with the current status.

---
 .../_switchboard_entry.html.haml                   | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'app/views')

diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
index 2902a83..5608757 100644
--- a/app/views/switchboard_entries/_switchboard_entry.html.haml
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -11,16 +11,22 @@
     %p
       %small
         = truncate(switchboard_entry.to_s, :length => 10)
-        %span{:class => "label #{(switchboard_entry.sip_account.registration ? '' : 'label-inverse')}"}
-          - if !switchboard_entry.sip_account.registration
+        %br
+        - if !switchboard_entry.sip_account.registration
+          %span.label.label-inverse
             %i.icon-ban-circle.icon-white
-          - if switchboard_entry.sip_account.phone_numbers.count > 1
-            - phone_numbers = []
-            - switchboard_entry.sip_account.phone_numbers.order(:position).each do |phone_number|
-              - if phone_number.number.length < 6
-                - phone_numbers << phone_number
-            - if phone_numbers.size == 0
-              - phone_numbers = switchboard_entry.sip_account.phone_numbers.order(:position)
-          - else
-            - phone_numbers = switchboard_entry.sip_account.phone_numbers
-          = render 'phone_numbers/listing', :phone_numbers => phone_numbers
+        - else
+          - if switchboard_entry.sip_account.call_legs(:where => ["HELD", "ACTIVE"]).size != 0
+            %span.label.label-success
+              %i.icon-user.icon-white    
+          - if switchboard_entry.sip_account.call_legs(:where => ["RINGING"]).size != 0
+            %span.label.label-info
+              %i.icon-bell.icon-white    
+        - if switchboard_entry.sip_account.non_e164_phone_numbers.size == 0
+          - phone_numbers = switchboard_entry.sip_account.phone_numbers
+        - else 
+          - phone_numbers = switchboard_entry.sip_account.non_e164_phone_numbers
+
+        - phone_numbers.each do |phone_number|
+          %span.label
+            = phone_number.number
-- 
cgit v1.2.3


From b29f5e637816aeca6f5cc7c9acb3f380469d1630 Mon Sep 17 00:00:00 2001
From: Julian Pawlowski <julian.pawlowski@gmail.com>
Date: Sun, 10 Mar 2013 14:33:40 +0100
Subject: fix link

---
 app/views/users/_switchboards.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml
index f79d6b8..8dca15f 100644
--- a/app/views/users/_switchboards.html.haml
+++ b/app/views/users/_switchboards.html.haml
@@ -4,4 +4,4 @@
   %h2= t('switchboards.index.page_title')
   - if can?( :index, Switchboard ) && user.switchboards.count > 0
     = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user}
-  = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Conference}
\ No newline at end of file
+  = render :partial => 'shared/create_link', :locals => {:parent => user, :child_class => Switchboard}
\ No newline at end of file
-- 
cgit v1.2.3


From b9aeac77779f7a9ae0e51b8d95adc7d542e09ece Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 18:32:13 +0100
Subject: Small fixes.

---
 app/views/switchboard_entries/_index_core.html.haml   | 19 ++++++++++---------
 .../switchboard_entries/_switchboard_entry.html.haml  | 11 +++--------
 app/views/users/_switchboards.html.haml               |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'app/views')

diff --git a/app/views/switchboard_entries/_index_core.html.haml b/app/views/switchboard_entries/_index_core.html.haml
index 406db71..d647626 100644
--- a/app/views/switchboard_entries/_index_core.html.haml
+++ b/app/views/switchboard_entries/_index_core.html.haml
@@ -5,12 +5,13 @@
     %th= t('switchboard_entries.index.name')
     %th
 
-  %tbody{ :id => "switchboard_entries", :'data-update-url' => sort_switchboard_switchboard_entries_path(switchboard_entries.first.switchboard) }
-    - for switchboard_entry in switchboard_entries
-      = content_tag_for :tr, switchboard_entry do
-        %td
-          %span.handle
-            %i.icon-resize-vertical
-        %td= switchboard_entry.sip_account
-        %td= switchboard_entry.name
-        =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => switchboard_entry.switchboard, :child => switchboard_entry}
\ No newline at end of file
+  - if switchboard_entries.any?
+    %tbody{ :id => "switchboard_entries", :'data-update-url' => sort_switchboard_switchboard_entries_path(switchboard_entries.first.switchboard) }
+      - for switchboard_entry in switchboard_entries
+        = content_tag_for :tr, switchboard_entry do
+          %td
+            %span.handle
+              %i.icon-resize-vertical
+          %td= switchboard_entry.sip_account
+          %td= switchboard_entry.name
+          =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => switchboard_entry.switchboard, :child => switchboard_entry}
\ No newline at end of file
diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
index 5608757..8d8e747 100644
--- a/app/views/switchboard_entries/_switchboard_entry.html.haml
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -21,12 +21,7 @@
               %i.icon-user.icon-white    
           - if switchboard_entry.sip_account.call_legs(:where => ["RINGING"]).size != 0
             %span.label.label-info
-              %i.icon-bell.icon-white    
-        - if switchboard_entry.sip_account.non_e164_phone_numbers.size == 0
-          - phone_numbers = switchboard_entry.sip_account.phone_numbers
-        - else 
-          - phone_numbers = switchboard_entry.sip_account.non_e164_phone_numbers
-
-        - phone_numbers.each do |phone_number|
+              %i.icon-bell.icon-white
+        - if switchboard_entry.sip_account.phone_numbers.any?
           %span.label
-            = phone_number.number
+            = switchboard_entry.sip_account.phone_numbers.first.number        
diff --git a/app/views/users/_switchboards.html.haml b/app/views/users/_switchboards.html.haml
index 8dca15f..183b6ae 100644
--- a/app/views/users/_switchboards.html.haml
+++ b/app/views/users/_switchboards.html.haml
@@ -1,6 +1,6 @@
 -# Switchboards
 -#
-- if (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard )
+- if SipAccount.any? && (can?( :index, Switchboard ) && user.switchboards.any? ) || can?( :create, Switchboard )
   %h2= t('switchboards.index.page_title')
   - if can?( :index, Switchboard ) && user.switchboards.count > 0
     = render :partial => "switchboards/index_core", :locals => {:switchboards => user.switchboards, :user => user}
-- 
cgit v1.2.3


From beb9e66a5b4e2744435f2c1f301828b68a58c96a Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Sun, 10 Mar 2013 19:11:13 +0100
Subject: Indicate a new voicemail in the navigation bar.

---
 app/views/layouts/_navbar.html.haml     | 4 ++++
 app/views/layouts/application.html.haml | 1 +
 app/views/trigger/voicemail.html.erb    | 4 ----
 3 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 app/views/trigger/voicemail.html.erb

(limited to 'app/views')

diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 8004c0e..fe5f48f 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -22,7 +22,11 @@
                 =t("call_histories.index.page_title")
             %li
               %a{:href => sip_account_voicemail_messages_path(current_user.sip_accounts.first)}
+                %i.icon-star.icon-white{:id => 'new_voicemail_indicator'}
                 =t("voicemail_messages.index.page_title")
+            :javascript
+              $("#new_voicemail_indicator").hide()
+            = subscribe_to "/users/#{current_user.id}/messages/new"   
 
       - if current_user
         %ul.nav.pull-right
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index eab6096..027f837 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -36,4 +36,5 @@
         .span12
           %hr/
           = render 'layouts/footer'
+
     / /container
diff --git a/app/views/trigger/voicemail.html.erb b/app/views/trigger/voicemail.html.erb
deleted file mode 100644
index 9bafe17..0000000
--- a/app/views/trigger/voicemail.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<h1>Trigger#voicemail</h1>
-<p>Find me in app/views/trigger/voicemail.html.erb</p>
-
-<%= debug(params) %>
-- 
cgit v1.2.3


From aa46f61cc84043a81f760c961ec53786671e7e50 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 12:12:36 +0100
Subject: Moved the voicemail and fax indicator.

---
 app/views/layouts/_navbar.html.haml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'app/views')

diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index fe5f48f..3e1da1c 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -22,12 +22,8 @@
                 =t("call_histories.index.page_title")
             %li
               %a{:href => sip_account_voicemail_messages_path(current_user.sip_accounts.first)}
-                %i.icon-star.icon-white{:id => 'new_voicemail_indicator'}
                 =t("voicemail_messages.index.page_title")
-            :javascript
-              $("#new_voicemail_indicator").hide()
-            = subscribe_to "/users/#{current_user.id}/messages/new"   
-
+   
       - if current_user
         %ul.nav.pull-right
           %li.display
@@ -43,10 +39,18 @@
           - 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)}
+                %i.icon-star.icon-white{:id => 'new_voicemail_or_fax_indicator'}
+                :javascript
+                  $("#new_voicemail_or_fax_indicator").hide()
+                = subscribe_to "/users/#{current_user.id}/messages/new"                
                 = current_user
           - else
             %li
               %a.navbar-link{:href => tenant_user_path(current_user.current_tenant, current_user)}
+                %i.icon-star.icon-white{:id => 'new_voicemail_or_fax_indicator'}
+                :javascript
+                  $("#new_voicemail_or_fax_indicator").hide()
+                = subscribe_to "/users/#{current_user.id}/messages/new"                
                 = current_user
 
           - if single_sign_on_system? == false
-- 
cgit v1.2.3


From 64afdeacb1444b319abfcad6c9a8cfd656fe2dd4 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 12:19:57 +0100
Subject: Reload FaxDocument#show when a fax was send.

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

(limited to 'app/views')

diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index b8f3e9e..f860143 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -65,3 +65,6 @@
 .row
   .span12
     = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document }
+
+- if @fax_document.state == 'sending' || @fax_document.state == 'queued_for_sending'
+  = subscribe_to "/fax_documents/#{@fax_document.id}"
\ No newline at end of file
-- 
cgit v1.2.3


From 3305624fc4b6de2dabaa292fa1480851ca141c96 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Mon, 11 Mar 2013 12:29:44 +0100
Subject: Fix the if.

---
 app/views/fax_documents/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index f860143..af5552d 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -66,5 +66,5 @@
   .span12
     = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @fax_document.fax_account, :child => @fax_document }
 
-- if @fax_document.state == 'sending' || @fax_document.state == 'queued_for_sending'
+- if ['sending', 'queued_for_sending'].include? @fax_document.state
   = subscribe_to "/fax_documents/#{@fax_document.id}"
\ No newline at end of file
-- 
cgit v1.2.3


From be03d6d4d629e17ea070212ffbb2b706bc7f1cf2 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 08:30:43 +0100
Subject: Removed caching for the sip_accounts table. #233

---
 app/views/tenants/_table_of_sip_accounts.html.haml | 45 +++++++++++-----------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'app/views')

diff --git a/app/views/tenants/_table_of_sip_accounts.html.haml b/app/views/tenants/_table_of_sip_accounts.html.haml
index 34eeb14..b2f2612 100644
--- a/app/views/tenants/_table_of_sip_accounts.html.haml
+++ b/app/views/tenants/_table_of_sip_accounts.html.haml
@@ -1,25 +1,24 @@
-- cache(['tenant_show_table_of_sip_accounts', I18n.locale, tenant, tenant.sip_accounts.count, SipAccount.count, tenant.sip_accounts.reorder(:updated_at).last]) do
-  .row
-    - if GsParameter.get('AUTO_ADMIN_ONLINE_HELP') == true && !SipAccount.any?
-      .span4
-        -# SIP accounts
-        -#
-        %h2= t('sip_accounts.index.page_title')
-        - if tenant.sip_accounts.any?
-          = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts
-        = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount}
+.row
+  - if GsParameter.get('AUTO_ADMIN_ONLINE_HELP') == true && !SipAccount.any?
+    .span4
+      -# SIP accounts
+      -#
+      %h2= t('sip_accounts.index.page_title')
+      - if tenant.sip_accounts.any?
+        = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts
+      = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount}
 
-      .span8
-        .well
-          %p
-            In der #{link_to 'Admin-Doku', page_help_path} finden Sie die Beschreibung wie ein neues Telefon mit einem SIP-Account eingerichtet werden kann. Dazu gibt es auch einen Screencast:
-          = render :partial => 'page/docu/screencast_list', :locals => {:screencast_name => 'firmen_sip_account_und_telefon_anlegen'}
+    .span8
+      .well
+        %p
+          In der #{link_to 'Admin-Doku', page_help_path} finden Sie die Beschreibung wie ein neues Telefon mit einem SIP-Account eingerichtet werden kann. Dazu gibt es auch einen Screencast:
+        = render :partial => 'page/docu/screencast_list', :locals => {:screencast_name => 'firmen_sip_account_und_telefon_anlegen'}
 
-    - else
-      .span12
-        -# SIP accounts
-        -#
-        %h2= t('sip_accounts.index.page_title')
-        - if tenant.sip_accounts.any?
-          = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts
-        = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount}
+  - else
+    .span12
+      -# SIP accounts
+      -#
+      %h2= t('sip_accounts.index.page_title')
+      - if tenant.sip_accounts.any?
+        = render "sip_accounts/index_core", :sip_accounts => tenant.sip_accounts
+      = render :partial => 'shared/create_link', :locals => {:parent => tenant, :child_class => SipAccount}
-- 
cgit v1.2.3


From 3c5a0511d228fb3dc00ae860ade1b8ff032cc42f Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 11:23:20 +0100
Subject: Refactoring

---
 app/views/fax_documents/_fax_document.html.haml | 66 +++++++++++++++++++++++++
 app/views/fax_documents/show.html.haml          | 66 +------------------------
 2 files changed, 67 insertions(+), 65 deletions(-)
 create mode 100644 app/views/fax_documents/_fax_document.html.haml

(limited to 'app/views')

diff --git a/app/views/fax_documents/_fax_document.html.haml b/app/views/fax_documents/_fax_document.html.haml
new file mode 100644
index 0000000..1fd5270
--- /dev/null
+++ b/app/views/fax_documents/_fax_document.html.haml
@@ -0,0 +1,66 @@
+.div{:id => "fax_document_#{fax_document.id}"}
+  .row
+    .span12
+      %table.table.table-striped
+        - 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
+            = 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.document?
+        %p
+          %a{:href => fax_account_fax_document_path(fax_document.fax_account, fax_document, :format => :pdf), :method => :get}
+            %i{:class => 'icon-download'}
+            = t("fax_documents.index.actions.download_pdf") + " (#{number_to_human_size(fax_document.document.size, :precision => 2)})"
+
+  .row
+    .span12
+      - if fax_document.fax_thumbnails.any?
+        %ul.thumbnails
+          - fax_document.fax_thumbnails.limit(50).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 }
\ No newline at end of file
diff --git a/app/views/fax_documents/show.html.haml b/app/views/fax_documents/show.html.haml
index af5552d..6ae0ee1 100644
--- a/app/views/fax_documents/show.html.haml
+++ b/app/views/fax_documents/show.html.haml
@@ -1,70 +1,6 @@
 - content_for :title, t("fax_documents.show.page_title")
 
-.row
-  .span12
-    %table.table.table-striped
-      - 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
-          = 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.document?
-      %p
-        %a{:href => fax_account_fax_document_path(@fax_account, @fax_document, :format => :pdf), :method => :get}
-          %i{:class => 'icon-download'}
-          = t("fax_documents.index.actions.download_pdf") + " (#{number_to_human_size(@fax_document.document.size, :precision => 2)})"
-
-.row
-  .span12
-    - if @fax_document.fax_thumbnails.any?
-      %ul.thumbnails
-        - @fax_document.fax_thumbnails.limit(50).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 }
+= render :partial => 'fax_document', :locals => {:fax_document => @fax_document}
 
 - if ['sending', 'queued_for_sending'].include? @fax_document.state
   = subscribe_to "/fax_documents/#{@fax_document.id}"
\ No newline at end of file
-- 
cgit v1.2.3


From d11a8692e742720435c4286e3752c8c136cc88cf Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 12:32:32 +0100
Subject: jquery replaceWith for FaxDocument#view after sending the fax

---
 app/views/fax_documents/_fax_document.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/fax_documents/_fax_document.html.haml b/app/views/fax_documents/_fax_document.html.haml
index 1fd5270..930a0c3 100644
--- a/app/views/fax_documents/_fax_document.html.haml
+++ b/app/views/fax_documents/_fax_document.html.haml
@@ -1,4 +1,4 @@
-.div{:id => "fax_document_#{fax_document.id}"}
+.fax_document{:id => fax_document.id}
   .row
     .span12
       %table.table.table-striped
-- 
cgit v1.2.3


From 5d3eeec6962010eb0b9cbcb9d3bb87d016bce199 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Tue, 12 Mar 2013 13:40:18 +0100
Subject: Added sip_account_update trigger

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

(limited to 'app/views')

diff --git a/app/views/switchboards/show.html.haml b/app/views/switchboards/show.html.haml
index 18671c2..2932366 100644
--- a/app/views/switchboards/show.html.haml
+++ b/app/views/switchboards/show.html.haml
@@ -16,3 +16,5 @@
         %i.icon-edit.icon-white
         %span.hidden-phone
           =t("switchboard_entries.index.page_title")
+
+= subscribe_to "/switchboards/#{@switchboard.id}"
\ No newline at end of file
-- 
cgit v1.2.3


From dcdd37036f45d13b7402436ddb1af65c78052ca9 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Wed, 13 Mar 2013 15:41:17 -0400
Subject: routing test view

---
 app/views/call_routes/test.html.haml | 55 ++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 app/views/call_routes/test.html.haml

(limited to 'app/views')

diff --git a/app/views/call_routes/test.html.haml b/app/views/call_routes/test.html.haml
new file mode 100644
index 0000000..0b0fba7
--- /dev/null
+++ b/app/views/call_routes/test.html.haml
@@ -0,0 +1,55 @@
+%h2= 'Routing Test'
+
+- if @route_test
+  - if  @route_test['destination']
+    %h3= 'Destination'
+    %table.table.table-striped
+      %thead
+        %tr
+          %td= 'number'
+          %td= 'type'
+          %td= 'ID'
+
+      %tbody{ :id => "destination" }
+        %tr
+          %td= @route_test['destination']['number']
+          %td= @route_test['destination']['type']
+          %td= @route_test['destination']['id']
+  -if @route_test['routes'] && @route_test['routes'].count > 0
+    %h3= 'Routes'
+    %table.table.table-striped
+      %thead
+        %tr
+          %th
+          %th= 'ID'
+          %th= 'destination_number'
+          %th= 'endpoint'
+
+      %tbody{ :id => "route_test" }
+        - @route_test['routes'].each do |index, route_entry|
+          %tr
+            %td= index
+            %td= route_entry['route_id']
+            %td= route_entry['destination_number']
+            %td= "#{route_entry['type']}=#{route_entry['id']}"
+  -if @route_test['log'] && @route_test['log'].count > 0
+    %h3= 'Log'
+    %table.table.table-striped
+      %thead
+        %tr
+          %th
+      %tbody{ :id => "log" }
+        - @route_test['log'].each do |index, log_line|
+          - if log_line =~ /^ROUTE_NO_MATCH/
+            - entry_class = 'table error'
+          - elsif log_line =~ /^ELEMENT_NO_MATCH/
+            - entry_class = 'table warning'
+          - elsif log_line =~ /^ROUTE \d+ /
+            - entry_class = 'table success'
+          - elsif log_line =~ /^[A-Z_]+_MATCH/
+            - entry_class = 'table info'
+          - else
+            - entry_class = nil
+          %tr{:class => entry_class}
+            %td= log_line
+            
-- 
cgit v1.2.3


From 25d58b40dfb51ddf6f566ded43c335146ac5fbb7 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 14 Mar 2013 03:48:16 -0400
Subject: show gateway status

---
 app/views/gateways/show.html.haml | 75 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

(limited to 'app/views')

diff --git a/app/views/gateways/show.html.haml b/app/views/gateways/show.html.haml
index 6cf09ec..f2e9ab8 100644
--- a/app/views/gateways/show.html.haml
+++ b/app/views/gateways/show.html.haml
@@ -33,6 +33,81 @@
       %td
         = @gateway.description
 
+    - if @gateway.technology.to_s == 'sip'
+      - status = @gateway.status
+      %tr
+        %td
+          %strong= t('gateways.show.status') + ":"
+        %td
+          = "#{status['status']} (#{status['state']})"
+      %tr
+        %td
+          %strong= t('gateways.show.identifier') + ":"
+        %td
+          = status['name']
+      %tr
+        %td
+          %strong= t('gateways.show.profile') + ":"
+        %td
+          = status['profile']
+      %tr
+        %td
+          %strong= t('gateways.show.username') + ":"
+        %td
+          = status['username']
+      %tr
+        %td
+          %strong= t('gateways.show.password') + ":"
+        %td
+          = status['password']
+      %tr
+        %td
+          %strong= t('gateways.show.realm') + ":"
+        %td
+          = status['realm']
+      %tr
+        %td
+          %strong= t('gateways.show.contact') + ":"
+        %td
+          = status['contact']
+      %tr
+        %td
+          %strong= t('gateways.show.from') + ":"
+        %td
+          = status['from']
+      %tr
+        %td
+          %strong= t('gateways.show.to') + ":"
+        %td
+          = status['to']
+      %tr
+        %td
+          %strong= t('gateways.show.proxy') + ":"
+        %td
+          = status['proxy']
+      - registration = @gateway.inbound_register
+      - if !registration.blank?
+        %tr
+          %td
+            %strong= t('gateways.show.inbound_register_status') + ":"
+          %td
+            = registration.status
+        %tr
+          %td
+            %strong= t('gateways.show.inbound_register_contact') + ":"
+          %td
+            = registration.contact
+        %tr
+          %td
+            %strong= t('gateways.show.inbound_register_user_agent') + ":"
+          %td
+            = registration.user_agent
+        %tr
+          %td
+            %strong= t('gateways.show.inbound_register_network') + ":"
+          %td
+            = "#{registration.network_ip}:#{registration.network_port}"
+
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @gateway }
 
 
-- 
cgit v1.2.3


From 7c5c0f972b6127335bc1f9b3141b8df0c5d35fbf Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Thu, 14 Mar 2013 04:01:17 -0400
Subject: status record can be nil

---
 app/views/gateways/show.html.haml | 101 +++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 50 deletions(-)

(limited to 'app/views')

diff --git a/app/views/gateways/show.html.haml b/app/views/gateways/show.html.haml
index f2e9ab8..19b1304 100644
--- a/app/views/gateways/show.html.haml
+++ b/app/views/gateways/show.html.haml
@@ -35,56 +35,57 @@
 
     - if @gateway.technology.to_s == 'sip'
       - status = @gateway.status
-      %tr
-        %td
-          %strong= t('gateways.show.status') + ":"
-        %td
-          = "#{status['status']} (#{status['state']})"
-      %tr
-        %td
-          %strong= t('gateways.show.identifier') + ":"
-        %td
-          = status['name']
-      %tr
-        %td
-          %strong= t('gateways.show.profile') + ":"
-        %td
-          = status['profile']
-      %tr
-        %td
-          %strong= t('gateways.show.username') + ":"
-        %td
-          = status['username']
-      %tr
-        %td
-          %strong= t('gateways.show.password') + ":"
-        %td
-          = status['password']
-      %tr
-        %td
-          %strong= t('gateways.show.realm') + ":"
-        %td
-          = status['realm']
-      %tr
-        %td
-          %strong= t('gateways.show.contact') + ":"
-        %td
-          = status['contact']
-      %tr
-        %td
-          %strong= t('gateways.show.from') + ":"
-        %td
-          = status['from']
-      %tr
-        %td
-          %strong= t('gateways.show.to') + ":"
-        %td
-          = status['to']
-      %tr
-        %td
-          %strong= t('gateways.show.proxy') + ":"
-        %td
-          = status['proxy']
+      - if !@gateway.status.blank?
+        %tr
+          %td
+            %strong= t('gateways.show.status') + ":"
+          %td
+            = "#{status['status']} (#{status['state']})"
+        %tr
+          %td
+            %strong= t('gateways.show.identifier') + ":"
+          %td
+            = status['name']
+        %tr
+          %td
+            %strong= t('gateways.show.profile') + ":"
+          %td
+            = status['profile']
+        %tr
+          %td
+            %strong= t('gateways.show.username') + ":"
+          %td
+            = status['username']
+        %tr
+          %td
+            %strong= t('gateways.show.password') + ":"
+          %td
+            = status['password']
+        %tr
+          %td
+            %strong= t('gateways.show.realm') + ":"
+          %td
+            = status['realm']
+        %tr
+          %td
+            %strong= t('gateways.show.contact') + ":"
+          %td
+            = status['contact']
+        %tr
+          %td
+            %strong= t('gateways.show.from') + ":"
+          %td
+            = status['from']
+        %tr
+          %td
+            %strong= t('gateways.show.to') + ":"
+          %td
+            = status['to']
+        %tr
+          %td
+            %strong= t('gateways.show.proxy') + ":"
+          %td
+            = status['proxy']
       - registration = @gateway.inbound_register
       - if !registration.blank?
         %tr
-- 
cgit v1.2.3


From 40d8290361bff123e0b44defa0f199708b89093b Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 14 Mar 2013 18:34:57 +0100
Subject: Adds a new remote_ip_address methode to figure out the remote IP
 address. #245

---
 app/views/switchboard_entries/_switchboard_entry.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
index 8d8e747..b2b6bff 100644
--- a/app/views/switchboard_entries/_switchboard_entry.html.haml
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -2,7 +2,7 @@
   %div.thumbnail
     %a.thumbnail{:href => tenant_user_path(switchboard_entry.sip_account.sip_accountable.current_tenant, switchboard_entry.sip_account.sip_accountable)}
       - if switchboard_entry.sip_account.sip_accountable.image?
-        = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:mini).to_s, :class => 'img-rounded')
+        = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:small).to_s, :class => 'img-rounded')
       - else
         - if switchboard_entry.sip_account.sip_accountable.male?
           = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
-- 
cgit v1.2.3


From 3a0ea10cdd6084a8beb235f5c1573c22a5d733f0 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 14 Mar 2013 20:21:59 +0100
Subject: Added a dashboard for Switchboard.

---
 .../_switchboard_entry.html.haml                   | 28 +++++++++++++---------
 .../switchboards/_current_user_dashboard.html.haml | 26 ++++++++++++++++++++
 app/views/switchboards/show.html.haml              | 23 +++++++++---------
 3 files changed, 55 insertions(+), 22 deletions(-)
 create mode 100644 app/views/switchboards/_current_user_dashboard.html.haml

(limited to 'app/views')

diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
index b2b6bff..8d4ee92 100644
--- a/app/views/switchboard_entries/_switchboard_entry.html.haml
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -12,16 +12,22 @@
       %small
         = truncate(switchboard_entry.to_s, :length => 10)
         %br
-        - if !switchboard_entry.sip_account.registration
-          %span.label.label-inverse
-            %i.icon-ban-circle.icon-white
-        - else
-          - if switchboard_entry.sip_account.call_legs(:where => ["HELD", "ACTIVE"]).size != 0
-            %span.label.label-success
-              %i.icon-user.icon-white    
-          - if switchboard_entry.sip_account.call_legs(:where => ["RINGING"]).size != 0
-            %span.label.label-info
-              %i.icon-bell.icon-white
         - if switchboard_entry.sip_account.phone_numbers.any?
           %span.label
-            = switchboard_entry.sip_account.phone_numbers.first.number        
+            = switchboard_entry.sip_account.phone_numbers.first.number
+
+        %br
+
+        - if switchboard_entry.sip_account.registration
+          - switchboard_entry.sip_account.calls.each do |call|
+            - if call.callstate == 'RINGING'
+              %span.label.label-info
+                %i.icon-bell.icon-white
+                = "from #{call.callee_number}"
+
+            - if call.callstate == 'EARLY'
+              %span.label.label-info
+                = "calls #{call.destination}"
+        - else
+          %span.label.label-inverse
+            %i.icon-ban-circle.icon-white
diff --git a/app/views/switchboards/_current_user_dashboard.html.haml b/app/views/switchboards/_current_user_dashboard.html.haml
new file mode 100644
index 0000000..1c57a0d
--- /dev/null
+++ b/app/views/switchboards/_current_user_dashboard.html.haml
@@ -0,0 +1,26 @@
+.dashboard
+  - current_user.sip_accounts.each do |sip_account|
+    %table.table.table-striped
+      %thead
+        %tr
+          %td
+            SIP Account
+          %td
+            Direction
+          %td
+            StartStamp
+          %td
+            Destination
+          %td
+            CalleeName
+      %tbody
+        - sip_account.calls.each do |call|
+          %tr
+            %td
+              - current_user.sip_accounts.each do |sip_account|
+                %span.label.label-info
+                  =sip_account.phone_numbers.first.to_s
+            %td=call.direction
+            %td=l Time.at(call.start_stamp)
+            %td=call.destination
+            %td=call.callee_name
\ No newline at end of file
diff --git a/app/views/switchboards/show.html.haml b/app/views/switchboards/show.html.haml
index 2932366..a825806 100644
--- a/app/views/switchboards/show.html.haml
+++ b/app/views/switchboards/show.html.haml
@@ -1,20 +1,21 @@
-- content_for :title, @switchboard.name
+- content_for :title, "Switchboard #{@switchboard.name}"
 
 .row
   .span12
-    .well.pull-right
-      %p
-        =current_user
+    = render :partial => "current_user_dashboard", :current_user => current_user
 
     %ul.thumbnails
       = render :partial => "switchboard_entries/switchboard_entry", :collection => @switchboard_entries
 
-- if can? :edit, @switchboard
-  .row
-    .span12
-      %a.btn.btn-small.btn-warning{:href => switchboard_switchboard_entries_path(@switchboard) }
-        %i.icon-edit.icon-white
-        %span.hidden-phone
-          =t("switchboard_entries.index.page_title")
+    - if can? :edit, @switchboard
+      .row
+        .span12
+          %a.btn.btn-small.btn-warning{:href => switchboard_switchboard_entries_path(@switchboard) }
+            %i.icon-edit.icon-white
+            %span.hidden-phone
+              =t("switchboard_entries.index.page_title")
+
+  .span6
+
 
 = subscribe_to "/switchboards/#{@switchboard.id}"
\ No newline at end of file
-- 
cgit v1.2.3


From 0b4e3dfd031b21c26f7bc9c7c05cd931950ecbd6 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 14 Mar 2013 21:34:06 +0100
Subject: Switchboard stuff

---
 .../_switchboard_entry.html.haml                   | 34 +++++++++++++--------
 .../switchboards/_current_user_dashboard.html.haml | 35 +++++++++++++---------
 2 files changed, 42 insertions(+), 27 deletions(-)

(limited to 'app/views')

diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
index 8d4ee92..b82bb74 100644
--- a/app/views/switchboard_entries/_switchboard_entry.html.haml
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -1,16 +1,16 @@
-%li.span1{:id => "switchboard_entry_id_#{switchboard_entry.id}"}
+%li.span2{:id => "switchboard_entry_id_#{switchboard_entry.id}"}
   %div.thumbnail
     %a.thumbnail{:href => tenant_user_path(switchboard_entry.sip_account.sip_accountable.current_tenant, switchboard_entry.sip_account.sip_accountable)}
       - if switchboard_entry.sip_account.sip_accountable.image?
-        = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:small).to_s, :class => 'img-rounded')
+        = image_tag(switchboard_entry.sip_account.sip_accountable.image_url(:profile).to_s, :class => 'img-rounded', :style => 'width: 100px;')
       - else
         - if switchboard_entry.sip_account.sip_accountable.male?
-          = image_tag 'icons/user-male-16x.png', :class => 'img-rounded'
+          = image_tag('icons/user-male-16x.png', :class => 'img-rounded', :style => 'width: 100px;')
         - else
-          = image_tag 'icons/user-female-16x.png', :class => 'img-rounded'
+          = image_tag('icons/user-female-16x.png', :class => 'img-rounded', :style => 'width: 100px;')
     %p
       %small
-        = truncate(switchboard_entry.to_s, :length => 10)
+        = truncate(switchboard_entry.to_s, :length => 23)
         %br
         - if switchboard_entry.sip_account.phone_numbers.any?
           %span.label
@@ -19,15 +19,23 @@
         %br
 
         - if switchboard_entry.sip_account.registration
-          - switchboard_entry.sip_account.calls.each do |call|
-            - if call.callstate == 'RINGING'
-              %span.label.label-info
-                %i.icon-bell.icon-white
-                = "from #{call.callee_number}"
+          - switchboard_entry.sip_account.call_legs.where(callstate: 'RINGING').each do |call_leg|
+            %span.label.label-warning
+              %i.icon-bell.icon-white
+              = "#{call_leg.caller_id_number}"
+
+          - switchboard_entry.sip_account.call_legs.where(callstate: 'EARLY').each do |call_leg|
+            %span.label.label-info
+              = "calls #{call_leg.destination}"
+
+          - switchboard_entry.sip_account.call_legs.where(callstate: 'ACTIVE').each do |call_leg|
+            %span.label.label-info
+              = "#{call_leg.b_caller_id_number} => #{call_leg.callee_number}"
+
+          - switchboard_entry.sip_account.b_call_legs.where(b_callstate: 'ACTIVE').each do |b_call_leg|
+            %span.label.label-info
+              = "#{b_call_leg.b_caller_id_number} => #{b_call_leg.destination}"
 
-            - if call.callstate == 'EARLY'
-              %span.label.label-info
-                = "calls #{call.destination}"
         - else
           %span.label.label-inverse
             %i.icon-ban-circle.icon-white
diff --git a/app/views/switchboards/_current_user_dashboard.html.haml b/app/views/switchboards/_current_user_dashboard.html.haml
index 1c57a0d..8dd75b9 100644
--- a/app/views/switchboards/_current_user_dashboard.html.haml
+++ b/app/views/switchboards/_current_user_dashboard.html.haml
@@ -4,23 +4,30 @@
       %thead
         %tr
           %td
-            SIP Account
-          %td
-            Direction
-          %td
-            StartStamp
           %td
             Destination
           %td
-            CalleeName
+            Start
+          %td{:span => '2'}
+            Caller
       %tbody
-        - sip_account.calls.each do |call|
+        - sip_account.call_legs.where(callstate: 'RINGING').each do |call_leg|
+          %tr.warning
+            %td
+              %i.icon-bell
+            %td
+              %span.label.label-info
+                =sip_account.phone_numbers.first.to_s
+            %td=l Time.at(call_leg.start_stamp)
+            %td=call_leg.callee_name
+            %td=call_leg.callee_number
+
+        - sip_account.b_call_legs.where(direction: 'inbound').each do |call_leg|
           %tr
             %td
-              - current_user.sip_accounts.each do |sip_account|
-                %span.label.label-info
-                  =sip_account.phone_numbers.first.to_s
-            %td=call.direction
-            %td=l Time.at(call.start_stamp)
-            %td=call.destination
-            %td=call.callee_name
\ No newline at end of file
+            %td
+              %span.label.label-info
+                =sip_account.phone_numbers.first.to_s
+            %td=l Time.at(call_leg.start_stamp)
+            %td=call_leg.b_caller_id_name
+            %td=call_leg.b_caller_id_number
-- 
cgit v1.2.3


From 5ed3837a8688e46a33d3ad3b0eb0343eb1a5ba85 Mon Sep 17 00:00:00 2001
From: Stefan Wintermeyer <stefan.wintermeyer@amooma.de>
Date: Thu, 14 Mar 2013 21:41:33 +0100
Subject: Switchboard UI improvements.

---
 app/views/switchboard_entries/_switchboard_entry.html.haml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'app/views')

diff --git a/app/views/switchboard_entries/_switchboard_entry.html.haml b/app/views/switchboard_entries/_switchboard_entry.html.haml
index b82bb74..8c44153 100644
--- a/app/views/switchboard_entries/_switchboard_entry.html.haml
+++ b/app/views/switchboard_entries/_switchboard_entry.html.haml
@@ -12,7 +12,7 @@
       %small
         = truncate(switchboard_entry.to_s, :length => 23)
         %br
-        - if switchboard_entry.sip_account.phone_numbers.any?
+        - if switchboard_entry.sip_account.phone_numbers.any? && !switchboard_entry.sip_account.call_legs.where(callstate: 'ACTIVE').any? && !switchboard_entry.sip_account.b_call_legs.where(b_callstate: 'ACTIVE').any?
           %span.label
             = switchboard_entry.sip_account.phone_numbers.first.number
 
@@ -29,12 +29,16 @@
               = "calls #{call_leg.destination}"
 
           - switchboard_entry.sip_account.call_legs.where(callstate: 'ACTIVE').each do |call_leg|
+            %span.label
+              = "#{switchboard_entry.sip_account.phone_numbers.first.number} => "
             %span.label.label-info
-              = "#{call_leg.b_caller_id_number} => #{call_leg.callee_number}"
+              = "#{call_leg.callee_number}"
 
           - switchboard_entry.sip_account.b_call_legs.where(b_callstate: 'ACTIVE').each do |b_call_leg|
             %span.label.label-info
-              = "#{b_call_leg.b_caller_id_number} => #{b_call_leg.destination}"
+              = "#{b_call_leg.b_caller_id_number} =>"
+            %span.label
+              = switchboard_entry.sip_account.phone_numbers.first.number
 
         - else
           %span.label.label-inverse
-- 
cgit v1.2.3


From 5f909eb79791c7ab232a8693712cce2583a6ee0b Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Fri, 15 Mar 2013 08:42:30 -0400
Subject: display label

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

(limited to 'app/views')

diff --git a/app/views/softkeys/show.html.haml b/app/views/softkeys/show.html.haml
index 7c068ae..64adbe6 100644
--- a/app/views/softkeys/show.html.haml
+++ b/app/views/softkeys/show.html.haml
@@ -1,5 +1,8 @@
 - content_for :title, t("softkeys.show.page_title")
 
+%p
+  %strong= t("softkeys.show.label") + ":"
+  =@softkey.label
 %p
   %strong= t("softkeys.functions.#{@softkey.softkey_function}") + ":"
   =@softkey.to_s
-- 
cgit v1.2.3


From 7cd62ec6d7e40da2d1882d3ec056dae40c2f7b80 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Mon, 18 Mar 2013 04:44:37 -0400
Subject: callto: url added

---
 app/views/sip_accounts/show.html.haml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'app/views')

diff --git a/app/views/sip_accounts/show.html.haml b/app/views/sip_accounts/show.html.haml
index 9f84c92..e79907f 100644
--- a/app/views/sip_accounts/show.html.haml
+++ b/app/views/sip_accounts/show.html.haml
@@ -60,12 +60,14 @@
 
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @sip_account.sip_accountable, :child => @sip_account }
 
-%p
-  %strong= t('sip_accounts.show.tel_protocol') + ':'
-%p
-  %a.btn.btn-small.btn-default{ :href => '', :onclick => "navigator.registerProtocolHandler(\"tel\", \"#{@register_tel_protocol}\", \"#{@sip_account.to_s}\");" }
-    %i.icon-plus
-    = t('sip_accounts.show.register_tel_protocol')
+- if @register_protocols.count > 0
+  %p
+    %strong= t('sip_accounts.show.call_protocols') + ':'
+  %p
+    - @register_protocols.each do |protocol, url|
+      %a.btn.btn-small.btn-default{ :href => '', :onclick => "navigator.registerProtocolHandler(\"#{protocol}\", \"#{url}\", \"#{@sip_account.to_s}\");" }
+        %i.icon-plus
+        = t("sip_accounts.show.register_#{protocol}_protocol")
 
 %p
   %strong= t('ringtones.name') + ':'
-- 
cgit v1.2.3


From 2470988e06ff861c92d3dc833755f4b262798a12 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 19 Mar 2013 01:57:10 -0400
Subject: members list view added

---
 app/views/conferences/_index_members.html.haml | 40 ++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 app/views/conferences/_index_members.html.haml

(limited to 'app/views')

diff --git a/app/views/conferences/_index_members.html.haml b/app/views/conferences/_index_members.html.haml
new file mode 100644
index 0000000..3837f25
--- /dev/null
+++ b/app/views/conferences/_index_members.html.haml
@@ -0,0 +1,40 @@
+%table.table.table-striped
+  %thead
+    %tr
+      %th= t('conferences.index_members.caller')
+      %th= t('conferences.index_members.join_time')
+      %th= t('conferences.index_members.talking')
+      %th= t('conferences.index_members.flags')
+
+
+  %tbody
+    - for member in members
+      %tr
+        %td
+          -if member[:call]
+            - if member[:call_bleg]
+              = member[:call].b_caller_id_name
+              = member[:call].b_caller_id_number
+            - else
+              = member[:call].caller_id_name
+              = member[:call].caller_id_number
+        %td
+          = member['join_time']
+        %td
+          =  member['flags']['talking']
+        %td
+          - if member['flags']['can_hear'] == 'true'
+            %span.label
+              = t('conferences.index_members.can_hear')
+          - if member['flags']['can_speak'] == 'true'
+            %span.label
+              = t('conferences.index_members.can_speak')
+          - if member['flags']['is_moderator'] == 'true'
+            %span.label
+              = t('conferences.index_members.moderator')
+          - if member['flags']['has_floor'] == 'true'
+            %span.label
+              = t('conferences.index_members.has_floor')
+          - if member['flags']['has_video'] == 'true'
+            %span.label
+              = t('conferences.index_members.video')
-- 
cgit v1.2.3


From 6f3629d352b05524cb7351d235d184802e381974 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Tue, 19 Mar 2013 01:58:21 -0400
Subject: list members

---
 app/views/conferences/show.html.haml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'app/views')

diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index 302f294..fcebb88 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -45,6 +45,24 @@
         %strong= t('conferences.show.announce_left_member_by_name') + ":"
       %td
         = @conference.announce_left_member_by_name
+    - conference_data = @conference.list_conference
+    - if conference_data
+      %tr
+        %td
+          %strong= t('conferences.show.identifier') + ":"
+        %td
+          = conference_data['name']
+      %tr
+        %td
+          %strong= t('conferences.show.member_count') + ":"
+        %td
+          = conference_data['member_count']
+      %tr
+        %td
+          %strong= t('conferences.show.run_time') + ":"
+        %td
+          = conference_data['run_time']
+
 
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @parent, :child => @conference }
 
@@ -54,6 +72,11 @@
 
 = render :partial => 'shared/create_link', :locals => {:parent => @conference, :child_class => PhoneNumber}
 
+- members = @conference.list_members(conference_data)
+- if members && members.count > 0
+  %h2= t("conferences.show.members")
+  = render "index_members", :members => members
+
 %h2= t("conference_invitees.index.page_title")
 - if @conference.conference_invitees.count > 0
   = render "conference_invitees/index_core", :conference_invitees => @conference.conference_invitees
-- 
cgit v1.2.3


From f5d507f8db09f940d44aa97253a40b3cba3678c5 Mon Sep 17 00:00:00 2001
From: Peter Kozak <spag@golwen.net>
Date: Wed, 20 Mar 2013 12:19:41 +0100
Subject: possible_call_forwards fixed

---
 app/views/softkeys/_form_core.html.haml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'app/views')

diff --git a/app/views/softkeys/_form_core.html.haml b/app/views/softkeys/_form_core.html.haml
index 0e251f3..7bed1a5 100644
--- a/app/views/softkeys/_form_core.html.haml
+++ b/app/views/softkeys/_form_core.html.haml
@@ -7,8 +7,7 @@
 
 .inputs
   = f.input :softkey_function_id, :as => :select, :collection => @softkey_functions.map {|x| [I18n.t("softkeys.functions.#{x}"), x.id] }, :label => t('softkeys.form.function.label'), :hint => conditional_hint('softkeys.form.function.hint'), :include_blank => false
-  - call_forwards = @softkey.possible_call_forwards
-  - if call_forwards && call_forwards.count > 0
-    = f.input :softkeyable_id, :collection => call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false
+  - if @possible_call_forwards && @possible_call_forwards.count > 0
+    = f.input :softkeyable_id, :collection => @possible_call_forwards, :label => t('softkeys.form.call_forward.label'), :hint => conditional_hint('softkeys.form.call_forward.hint'), :include_blank => false
   = f.input :number, :label => t('softkeys.form.number.label'), :hint => conditional_hint('softkeys.form.number.hint')
   = f.input :label, :label => t('softkeys.form.label.label'), :hint => conditional_hint('softkeys.form.label.hint')
-- 
cgit v1.2.3