From d4a664a0495bd183b16a239aeb4c342e1ca739fa Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 30 Jan 2013 15:59:52 +0100 Subject: select route endpoint --- config/locales/views/call_routes/de.yml | 5 +---- config/locales/views/call_routes/en.yml | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'config') diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml index a8d6f4b..77b597b 100644 --- a/config/locales/views/call_routes/de.yml +++ b/config/locales/views/call_routes/de.yml @@ -46,10 +46,7 @@ de: name: label: 'Name' hint: '' - endpoint_type: - label: 'Endpoint type' - hint: '' - endpoint_id: + endpoint: label: 'Endpoint' hint: '' position: diff --git a/config/locales/views/call_routes/en.yml b/config/locales/views/call_routes/en.yml index 8596474..c37773d 100644 --- a/config/locales/views/call_routes/en.yml +++ b/config/locales/views/call_routes/en.yml @@ -46,10 +46,7 @@ en: name: label: 'Name' hint: '' - endpoint_type: - label: 'Endpoint type' - hint: '' - endpoint_id: + endpoint: label: 'Endpoint' hint: '' position: -- cgit v1.2.3 From 8da882cf3ec53f9057b17bd8dd39c2eadb2a88c2 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 31 Jan 2013 11:39:25 +0100 Subject: Fixed single sign on. #145 --- config/routes.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 9d47efc..a0ac93a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,7 +112,7 @@ Gemeinschaft42c::Application.routes.draw do end resources :gemeinschaft_setups, :only => [:new, :create] - + resources :phone_number_ranges, :only => [] do resources :phone_numbers do member do @@ -228,9 +228,6 @@ Gemeinschaft42c::Application.routes.draw do root :to => "page#index" - get "wizards/new_initial_setup" - post "wizards/create_initial_setup" - resources :users do # Display all phone books that the current user owns: resources :phone_books -- cgit v1.2.3 From 68f0f677c5cba6775622d0e50c4315e6361ff5c9 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 31 Jan 2013 12:26:47 +0100 Subject: First test setup for the backup. --- config/backup.rb | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 config/backup.rb (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb new file mode 100644 index 0000000..a7d98c3 --- /dev/null +++ b/config/backup.rb @@ -0,0 +1,32 @@ +# encoding: utf-8 + +## +# Backup +# Generated Main Config Template +# +# For more information: +# +# View the Git repository at https://github.com/meskyanichi/backup +# View the Wiki/Documentation at https://github.com/meskyanichi/backup/wiki +# View the issue log at https://github.com/meskyanichi/backup/issues + +## +# Global Configuration +# Add more (or remove) global configuration below +# +# Backup::Storage::S3.defaults do |s3| +# s3.access_key_id = "my_access_key_id" +# s3.secret_access_key = "my_secret_access_key" +# end +# +# Backup::Encryptor::OpenSSL.defaults do |encryption| +# encryption.password = "my_password" +# encryption.base64 = true +# encryption.salt = true +# end + +## +# Load all models from the models directory (after the above global configuration blocks) +Dir[File.join(File.dirname(Config.config_file), "models", "*.rb")].each do |model| + instance_eval(File.read(model)) +end -- cgit v1.2.3 From d3af3a902ef110b50abcc599962bc856eefe4428 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 31 Jan 2013 14:42:20 +0100 Subject: Fixed the backup config. --- config/backup.rb | 65 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 27 deletions(-) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index a7d98c3..4a48ac5 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -1,32 +1,43 @@ # encoding: utf-8 -## -# Backup -# Generated Main Config Template -# -# For more information: -# -# View the Git repository at https://github.com/meskyanichi/backup -# View the Wiki/Documentation at https://github.com/meskyanichi/backup/wiki -# View the issue log at https://github.com/meskyanichi/backup/issues +require 'inifile' +SYSTEM_ODBC_CONFIGURATION = IniFile.load('/var/lib/freeswitch/.odbc.ini') -## -# Global Configuration -# Add more (or remove) global configuration below -# -# Backup::Storage::S3.defaults do |s3| -# s3.access_key_id = "my_access_key_id" -# s3.secret_access_key = "my_secret_access_key" -# end -# -# Backup::Encryptor::OpenSSL.defaults do |encryption| -# encryption.password = "my_password" -# encryption.base64 = true -# encryption.salt = true -# end +Backup::Model.new(:gs5, 'GS5 backup') do + + ## + # Split [Splitter] + # + # Split the backup file in to chunks of 2 GB + # if the backup file size exceeds 2 GB + # + split_into_chunks_of 2048 + + ## + # MySQL [Database] + # + database MySQL do |db| + # To dump all databases, set `db.name = :all` (or leave blank) + db.name = SYSTEM_ODBC_CONFIGURATION['gemeinschaft']['DATABASE'] + db.username = SYSTEM_ODBC_CONFIGURATION['gemeinschaft']['USER'] + db.password = SYSTEM_ODBC_CONFIGURATION['gemeinschaft']['PASSWORD'] + db.host = "localhost" + db.port = 3306 + db.socket = "/var/run/mysqld/mysqld.sock" + end + + ## + # Local (Copy) [Storage] + # + store_with Local do |local| + local.path = "/var/backups/" + local.keep = 5 + end + + ## + # Gzip [Compressor] + # + compress_with Gzip -## -# Load all models from the models directory (after the above global configuration blocks) -Dir[File.join(File.dirname(Config.config_file), "models", "*.rb")].each do |model| - instance_eval(File.read(model)) end + -- cgit v1.2.3 From aad8a03991fe616f84fa18ed1db81831220f8d64 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 1 Feb 2013 15:36:59 +0100 Subject: Added faxes and voicemails to the backup job. --- config/backup.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index 4a48ac5..c3da9bc 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -26,6 +26,21 @@ Backup::Model.new(:gs5, 'GS5 backup') do db.socket = "/var/run/mysqld/mysqld.sock" end + ## + # Faxes + # + archive :faxes do |archive| + archive.add '/opt/gemeinschaft/public/uploads/fax_document/' + archive.add '/opt/gemeinschaft/public/uploads/fax_thumbnail/' + end + + ## + # Voicemails + # + archive :voicemails do |archive| + archive.add '/var/opt/gemeinschaft/freeswitch/voicemail/' + end + ## # Local (Copy) [Storage] # -- cgit v1.2.3 From ba5b2737365592cc511a526a3b14be46c3a75467 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 2 Feb 2013 11:42:52 +0100 Subject: Created a sortable table for the call_routes. #151 --- config/routes.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index a0ac93a..9a3b3a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,16 +6,8 @@ Gemeinschaft42c::Application.routes.draw do end resources :call_routes do - resources :route_elements do - member do - put 'move_higher' - put 'move_lower' - end - end - member do - put 'move_higher' - put 'move_lower' - end + collection { post :sort } + resources :route_elements end resources :gateways do -- cgit v1.2.3 From 2e5789bcaf38a7c2b8b6ffabe9140b4517dcffc8 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 2 Feb 2013 15:36:41 +0100 Subject: Set a trunk_access_code during setup. #126 --- config/locales/views/gemeinschaft_setups/de.yml | 3 +++ config/locales/views/gemeinschaft_setups/en.yml | 3 +++ 2 files changed, 6 insertions(+) (limited to 'config') diff --git a/config/locales/views/gemeinschaft_setups/de.yml b/config/locales/views/gemeinschaft_setups/de.yml index 57bc7e6..eb0145c 100644 --- a/config/locales/views/gemeinschaft_setups/de.yml +++ b/config/locales/views/gemeinschaft_setups/de.yml @@ -28,6 +28,9 @@ de: default_area_code: label: 'Standard Ortsvorwahl' hint: '030 für Berlin, 0261 für Koblenz, 02631 für Neuwied, usw.' + trunk_access_code: + label: 'Amtsholungsziffer' + hint: '' default_company_name: label: 'Name der Organisation' hint: 'z.B. Firmenname' diff --git a/config/locales/views/gemeinschaft_setups/en.yml b/config/locales/views/gemeinschaft_setups/en.yml index 9d5f965..3a1ac39 100644 --- a/config/locales/views/gemeinschaft_setups/en.yml +++ b/config/locales/views/gemeinschaft_setups/en.yml @@ -28,6 +28,9 @@ en: default_area_code: label: 'Default area code' hint: '' + trunk_access_code: + label: 'Trunk access code' + hint: '' default_company_name: label: 'Name of the organisation' hint: 'e.g. name of the company' -- cgit v1.2.3 From 66a53a49705c269d73f9d51bb0d4a51283049c71 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 4 Feb 2013 13:00:45 +0100 Subject: Changed softkey table to be sortable. #150 --- config/environments/development.rb | 2 +- config/routes.rb | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/environments/development.rb b/config/environments/development.rb index e677834..1a3acae 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -13,7 +13,7 @@ Gemeinschaft42c::Application.configure do config.consider_all_requests_local = true # Enable caching for development - config.action_controller.perform_caching = false + config.action_controller.perform_caching = true CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new # Don't care if the mailer can't send diff --git a/config/routes.rb b/config/routes.rb index 9a3b3a3..1ad621e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -271,6 +271,10 @@ Gemeinschaft42c::Application.routes.draw do end end + resources :softkeys, :only => [ :sort ] do + collection { post :sort } + end + resources :sip_accounts, :only => [] do resources :phones_sip_accounts resources :phone_numbers do @@ -279,12 +283,7 @@ Gemeinschaft42c::Application.routes.draw do put 'move_lower' end end - resources :softkeys do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :softkeys resources :call_histories do collection do delete 'destroy_multiple' -- cgit v1.2.3 From 636be20a183fac10637fea700f55f89bc371577b Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 4 Feb 2013 13:51:15 +0100 Subject: Refactoring and bugfixes. --- config/environments/development.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/environments/development.rb b/config/environments/development.rb index 1a3acae..e677834 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -13,7 +13,7 @@ Gemeinschaft42c::Application.configure do config.consider_all_requests_local = true # Enable caching for development - config.action_controller.perform_caching = true + config.action_controller.perform_caching = false CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new # Don't care if the mailer can't send -- cgit v1.2.3 From 3dead8f9bd964c7330f193cbec82afe44db4149d Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 4 Feb 2013 14:23:26 +0100 Subject: intermediate step --- config/routes.rb | 83 ++++++++++---------------------------------------------- 1 file changed, 15 insertions(+), 68 deletions(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 1ad621e..fbb32f6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -33,95 +33,54 @@ Gemeinschaft42c::Application.routes.draw do resources :rows end + resources :phone_numbers, :only => [:sort] do + collection { post :sort } + end + resources :acd_agents, :only => [] do - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end resources :automatic_call_distributors, :only => [] do resources :acd_agents - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end resources :hunt_group_members, :only => [] do - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end resources :hunt_groups, :only => [] do resources :hunt_group_members - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true resources :whitelists, :only => [] do - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end end resources :access_authorizations, :only => [] do - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end resources :fax_documents resources :fax_accounts, :only => [] do resources :fax_documents - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end resources :gemeinschaft_setups, :only => [:new, :create] resources :phone_number_ranges, :only => [] do - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end resources :conferences, :only => [] do resources :conference_invitees - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers end resources :phone_numbers, :only => [] do @@ -260,12 +219,7 @@ Gemeinschaft42c::Application.routes.draw do resources :callthroughs, :only => [] do resources :access_authorizations - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true resources :whitelists end @@ -277,12 +231,7 @@ Gemeinschaft42c::Application.routes.draw do resources :sip_accounts, :only => [] do resources :phones_sip_accounts - resources :phone_numbers do - member do - put 'move_higher' - put 'move_lower' - end - end + resources :phone_numbers resources :softkeys resources :call_histories do collection do @@ -313,8 +262,6 @@ Gemeinschaft42c::Application.routes.draw do resources :phone_book_entries, :only => [ :index, :show ] do resources :phone_numbers do member do - put 'move_higher' - put 'move_lower' put 'call' end end -- cgit v1.2.3 From bb8168c33f9501fe877345a7bbc7b7f7b64cdfc7 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 5 Feb 2013 12:40:42 +0100 Subject: Added a BackupJob scaffold. --- config/backup.rb | 12 +++---- config/locales/views/backup_jobs/de.yml | 60 +++++++++++++++++++++++++++++++++ config/locales/views/backup_jobs/en.yml | 60 +++++++++++++++++++++++++++++++++ config/routes.rb | 2 ++ 4 files changed, 128 insertions(+), 6 deletions(-) create mode 100644 config/locales/views/backup_jobs/de.yml create mode 100644 config/locales/views/backup_jobs/en.yml (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index c3da9bc..4e5cbf2 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -29,10 +29,10 @@ Backup::Model.new(:gs5, 'GS5 backup') do ## # Faxes # - archive :faxes do |archive| - archive.add '/opt/gemeinschaft/public/uploads/fax_document/' - archive.add '/opt/gemeinschaft/public/uploads/fax_thumbnail/' - end + #archive :faxes do |archive| + # archive.add '/opt/gemeinschaft/public/uploads/fax_document/' + # archive.add '/opt/gemeinschaft/public/uploads/fax_thumbnail/' + #end ## # Voicemails @@ -45,8 +45,8 @@ Backup::Model.new(:gs5, 'GS5 backup') do # Local (Copy) [Storage] # store_with Local do |local| - local.path = "/var/backups/" - local.keep = 5 + local.path = "/var/backups/GS5/" + local.keep = 3 end ## diff --git a/config/locales/views/backup_jobs/de.yml b/config/locales/views/backup_jobs/de.yml new file mode 100644 index 0000000..b81b532 --- /dev/null +++ b/config/locales/views/backup_jobs/de.yml @@ -0,0 +1,60 @@ +de: + backup_jobs: + name: 'Backup job' + controller: + successfuly_created: 'Backup job wurde angelegt.' + successfuly_updated: 'Backup job wurde aktualisiert.' + successfuly_destroyed: 'Backup job wurde gelöscht.' + index: + page_title: 'Übersicht von Backup job' + started_at: 'Started at' + finished_at: 'Finished at' + state: 'State' + directory: 'Directory' + size_of_the_backup: 'Size of the backup' + actions: + confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Backup job' + destroy: 'Löschen' + edit: 'Bearbeiten' + show: 'Anzeigen' + create: 'Neu anlegen' + create_for: 'Backup job neu anlegen für %{resource}' + show: + page_title: 'Backup job bearbeiten' + started_at: 'Started at' + finished_at: 'Finished at' + state: 'State' + directory: 'Directory' + size_of_the_backup: 'Size of the backup' + 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: 'Backup job neu anlegen' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: + page_title: 'Backup job bearbeiten' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + form: + started_at: + label: 'Started at' + hint: '' + finished_at: + label: 'Finished at' + hint: '' + state: + label: 'State' + hint: '' + directory: + label: 'Directory' + hint: '' + size_of_the_backup: + label: 'Size of the backup' + hint: '' + submit: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/backup_jobs/en.yml b/config/locales/views/backup_jobs/en.yml new file mode 100644 index 0000000..83f4388 --- /dev/null +++ b/config/locales/views/backup_jobs/en.yml @@ -0,0 +1,60 @@ +en: + backup_jobs: + name: 'Backup job' + controller: + successfuly_created: 'Successfully created Backup job.' + successfuly_updated: 'Successfully updated Backup job.' + successfuly_destroyed: 'Successfully destroyed Backup job.' + index: + page_title: 'Listing Backup job' + started_at: 'Started at' + finished_at: 'Finished at' + state: 'State' + directory: 'Directory' + size_of_the_backup: 'Size of the backup' + actions: + confirm_destroy: 'Are you sure you want to delete this Backup job?' + destroy: 'Delete' + edit: 'Edit' + show: 'View' + create: 'New' + create_for: 'New Backup job for %{resource}' + show: + page_title: 'Show Backup job' + started_at: 'Started at' + finished_at: 'Finished at' + state: 'State' + directory: 'Directory' + size_of_the_backup: 'Size of the backup' + actions: + confirm_destroy: 'Are you sure you want to delete this element?' + destroy: 'Delete' + edit: 'Edit' + view_all: 'View All' + new: + page_title: 'New Backup job' + actions: + back_to_list: 'Back to Index' + edit: + page_title: 'Editing Backup job' + actions: + back_to_list: 'Back to Index' + edit: 'Edit' + view_all: 'View All' + form: + started_at: + label: 'Started at' + hint: '' + finished_at: + label: 'Finished at' + hint: '' + state: + label: 'State' + hint: '' + directory: + label: 'Directory' + hint: '' + size_of_the_backup: + label: 'Size of the backup' + hint: '' + submit: 'Submit' \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index fbb32f6..3c3928f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Gemeinschaft42c::Application.routes.draw do + resources :backup_jobs, :except => [:edit, :update] + scope :constraints => lambda{|req|%w(127.0.0.1).include? req.remote_addr} do get "trigger/voicemail" get "trigger/fax" -- cgit v1.2.3 From dbb0715f4622ad55fce36e51e3a5d046180a0ea7 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 5 Feb 2013 12:54:11 +0100 Subject: Translations for tenant#show view (admin mode). #137 --- config/locales/navigation.de.yml | 3 +++ config/locales/navigation.en.yml | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 config/locales/navigation.de.yml create mode 100644 config/locales/navigation.en.yml (limited to 'config') diff --git a/config/locales/navigation.de.yml b/config/locales/navigation.de.yml new file mode 100644 index 0000000..779248c --- /dev/null +++ b/config/locales/navigation.de.yml @@ -0,0 +1,3 @@ +de: + navigation: + admin_docu: 'Admin-Doku' \ No newline at end of file diff --git a/config/locales/navigation.en.yml b/config/locales/navigation.en.yml new file mode 100644 index 0000000..82e901b --- /dev/null +++ b/config/locales/navigation.en.yml @@ -0,0 +1,3 @@ +en: + navigation: + admin_docu: 'Admin-Docu' \ No newline at end of file -- cgit v1.2.3 From bcce809c6e628fb7c067437e98a5195c5e228532 Mon Sep 17 00:00:00 2001 From: spag Date: Tue, 5 Feb 2013 13:58:58 +0100 Subject: show dialplan variables --- config/routes.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 3c3928f..653b811 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,7 +8,10 @@ Gemeinschaft42c::Application.routes.draw do end resources :call_routes do - collection { post :sort } + collection { + post :sort + get :show_variables + } resources :route_elements end -- cgit v1.2.3 From 75b36967fed9db8268391ac10b02f5c0870c32ca Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 5 Feb 2013 15:11:56 +0100 Subject: Finetuning backup. --- config/backup.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index 4e5cbf2..46ef058 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -3,7 +3,7 @@ require 'inifile' SYSTEM_ODBC_CONFIGURATION = IniFile.load('/var/lib/freeswitch/.odbc.ini') -Backup::Model.new(:gs5, 'GS5 backup') do +Backup::Model.new(:GS5, 'GS5 backup') do ## # Split [Splitter] @@ -45,7 +45,7 @@ Backup::Model.new(:gs5, 'GS5 backup') do # Local (Copy) [Storage] # store_with Local do |local| - local.path = "/var/backups/GS5/" + local.path = "/var/backups/" local.keep = 3 end -- cgit v1.2.3 From 3edd6e58ea3f5d25068ea9d47f639ae89e5f2c0c Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 6 Feb 2013 11:07:04 +0100 Subject: Improved the backup. --- config/backup.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index 46ef058..d57a47e 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -46,7 +46,6 @@ Backup::Model.new(:GS5, 'GS5 backup') do # store_with Local do |local| local.path = "/var/backups/" - local.keep = 3 end ## -- cgit v1.2.3 From 07d49f54067cfb8666f650323c7ffefe1e860b24 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 6 Feb 2013 16:03:43 +0100 Subject: Use CarrierWave to store the backup file. --- config/backup.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index d57a47e..d1cbcdc 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -11,7 +11,7 @@ Backup::Model.new(:GS5, 'GS5 backup') do # Split the backup file in to chunks of 2 GB # if the backup file size exceeds 2 GB # - split_into_chunks_of 2048 + # split_into_chunks_of 2048 ## # MySQL [Database] -- cgit v1.2.3 From a41d928d0f7a0db062214532e6df6f9db410756e Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 7 Feb 2013 11:15:42 +0100 Subject: Added faxes to the backup. --- config/backup.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index d1cbcdc..3bb0d30 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -29,10 +29,9 @@ Backup::Model.new(:GS5, 'GS5 backup') do ## # Faxes # - #archive :faxes do |archive| - # archive.add '/opt/gemeinschaft/public/uploads/fax_document/' - # archive.add '/opt/gemeinschaft/public/uploads/fax_thumbnail/' - #end + archive :faxes do |archive| + archive.add '/opt/gemeinschaft/public/uploads/fax_document' + end ## # Voicemails -- cgit v1.2.3 From 45761a957746f9787ffe438b14014a6913cfabcf Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 7 Feb 2013 11:39:53 +0100 Subject: Check if the directories exist (otherwise tar starts to cry like a baby). --- config/backup.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index 3bb0d30..0057f01 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -30,14 +30,18 @@ Backup::Model.new(:GS5, 'GS5 backup') do # Faxes # archive :faxes do |archive| - archive.add '/opt/gemeinschaft/public/uploads/fax_document' + if File.exists?('/opt/gemeinschaft/public/uploads/fax_document') + archive.add '/opt/gemeinschaft/public/uploads/fax_document' + end end ## # Voicemails # archive :voicemails do |archive| - archive.add '/var/opt/gemeinschaft/freeswitch/voicemail/' + if File.exists?('/var/opt/gemeinschaft/freeswitch/voicemail') + archive.add '/var/opt/gemeinschaft/freeswitch/voicemail' + end end ## -- cgit v1.2.3 From 26eae9e70097be1cbff8baba9c3641512bcf6635 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 7 Feb 2013 11:46:39 +0100 Subject: Different syntax. --- config/backup.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/backup.rb b/config/backup.rb index 0057f01..e5816c1 100644 --- a/config/backup.rb +++ b/config/backup.rb @@ -29,8 +29,8 @@ Backup::Model.new(:GS5, 'GS5 backup') do ## # Faxes # - archive :faxes do |archive| - if File.exists?('/opt/gemeinschaft/public/uploads/fax_document') + if File.exists?('/opt/gemeinschaft/public/uploads/fax_document') + archive :faxes do |archive| archive.add '/opt/gemeinschaft/public/uploads/fax_document' end end @@ -38,8 +38,8 @@ Backup::Model.new(:GS5, 'GS5 backup') do ## # Voicemails # - archive :voicemails do |archive| - if File.exists?('/var/opt/gemeinschaft/freeswitch/voicemail') + if File.exists?('/var/opt/gemeinschaft/freeswitch/voicemail') + archive :voicemails do |archive| archive.add '/var/opt/gemeinschaft/freeswitch/voicemail' end end -- cgit v1.2.3 From ea8703cec6c82edefc65fe35fc60a1d4c0a7c1a3 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 7 Feb 2013 20:48:24 +0100 Subject: Added whenever gem and an example daily rake task. --- config/schedule.rb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 config/schedule.rb (limited to 'config') diff --git a/config/schedule.rb b/config/schedule.rb new file mode 100644 index 0000000..0b5f0ca --- /dev/null +++ b/config/schedule.rb @@ -0,0 +1,24 @@ +# Use this file to easily define all of your cron jobs. +# +# It's helpful, but not entirely necessary to understand cron before proceeding. +# http://en.wikipedia.org/wiki/Cron + +# Example: +# +# set :output, "/path/to/my/cron_log.log" +# +# every 2.hours do +# command "/usr/bin/some_great_command" +# runner "MyModel.some_method" +# rake "some:great:rake:task" +# end +# +# every 4.days do +# runner "AnotherModel.prune_old_records" +# end + +every 1.day, :at => '4:00 am' do + rake "backup:daily_backup" +end + +# Learn more: http://github.com/javan/whenever -- cgit v1.2.3 From 4c9cc92c0a49ec34c8bf00e31d1710450fb533fa Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Sun, 10 Feb 2013 08:09:05 +0000 Subject: firewall blacklist model added --- config/locales/views/intruders/de.yml | 110 ++++++++++++++++++++++++++++++++++ config/locales/views/intruders/en.yml | 110 ++++++++++++++++++++++++++++++++++ config/routes.rb | 2 + 3 files changed, 222 insertions(+) create mode 100644 config/locales/views/intruders/de.yml create mode 100644 config/locales/views/intruders/en.yml (limited to 'config') diff --git a/config/locales/views/intruders/de.yml b/config/locales/views/intruders/de.yml new file mode 100644 index 0000000..42ece4b --- /dev/null +++ b/config/locales/views/intruders/de.yml @@ -0,0 +1,110 @@ +de: + intruders: + name: 'Intruder' + controller: + successfuly_created: 'Intruder wurde angelegt.' + successfuly_updated: 'Intruder wurde aktualisiert.' + successfuly_destroyed: 'Intruder wurde gelöscht.' + index: + page_title: 'Übersicht von Intruder' + list_type: 'List type' + key: 'Key' + points: 'Points' + bans: 'Bans' + ban_last: 'Ban last' + ban_end: 'Ban end' + contact_ip: 'Contact ip' + contact_port: 'Contact port' + contact_count: 'Contact count' + contact_last: 'Contact last' + contacts_per_second: 'Contacts per second' + contacts_per_second_max: 'Contacts per second max' + user_agent: 'User agent' + to_user: 'To user' + comment: 'Comment' + actions: + confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Intruder' + destroy: 'Löschen' + edit: 'Bearbeiten' + show: 'Anzeigen' + create: 'Neu anlegen' + create_for: 'Intruder neu anlegen für %{resource}' + show: + page_title: 'Intruder bearbeiten' + list_type: 'List type' + key: 'Key' + points: 'Points' + bans: 'Bans' + ban_last: 'Ban last' + ban_end: 'Ban end' + contact_ip: 'Contact ip' + contact_port: 'Contact port' + contact_count: 'Contact count' + contact_last: 'Contact last' + contacts_per_second: 'Contacts per second' + contacts_per_second_max: 'Contacts per second max' + user_agent: 'User agent' + to_user: 'To user' + comment: 'Comment' + 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: 'Intruder neu anlegen' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: + page_title: 'Intruder bearbeiten' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + form: + list_type: + label: 'List type' + hint: '' + key: + label: 'Key' + hint: '' + points: + label: 'Points' + hint: '' + bans: + label: 'Bans' + hint: '' + ban_last: + label: 'Ban last' + hint: '' + ban_end: + label: 'Ban end' + hint: '' + contact_ip: + label: 'Contact ip' + hint: '' + contact_port: + label: 'Contact port' + hint: '' + contact_count: + label: 'Contact count' + hint: '' + contact_last: + label: 'Contact last' + hint: '' + contacts_per_second: + label: 'Contacts per second' + hint: '' + contacts_per_second_max: + label: 'Contacts per second max' + hint: '' + user_agent: + label: 'User agent' + hint: '' + to_user: + label: 'To user' + hint: '' + comment: + label: 'Comment' + hint: '' + submit: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/intruders/en.yml b/config/locales/views/intruders/en.yml new file mode 100644 index 0000000..99c2dcb --- /dev/null +++ b/config/locales/views/intruders/en.yml @@ -0,0 +1,110 @@ +en: + intruders: + name: 'Intruder' + controller: + successfuly_created: 'Successfully created Intruder.' + successfuly_updated: 'Successfully updated Intruder.' + successfuly_destroyed: 'Successfully destroyed Intruder.' + index: + page_title: 'Listing Intruder' + list_type: 'List type' + key: 'Key' + points: 'Points' + bans: 'Bans' + ban_last: 'Ban last' + ban_end: 'Ban end' + contact_ip: 'Contact ip' + contact_port: 'Contact port' + contact_count: 'Contact count' + contact_last: 'Contact last' + contacts_per_second: 'Contacts per second' + contacts_per_second_max: 'Contacts per second max' + user_agent: 'User agent' + to_user: 'To user' + comment: 'Comment' + actions: + confirm_destroy: 'Are you sure you want to delete this Intruder?' + destroy: 'Delete' + edit: 'Edit' + show: 'View' + create: 'New' + create_for: 'New Intruder for %{resource}' + show: + page_title: 'Show Intruder' + list_type: 'List type' + key: 'Key' + points: 'Points' + bans: 'Bans' + ban_last: 'Ban last' + ban_end: 'Ban end' + contact_ip: 'Contact ip' + contact_port: 'Contact port' + contact_count: 'Contact count' + contact_last: 'Contact last' + contacts_per_second: 'Contacts per second' + contacts_per_second_max: 'Contacts per second max' + user_agent: 'User agent' + to_user: 'To user' + comment: 'Comment' + actions: + confirm_destroy: 'Are you sure you want to delete this element?' + destroy: 'Delete' + edit: 'Edit' + view_all: 'View All' + new: + page_title: 'New Intruder' + actions: + back_to_list: 'Back to Index' + edit: + page_title: 'Editing Intruder' + actions: + back_to_list: 'Back to Index' + edit: 'Edit' + view_all: 'View All' + form: + list_type: + label: 'List type' + hint: '' + key: + label: 'Key' + hint: '' + points: + label: 'Points' + hint: '' + bans: + label: 'Bans' + hint: '' + ban_last: + label: 'Ban last' + hint: '' + ban_end: + label: 'Ban end' + hint: '' + contact_ip: + label: 'Contact ip' + hint: '' + contact_port: + label: 'Contact port' + hint: '' + contact_count: + label: 'Contact count' + hint: '' + contact_last: + label: 'Contact last' + hint: '' + contacts_per_second: + label: 'Contacts per second' + hint: '' + contacts_per_second_max: + label: 'Contacts per second max' + hint: '' + user_agent: + label: 'User agent' + hint: '' + to_user: + label: 'To user' + hint: '' + comment: + label: 'Comment' + hint: '' + submit: 'Submit' \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 653b811..05d09dc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Gemeinschaft42c::Application.routes.draw do + resources :intruders + resources :backup_jobs, :except => [:edit, :update] scope :constraints => lambda{|req|%w(127.0.0.1).include? req.remote_addr} do -- cgit v1.2.3 From 29db90c2c8a9a6a3087e77eae8615ddf0049087b Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 11 Feb 2013 14:40:38 +0100 Subject: Deleted PrivatePub stuff. --- config/locales/views/system_messages/de.yml | 38 ----------------------------- config/locales/views/system_messages/en.yml | 38 ----------------------------- 2 files changed, 76 deletions(-) delete mode 100644 config/locales/views/system_messages/de.yml delete mode 100644 config/locales/views/system_messages/en.yml (limited to 'config') diff --git a/config/locales/views/system_messages/de.yml b/config/locales/views/system_messages/de.yml deleted file mode 100644 index d841d0b..0000000 --- a/config/locales/views/system_messages/de.yml +++ /dev/null @@ -1,38 +0,0 @@ -de: - system_messages: - name: 'Systemnachricht' - controller: - successfuly_created: 'Eine Systemnachricht wurde erstellt.' - successfuly_updated: 'Eine Systemnachricht wurde aktualisiert.' - successfuly_destroyed: 'Eine Systemnachricht wurde gelöscht.' - index: - page_title: 'Systemnachrichten' - user_id: 'Benutzer' - content: 'Nachricht' - actions: - confirm_destroy: 'Sind Sie sicher, dass Sie diese Systemnachricht löschen möchten?' - destroy: 'Löschen' - edit: 'Bearbeiten' - show: 'Anzeigen' - create: 'Neu anlegen' - show: - page_title: 'Systemnachricht anzeigen' - user_id: 'Benutzer' - content: 'Nachricht' - actions: - confirm_destroy: 'Sind Sie sicher, dass Sie diese Systemnachricht löschen möchten?' - destroy: 'Löschen' - edit: 'Bearbeiten' - view_all: 'Alle anzeigen' - new: - page_title: 'Neue Systemnachricht' - edit: - page_title: 'Systemnachricht bezüglich %{resource} bearbeiten' - form: - user_id: - label: 'Benutzer' - hint: '' - content: - label: 'Nachricht' - hint: '' - submit: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/system_messages/en.yml b/config/locales/views/system_messages/en.yml deleted file mode 100644 index a039b10..0000000 --- a/config/locales/views/system_messages/en.yml +++ /dev/null @@ -1,38 +0,0 @@ -en: - system_messages: - name: 'System message' - controller: - successfuly_created: 'Successfully created System message.' - successfuly_updated: 'Successfully updated System message.' - successfuly_destroyed: 'Successfully destroyed System message.' - index: - page_title: 'System messages' - user_id: 'User' - content: 'Content' - actions: - confirm_destroy: 'Are you sure you want to delete this element?' - destroy: 'Delete' - edit: 'Edit' - show: 'View' - create: 'New' - show: - page_title: 'Editing System message' - user_id: 'User' - content: 'Content' - actions: - confirm_destroy: 'Are you sure you want to delete this element?' - destroy: 'Delete' - edit: 'Edit' - view_all: 'View All' - new: - page_title: 'New System message' - edit: - page_title: 'Editing System message %{resource}' - form: - user_id: - label: 'User' - hint: '' - content: - label: 'Content' - hint: '' - submit: 'Submit' \ No newline at end of file -- cgit v1.2.3 From da362f73cf417aa2eda9124d17c66850087ea0f6 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 11 Feb 2013 16:52:24 +0100 Subject: Backup GUI improvements. --- config/locales/views/backup_jobs/de.yml | 51 +++++++++++++++++---------------- config/locales/views/backup_jobs/en.yml | 19 ++++++------ 2 files changed, 36 insertions(+), 34 deletions(-) (limited to 'config') diff --git a/config/locales/views/backup_jobs/de.yml b/config/locales/views/backup_jobs/de.yml index b81b532..8e23feb 100644 --- a/config/locales/views/backup_jobs/de.yml +++ b/config/locales/views/backup_jobs/de.yml @@ -1,60 +1,61 @@ de: backup_jobs: - name: 'Backup job' + name: 'Backup-Auftrag' controller: - successfuly_created: 'Backup job wurde angelegt.' - successfuly_updated: 'Backup job wurde aktualisiert.' - successfuly_destroyed: 'Backup job wurde gelöscht.' + successfuly_created: 'Backup-Auftrag wurde angelegt.' + successfuly_updated: 'Backup-Auftrag wurde aktualisiert.' + successfuly_destroyed: 'Backup-Auftrag wurde gelöscht.' index: - page_title: 'Übersicht von Backup job' - started_at: 'Started at' - finished_at: 'Finished at' - state: 'State' - directory: 'Directory' - size_of_the_backup: 'Size of the backup' + page_title: 'Liste aller Backup-Aufträge' + page_title_with_limit: 'Liste der letzten %{limit} Backup-Aufträge' + started_at: 'Start' + finished_at: 'Ende' + state: 'Status' + directory: 'Verzeichnis' + size_of_the_backup: 'Größe' actions: - confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Backup job' + confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Backup-Auftrag' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' create: 'Neu anlegen' - create_for: 'Backup job neu anlegen für %{resource}' + create_for: 'Backup-Auftrag neu anlegen für %{resource}' show: - page_title: 'Backup job bearbeiten' - started_at: 'Started at' - finished_at: 'Finished at' - state: 'State' - directory: 'Directory' - size_of_the_backup: 'Size of the backup' + page_title: 'Backup-Auftrag bearbeiten' + started_at: 'Start' + finished_at: 'Ende' + state: 'Status' + directory: 'Verzeichnis' + size_of_the_backup: 'Größe' 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: 'Backup job neu anlegen' + page_title: 'Backup-Auftrag neu anlegen' actions: back_to_list: 'Zurück zur Übersicht' edit: - page_title: 'Backup job bearbeiten' + page_title: 'Backup-Auftrag bearbeiten' actions: back_to_list: 'Zurück zur Übersicht' edit: 'Bearbeiten' view_all: 'Alle anzeigen' form: started_at: - label: 'Started at' + label: 'Start' hint: '' finished_at: - label: 'Finished at' + label: 'Ende' hint: '' state: - label: 'State' + label: 'Status' hint: '' directory: - label: 'Directory' + label: 'Verzeichnis' hint: '' size_of_the_backup: - label: 'Size of the backup' + label: 'Größe' hint: '' submit: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/backup_jobs/en.yml b/config/locales/views/backup_jobs/en.yml index 83f4388..74d14c2 100644 --- a/config/locales/views/backup_jobs/en.yml +++ b/config/locales/views/backup_jobs/en.yml @@ -2,25 +2,26 @@ en: backup_jobs: name: 'Backup job' controller: - successfuly_created: 'Successfully created Backup job.' - successfuly_updated: 'Successfully updated Backup job.' - successfuly_destroyed: 'Successfully destroyed Backup job.' + successfuly_created: 'Successfully created backup job.' + successfuly_updated: 'Successfully updated backup job.' + successfuly_destroyed: 'Successfully destroyed backup job.' index: - page_title: 'Listing Backup job' + page_title: 'Listing backup jobs' + page_title_with_limit: 'Listing of the last %{limit} backup jobs' started_at: 'Started at' finished_at: 'Finished at' state: 'State' directory: 'Directory' size_of_the_backup: 'Size of the backup' actions: - confirm_destroy: 'Are you sure you want to delete this Backup job?' + confirm_destroy: 'Are you sure you want to delete this backup job?' destroy: 'Delete' edit: 'Edit' show: 'View' create: 'New' - create_for: 'New Backup job for %{resource}' + create_for: 'New backup job for %{resource}' show: - page_title: 'Show Backup job' + page_title: 'Show backup job' started_at: 'Started at' finished_at: 'Finished at' state: 'State' @@ -32,11 +33,11 @@ en: edit: 'Edit' view_all: 'View All' new: - page_title: 'New Backup job' + page_title: 'New backup job' actions: back_to_list: 'Back to Index' edit: - page_title: 'Editing Backup job' + page_title: 'Editing backup job' actions: back_to_list: 'Back to Index' edit: 'Edit' -- cgit v1.2.3 From dd975872925cab5dc5b1e15a31af7f5d1cc1385c Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 12 Feb 2013 09:55:54 +0100 Subject: Changed the short I18n format for datetime. --- config/locales/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/de.yml b/config/locales/de.yml index 9d85d8e..ffc8e69 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -192,7 +192,7 @@ de: formats: default: ! '%A, %d. %B %Y, %H:%M Uhr' long: ! '%A, %d. %B %Y, %H:%M Uhr' - short: ! '%d. %B, %H:%M Uhr' + short: ! '%d.%m.%Y %H:%M Uhr' pm: nachmittags date_only: '%d.%m.%Y' misc: -- cgit v1.2.3 From aa5a2b806d117ffde9888e282c7100066156d94b Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 12 Feb 2013 12:46:36 +0100 Subject: Misc I18n and GUI improvements. --- config/locales/views/call_routes/de.yml | 24 ++++++++++++------------ config/locales/views/phones/de.yml | 6 +++--- config/locales/views/route_elements/de.yml | 20 ++++++++++---------- config/locales/views/sip_accounts/de.yml | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) (limited to 'config') diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml index 77b597b..c9df1c2 100644 --- a/config/locales/views/call_routes/de.yml +++ b/config/locales/views/call_routes/de.yml @@ -1,25 +1,25 @@ de: call_routes: - name: 'Call Route' + name: 'Call-Route' controller: - successfuly_created: 'Call Route wurde angelegt.' - successfuly_updated: 'Call Route wurde aktualisiert.' - successfuly_destroyed: 'Call Route wurde gelöscht.' + successfuly_created: 'Call-Route wurde angelegt.' + successfuly_updated: 'Call-Route wurde aktualisiert.' + successfuly_destroyed: 'Call-Route wurde gelöscht.' index: - page_title: 'Liste aller Call Routen' - routing_table: 'Routing Table' + page_title: 'Liste Call-Routen' + routing_table: 'Routing Tabelle' name: 'Name' - endpoint: 'Endpoint' + endpoint: 'Endpunkt' position: 'Position' actions: - confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Call Route' + confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Call-Route' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' create: 'Neu anlegen' - create_for: 'Call Route neu anlegen für %{resource}' + create_for: 'Call-Route neu anlegen für %{resource}' show: - page_title: 'Call Route bearbeiten' + page_title: 'Call-Route bearbeiten' routing_table: 'Routing Table' name: 'Name' endpoint: 'Endpoint' @@ -30,11 +30,11 @@ de: edit: 'Bearbeiten' view_all: 'Alle anzeigen' new: - page_title: 'Call Route neu anlegen' + page_title: 'Call-Route neu anlegen' actions: back_to_list: 'Zurück zur Übersicht' edit: - page_title: 'Call Route bearbeiten' + page_title: 'Call-Route bearbeiten' actions: back_to_list: 'Zurück zur Übersicht' edit: 'Bearbeiten' diff --git a/config/locales/views/phones/de.yml b/config/locales/views/phones/de.yml index 373db13..02875c4 100644 --- a/config/locales/views/phones/de.yml +++ b/config/locales/views/phones/de.yml @@ -9,9 +9,9 @@ de: page_title: 'Telefone' mac_address: 'MAC-Adresse' phone_model_id: 'Modell' - hot_deskable: 'Hot-Desk fähig' - ip_address: 'IP-Adresse' - last_ip_address: 'Letzte IP-Adresse' + hot_deskable: 'Hot-Desk' + ip_address: 'IP' + last_ip_address: 'Letzte IP' http_user: 'Phone WebGUI Username' http_password: 'Phone WebGUI Passwort' nightly_reboot: 'Nachts automatischer Reboot' diff --git a/config/locales/views/route_elements/de.yml b/config/locales/views/route_elements/de.yml index fe14671..70a6162 100644 --- a/config/locales/views/route_elements/de.yml +++ b/config/locales/views/route_elements/de.yml @@ -1,12 +1,12 @@ de: route_elements: - name: 'Route element' + name: 'Routen-Element' controller: - successfuly_created: 'Route element wurde angelegt.' - successfuly_updated: 'Route element wurde aktualisiert.' - successfuly_destroyed: 'Route element wurde gelöscht.' + successfuly_created: 'Routen-Element wurde angelegt.' + successfuly_updated: 'Routen-Element wurde aktualisiert.' + successfuly_destroyed: 'Routen-Element wurde gelöscht.' index: - page_title: 'Übersicht von Route element' + page_title: 'Liste Routen-Elemente' call_route_id: 'Call route' var_in: 'Var in' var_out: 'Var out' @@ -16,14 +16,14 @@ de: mandatory: 'Mandatory' position: 'Position' actions: - confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Route element' + confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Routen-Element' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' create: 'Neu anlegen' - create_for: 'Route element neu anlegen für %{resource}' + create_for: 'Routen-Element neu anlegen für %{resource}' show: - page_title: 'Route element bearbeiten' + page_title: 'Routen-Element bearbeiten' call_route_id: 'Call route' var_in: 'Var in' var_out: 'Var out' @@ -38,11 +38,11 @@ de: edit: 'Bearbeiten' view_all: 'Alle anzeigen' new: - page_title: 'Route element neu anlegen' + page_title: 'Routen-Element neu anlegen' actions: back_to_list: 'Zurück zur Übersicht' edit: - page_title: 'Route element bearbeiten' + page_title: 'Routen-Element bearbeiten' actions: back_to_list: 'Zurück zur Übersicht' edit: 'Bearbeiten' diff --git a/config/locales/views/sip_accounts/de.yml b/config/locales/views/sip_accounts/de.yml index 2820336..8fe2300 100644 --- a/config/locales/views/sip_accounts/de.yml +++ b/config/locales/views/sip_accounts/de.yml @@ -11,11 +11,11 @@ de: caller_name: 'Caller Name' password: 'Passwort' voicemail_pin: 'Anrufbeantworter PIN' - phone_numbers: 'Telefonnummern' + phone_numbers: 'Tel.Nr.' call_waiting: 'Anklopfen' clir: 'Rufnummernunterdrückung (CLIR)' clip: 'Rufnummernanzeige (CLIP)' - hotdeskable: 'Hot-Desk fähig' + hotdeskable: 'Hot-Desk' clip_no_screening: 'Spezifische Rufnummernanzeige (CLIP -no screening-)' callforward_rules_act_per_sip_account: 'Rufweiterleitungen gelten für das gesamte SIP-Account' online: 'Online' -- cgit v1.2.3 From f8f35f666613eff24d3988bda1a22cc40ef2ab30 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 12 Feb 2013 13:26:30 +0100 Subject: Make the call_elements table sortable by drag and drop. --- 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 05d09dc..6d7a2ad 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,7 +14,9 @@ Gemeinschaft42c::Application.routes.draw do post :sort get :show_variables } - resources :route_elements + resources :route_elements do + collection { post :sort } + end end resources :gateways do -- cgit v1.2.3