From db9dbf03d88cfbd68ce99a242730b9e870339539 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 7 Mar 2013 13:15:35 +0100 Subject: Added Switchboard scaffold. --- config/locales/views/switchboards/de.yml | 45 ++++++++++++++++++++++++++++++++ config/locales/views/switchboards/en.yml | 45 ++++++++++++++++++++++++++++++++ config/routes.rb | 2 ++ 3 files changed, 92 insertions(+) create mode 100644 config/locales/views/switchboards/de.yml create mode 100644 config/locales/views/switchboards/en.yml (limited to 'config') diff --git a/config/locales/views/switchboards/de.yml b/config/locales/views/switchboards/de.yml new file mode 100644 index 0000000..0bec502 --- /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: 'Liste aller 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..250d5de --- /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: 'Listing Switchboard' + 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/routes.rb b/config/routes.rb index 83ac5c4..821cf73 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,5 @@ Gemeinschaft42c::Application.routes.draw do + resources :switchboards resources :restore_jobs @@ -209,6 +210,7 @@ Gemeinschaft42c::Application.routes.draw do resources :fax_accounts resources :system_messages, :except => [ :edit, :update, :destroy ] resources :parking_stalls + resources :switchboards end resources :user_groups do -- cgit v1.2.3 From 800cf2f11ab5d7f03a52d5ca35e893654ef520ab Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Thu, 7 Mar 2013 15:22:06 -0500 Subject: call forwards view added --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 83ac5c4..0a3c6a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -73,6 +73,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 -- cgit v1.2.3 From 2abc9cfb22e55b709a21b041e04a8221f605e9d7 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Thu, 7 Mar 2013 15:57:02 -0500 Subject: call forwards view added --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 0a3c6a1..0b953ee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -64,6 +64,7 @@ Gemeinschaft42c::Application.routes.draw do resources :automatic_call_distributors, :only => [] do resources :acd_agents resources :phone_numbers + resources :call_forwards end resources :hunt_group_members, :only => [] do -- cgit v1.2.3 From 4d7d5ad238990582d6c90a25272f2141ea9a3b28 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Fri, 8 Mar 2013 05:50:02 -0500 Subject: toggle action added to acd_agents --- config/routes.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 0b953ee..d74df15 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -57,8 +57,11 @@ 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 @@ -260,6 +263,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' -- cgit v1.2.3 From 6374c0b3e38dfc74eb1b4a5a1fcc5229eacdcaf2 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 8 Mar 2013 12:09:17 +0100 Subject: Added SwitchboardEntry scaffold. switchboard has_many switchboard_entries --- config/locales/views/switchboard_entries/de.yml | 55 +++++++++++++++++++++++++ config/locales/views/switchboard_entries/en.yml | 55 +++++++++++++++++++++++++ config/routes.rb | 7 +++- 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 config/locales/views/switchboard_entries/de.yml create mode 100644 config/locales/views/switchboard_entries/en.yml (limited to 'config') 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/routes.rb b/config/routes.rb index 821cf73..369ec92 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,10 @@ Gemeinschaft42c::Application.routes.draw do - resources :switchboards + + resources :switchboards do + resources :switchboard_entries do + collection { post :sort } + end + end resources :restore_jobs -- cgit v1.2.3 From 21d0843117c0962bd962fc50fccaf276a5b3067f Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 10 Mar 2013 08:43:23 +0100 Subject: Misc --- config/routes.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 369ec92..cfee51b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -215,7 +215,9 @@ Gemeinschaft42c::Application.routes.draw do resources :fax_accounts resources :system_messages, :except => [ :edit, :update, :destroy ] resources :parking_stalls - resources :switchboards + resources :switchboards do + get :display + end end resources :user_groups do -- cgit v1.2.3 From fc9b8e69e74a76d6727d5ddceebb018782027b16 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 10 Mar 2013 08:57:50 +0100 Subject: Added Private Pub stuff. https://github.com/ryanb/private_pub --- config/private_pub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') 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 -- cgit v1.2.3 From 3c5a0511d228fb3dc00ae860ade1b8ff032cc42f Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 12 Mar 2013 11:23:20 +0100 Subject: Refactoring --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 976bac8..c661dfb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,6 +26,8 @@ Gemeinschaft42c::Application.routes.draw do get "trigger/fax" end + get "trigger/fax_has_been_sent" + resources :call_routes do collection { post :sort -- cgit v1.2.3 From d11a8692e742720435c4286e3752c8c136cc88cf Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 12 Mar 2013 12:32:32 +0100 Subject: jquery replaceWith for FaxDocument#view after sending the fax --- config/routes.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index c661dfb..c2f9cb5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,10 +24,9 @@ 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' end - get "trigger/fax_has_been_sent" - resources :call_routes do collection { post :sort -- cgit v1.2.3 From 5d3eeec6962010eb0b9cbcb9d3bb87d016bce199 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 12 Mar 2013 13:40:18 +0100 Subject: Added sip_account_update trigger --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index c2f9cb5..ecfefa3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -25,6 +25,7 @@ Gemeinschaft42c::Application.routes.draw 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 -- cgit v1.2.3 From dcdd37036f45d13b7402436ddb1af65c78052ca9 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 13 Mar 2013 15:41:17 -0400 Subject: routing test view --- config/routes.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index ecfefa3..69caf95 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -32,6 +32,7 @@ Gemeinschaft42c::Application.routes.draw do collection { post :sort get :show_variables + get :test } resources :route_elements do collection { post :sort } -- cgit v1.2.3 From f660e6cb2d5c0bf627c36adbeddbf24651b0c326 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Mon, 18 Mar 2013 04:45:08 -0400 Subject: url translations --- config/locales/views/sip_accounts/de.yml | 3 ++- config/locales/views/sip_accounts/en.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'config') 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' -- cgit v1.2.3 From 7bbcde96fbd3661c9c0269477ca48f5fa8d73a1b Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Tue, 19 Mar 2013 01:59:04 -0400 Subject: conference translations --- config/locales/views/conferences/de.yml | 13 +++++++++++++ config/locales/views/conferences/en.yml | 13 +++++++++++++ 2 files changed, 26 insertions(+) (limited to 'config') 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' -- cgit v1.2.3 From 6bdce16181f9380217464ba45ff96a1ae35d6cd2 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Wed, 20 Mar 2013 16:02:55 +0100 Subject: wording --- config/locales/views/switchboards/de.yml | 2 +- config/locales/views/switchboards/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/locales/views/switchboards/de.yml b/config/locales/views/switchboards/de.yml index 0bec502..97a47b8 100644 --- a/config/locales/views/switchboards/de.yml +++ b/config/locales/views/switchboards/de.yml @@ -6,7 +6,7 @@ de: successfuly_updated: 'Switchboard wurde aktualisiert.' successfuly_destroyed: 'Switchboard wurde gelöscht.' index: - page_title: 'Liste aller Switchboards' + page_title: 'Switchboards' name: 'Name' user_id: 'User' actions: diff --git a/config/locales/views/switchboards/en.yml b/config/locales/views/switchboards/en.yml index 250d5de..a860763 100644 --- a/config/locales/views/switchboards/en.yml +++ b/config/locales/views/switchboards/en.yml @@ -6,7 +6,7 @@ en: successfuly_updated: 'Successfully updated Switchboard.' successfuly_destroyed: 'Successfully destroyed Switchboard.' index: - page_title: 'Listing Switchboard' + page_title: 'Switchboards' name: 'Name' user_id: 'User' actions: -- cgit v1.2.3