Merge branch 'develop'5.1.2

10 files changed, 250 insertions, 4 deletions

diff --git a/config/locales/views/conferences/de.yml b/config/locales/views/conferences/de.yml
index ba0869c..080047f 100644
--- a/config/locales/views/conferences/de.yml
+++ b/config/locales/views/conferences/de.yml
@@ -27,6 +27,16 @@ de:
         show: 'Anzeigen'
         create: 'Neu anlegen'
         create_for: 'Neue Telefonkonferenz für %{resource} anlegen'
+    index_members:
+      caller: 'Anrufer'
+      join_time: 'Laufzeit'
+      talking: 'Spricht'
+      flags: 'Flags'
+      can_hear: 'hören'
+      can_speak: 'sprechen'
+      moderator: 'moderator'
+      has_floor: 'saal'
+      video: 'video'
     show:
       page_title: 'Telefonkonferenz anzeigen'
       name: 'Name'
@@ -38,6 +48,9 @@ de:
       open_for_anybody: 'Für jeden offen?'
       announce_new_member_by_name: 'Neue Teilnehmer werden angekündigt'
       announce_left_member_by_name: 'Die Konferenz verlassende Teilnehmer werden angekündigt'
+      identifier: 'Identifier'
+      member_count: 'Mitglieder'
+      run_time: 'Laufzeit'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie diese Telefonkonferenz löschen möchten?'
         destroy: 'Löschen'
diff --git a/config/locales/views/conferences/en.yml b/config/locales/views/conferences/en.yml
index e11e9cb..9866122 100644
--- a/config/locales/views/conferences/en.yml
+++ b/config/locales/views/conferences/en.yml
@@ -27,6 +27,16 @@ en:
         show: 'View'
         create: 'New'
         create_for: 'New conference for %{resource}'
+    index_members:
+      caller: 'Caller'
+      join_time: 'Join time'
+      talking: 'Talking'
+      flags: 'Flags'
+      can_hear: 'hear'
+      can_speak: 'speak'
+      moderator: 'moderator'
+      has_floor: 'floor'
+      video: 'video'
     show:
       page_title: 'Show conference'
       name: 'Name'
@@ -38,6 +48,9 @@ en:
       open_for_anybody: 'Open for anybody'
       announce_new_member_by_name: 'Announce new member'
       announce_left_member_by_name: 'Announce left member'
+      identifier: 'Identifier'
+      member_count: 'Members'
+      run_time: 'Run time'
       actions:
         confirm_destroy: 'Are you sure you want to delete this conference?'
         destroy: 'Delete'
diff --git a/config/locales/views/sip_accounts/de.yml b/config/locales/views/sip_accounts/de.yml
index 2b4939b..6accbdb 100644
--- a/config/locales/views/sip_accounts/de.yml
+++ b/config/locales/views/sip_accounts/de.yml
@@ -41,8 +41,9 @@ de:
       registration: 'Registrierung'
       expires: 'Läuft ab'
       user_agent: 'User Agent'
-      tel_protocol: 'TEL Protokoll'
+      call_protocols: 'URLs'
       register_tel_protocol: 'Für tel: URLs registrieren'
+      register_callto_protocol: 'Für callto: URLs registrieren'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Account löschen möchten?'
         destroy: 'Löschen'
diff --git a/config/locales/views/sip_accounts/en.yml b/config/locales/views/sip_accounts/en.yml
index 78d20c2..f160c7d 100644
--- a/config/locales/views/sip_accounts/en.yml
+++ b/config/locales/views/sip_accounts/en.yml
@@ -41,8 +41,9 @@ en:
       registration: 'Registration'
       expires: 'Expires'
       user_agent: 'User Agent'
-      tel_protocol: 'TEL Protocol'
+      call_protocols: 'URLs'
       register_tel_protocol: 'Register for tel: URLs with browser'
+      register_callto_protocol: 'Register for callto: URLs with browser'
       actions:
         confirm_destroy: 'Are you sure you want to delete this SIP account?'
         destroy: 'Delete'
diff --git a/config/locales/views/switchboard_entries/de.yml b/config/locales/views/switchboard_entries/de.yml
new file mode 100644
index 0000000..41804b5
--- /dev/null
+++ b/config/locales/views/switchboard_entries/de.yml
@@ -0,0 +1,55 @@
+de:
+  switchboard_entries:
+    name: 'Switchboard-Eintrag'
+    controller:
+      successfuly_created: 'Switchboard-Eintrag wurde angelegt.'
+      successfuly_updated: 'Switchboard-Eintrag wurde aktualisiert.'
+      successfuly_destroyed: 'Switchboard-Eintrag wurde gelöscht.'
+    index:
+      page_title: 'Liste aller Switchboard-Einträge'
+      switchboard_id: 'Switchboard'
+      sip_account_id: 'SIP-Account'
+      name: 'Name'
+      position: 'Position'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Switchboard-Eintrag'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Switchboard-Eintrag neu anlegen für %{resource}'
+    show:
+      page_title: 'Switchboard-Eintrag bearbeiten'
+      switchboard_id: 'Switchboard'
+      sip_account_id: 'SIP-Account'
+      name: 'Name'
+      position: 'Position'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Switchboard-Eintrag neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Switchboard-Eintrag bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      switchboard_id:
+        label: 'Switchboard'
+        hint: ''
+      sip_account_id:
+        label: 'SIP-Account'
+        hint: ''
+      name:
+        label: 'Name'
+        hint: ''
+      position:
+        label: 'Position'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/switchboard_entries/en.yml b/config/locales/views/switchboard_entries/en.yml
new file mode 100644
index 0000000..71f2fe4
--- /dev/null
+++ b/config/locales/views/switchboard_entries/en.yml
@@ -0,0 +1,55 @@
+en:
+  switchboard_entries:
+    name: 'Switchboardentry'
+    controller:
+      successfuly_created: 'Successfully created Switchboardentry.'
+      successfuly_updated: 'Successfully updated Switchboardentry.'
+      successfuly_destroyed: 'Successfully destroyed Switchboardentry.'
+    index:
+      page_title: 'Listing Switchboardentry'
+      switchboard_id: 'Switchboard'
+      sip_account_id: 'Sip account'
+      name: 'Name'
+      position: 'Position'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Switchboardentry?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Switchboardentry for %{resource}'
+    show:
+      page_title: 'Show Switchboardentry'
+      switchboard_id: 'Switchboard'
+      sip_account_id: 'Sip account'
+      name: 'Name'
+      position: 'Position'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Switchboardentry'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Switchboardentry'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      switchboard_id:
+        label: 'Switchboard'
+        hint: ''
+      sip_account_id:
+        label: 'Sip account'
+        hint: ''
+      name:
+        label: 'Name'
+        hint: ''
+      position:
+        label: 'Position'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/locales/views/switchboards/de.yml b/config/locales/views/switchboards/de.yml
new file mode 100644
index 0000000..97a47b8
--- /dev/null
+++ b/config/locales/views/switchboards/de.yml
@@ -0,0 +1,45 @@
+de:
+  switchboards:
+    name: 'Switchboard'
+    controller:
+      successfuly_created: 'Switchboard wurde angelegt.'
+      successfuly_updated: 'Switchboard wurde aktualisiert.'
+      successfuly_destroyed: 'Switchboard wurde gelöscht.'
+    index:
+      page_title: 'Switchboards'
+      name: 'Name'
+      user_id: 'User'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Switchboard'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Switchboard neu anlegen für %{resource}'
+    show:
+      page_title: 'Switchboard bearbeiten'
+      name: 'Name'
+      user_id: 'User'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Switchboard neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Switchboard bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      user_id:
+        label: 'User'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/switchboards/en.yml b/config/locales/views/switchboards/en.yml
new file mode 100644
index 0000000..a860763
--- /dev/null
+++ b/config/locales/views/switchboards/en.yml
@@ -0,0 +1,45 @@
+en:
+  switchboards:
+    name: 'Switchboard'
+    controller:
+      successfuly_created: 'Successfully created Switchboard.'
+      successfuly_updated: 'Successfully updated Switchboard.'
+      successfuly_destroyed: 'Successfully destroyed Switchboard.'
+    index:
+      page_title: 'Switchboards'
+      name: 'Name'
+      user_id: 'User'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Switchboard?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Switchboard for %{resource}'
+    show:
+      page_title: 'Show Switchboard'
+      name: 'Name'
+      user_id: 'User'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Switchboard'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Switchboard'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      name:
+        label: 'Name'
+        hint: ''
+      user_id:
+        label: 'User'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/private_pub.yml b/config/private_pub.yml
index 19a7e9e..840b2c1 100644
--- a/config/private_pub.yml
+++ b/config/private_pub.yml
@@ -6,5 +6,5 @@ test:
   secret_token: "secret"
 production:
   server: "http://example.com/faye"
-  secret_token: "ade2c51226bf26e7fbbce1e0d8848082b750d23516b46dc5bc12e910e0e64558"
+  secret_token: "4a6049c5f60cd74690c094757dd7afc431a64ac83f1c54f7cf4b3f28215b3bec"
   signature_expiration: 3600 # one hour
diff --git a/config/routes.rb b/config/routes.rb
index 83ac5c4..69caf95 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,11 @@
 Gemeinschaft42c::Application.routes.draw do
 
+  resources :switchboards do
+    resources :switchboard_entries do
+      collection { post :sort }
+    end
+  end
+
   resources :restore_jobs
 
   resources :groups do
@@ -18,12 +24,15 @@ Gemeinschaft42c::Application.routes.draw do
   scope :constraints => lambda{|req|%w(127.0.0.1).include? req.remote_addr} do
     get "trigger/voicemail"
     get "trigger/fax"
+    match 'trigger/fax_has_been_sent/:id' => 'trigger#fax_has_been_sent'
+    match 'trigger/sip_account_update/:id' => 'trigger#sip_account_update'
   end
 
   resources :call_routes do
     collection { 
       post :sort 
       get :show_variables
+      get :test
     }
     resources :route_elements do
       collection { post :sort }
@@ -57,13 +66,17 @@ Gemeinschaft42c::Application.routes.draw do
     collection { post :sort }
   end
 
-  resources :acd_agents, :only => [] do
+  resources :acd_agents do
     resources :phone_numbers
+    member do
+      get 'toggle'
+    end
   end
 
   resources :automatic_call_distributors, :only => [] do
     resources :acd_agents
     resources :phone_numbers
+    resources :call_forwards
   end
 
   resources :hunt_group_members, :only => [] do
@@ -73,6 +86,7 @@ Gemeinschaft42c::Application.routes.draw do
   resources :hunt_groups, :only => [] do
     resources :hunt_group_members
     resources :phone_numbers
+    resources :call_forwards
   end
 
   if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true
@@ -209,6 +223,9 @@ Gemeinschaft42c::Application.routes.draw do
     resources :fax_accounts
     resources :system_messages, :except => [ :edit, :update, :destroy ]
     resources :parking_stalls
+    resources :switchboards do
+      get :display
+    end
   end
   
   resources :user_groups do
@@ -258,6 +275,7 @@ Gemeinschaft42c::Application.routes.draw do
     resources :call_forwards
     resources :ringtones
     resources :calls
+    resources :acd_agents
     resources :call_histories do
       collection do
         delete 'destroy_multiple'