From 7525ca487b993cc04c5540c0cf3bee4dabc2cc1c Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 30 Dec 2012 21:04:13 +0100 Subject: Added nightly build to the release number. --- config/initializers/gemeinschaft_parameters.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/gemeinschaft_parameters.rb b/config/initializers/gemeinschaft_parameters.rb index b1481ef..1624165 100644 --- a/config/initializers/gemeinschaft_parameters.rb +++ b/config/initializers/gemeinschaft_parameters.rb @@ -1,6 +1,6 @@ # Use this file to set generic parameters for Gemeinschaft -GEMEINSCHAFT_VERSION = '5.0.2' +GEMEINSCHAFT_VERSION = '5.0.2-nightly-build' SUPER_TENANT_NAME = 'Super-Tenant' # System defaults -- cgit v1.2.3 From 01f2ab4e3d5694de81f6ebb594e0e852616ebbd9 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 12:42:53 +0100 Subject: Added GsParameter model as a replacement for gemeinschaft_parameters.rb --- config/routes.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 33238dc..4137965 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,6 @@ Gemeinschaft42c::Application.routes.draw do + resources :gs_parameters + resources :automatic_call_distributors resources :gs_cluster_sync_log_entries -- cgit v1.2.3 From 6d809427f7dbff9509603cab3339c6fbda9ea992 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 12:50:17 +0100 Subject: Add the initializer to set the constants. --- config/initializers/gemeinschaft_parameters.rb | 84 ++------------------------ 1 file changed, 4 insertions(+), 80 deletions(-) (limited to 'config') diff --git a/config/initializers/gemeinschaft_parameters.rb b/config/initializers/gemeinschaft_parameters.rb index 1624165..dd6b2eb 100644 --- a/config/initializers/gemeinschaft_parameters.rb +++ b/config/initializers/gemeinschaft_parameters.rb @@ -1,81 +1,5 @@ -# Use this file to set generic parameters for Gemeinschaft +# Set some constants. -GEMEINSCHAFT_VERSION = '5.0.2-nightly-build' -SUPER_TENANT_NAME = 'Super-Tenant' - -# System defaults -MINIMUM_PIN_LENGTH = 4 -MAXIMUM_PIN_LENGTH = 10 - -# GUI -GUI_REDIRECT_HTTPS = false - -# Phone numbers -# Only touch this if you know what you are doing! -STRICT_INTERNAL_EXTENSION_HANDLING = false -STRICT_DID_HANDLING = false - -# SIP defaults -DEFAULT_LENGTH_SIP_AUTH_NAME = 10 -DEFAULT_LENGTH_SIP_PASSWORD = 15 -CALL_WAITING = false -DEFAULT_CLIR_SETTING = false -DEFAULT_CLIP_SETTING = true - -TO_S_MAX_CALLER_NAME_LENGTH = 25 -TO_S_MAX_LENGTH_OF_AUTH_NAME = 6 - -# Pagination defaults -DEFAULT_PAGINATION_ENTRIES_PER_PAGE = 50 - -# Conference defaults -MAXIMUM_NUMBER_OF_PEOPLE_IN_A_CONFERENCE = 100 -DEFAULT_MAX_CONFERENCE_MEMBERS = 10 - -# Misc defaults -MAX_EXTENSION_LENGTH = 6 - -# Fax defaults -DEFAULT_NUMBER_OF_RETRIES = 3 -DAYS_TILL_AUTO_DELETE = 90 - -# Names of PhoneNumberRanges -INTERNAL_EXTENSIONS = 'internal_extensions' -SERVICE_NUMBERS = 'service_numbers' -DIRECT_INWARD_DIALING_NUMBERS = 'direct_inward_dialing_numbers' - -# Callthrough defaults -CALLTHROUGH_HAS_WHITELISTS = true - -# Hunt groups -HUNT_GROUP_STRATEGIES = ['ring_all', 'ring_recursively'] -VALID_SECONDS_BETWEEN_JUMPS_VALUES = (1 .. 60).to_a.map{|x| x * 2} - -# Callforward -DEFAULT_CALL_FORWARD_DEPTH = 1 -MAX_CALL_FORWARD_DEPTH = 40 -CALLFORWARD_DESTINATION_DEFAULT = '+49' -CALLFORWARD_RULES_ACT_PER_SIP_ACCOUNT_DEFAULT = true - -# Phone -PROVISIONING_AUTO_ADD_PHONE = true -PROVISIONING_AUTO_ADD_SIP_ACCOUNT = true -PROVISIONING_AUTO_TENANT_ID = 2 -PROVISIONING_AUTO_SIP_ACCOUNT_CALLER_PREFIX = 'Gemeinschaft ' -PROVISIONING_IEEE8021X_EAP_USERNAME = '' -PROVISIONING_IEEE8021X_EAP_PASSWORD = '' -NIGHTLY_REBOOT_OF_PHONES = true -SIEMENS_HISTORY_RELOAD_TIMES = {0..6 => 600, 7..20 => 40, 21..24 => 300} - -# API configuration -DEFAULT_API_TENANT_ID = 2 -REMOTE_IP_ADDRESS_WHITELIST = [] # e.g. ['10.0.0.1'] -IMPORT_CSV_FILE = '/var/tmp/ExampleVoipCsvExport.csv' -DOUBLE_CHECK_POSITIVE_USERS_CSV = '/var/tmp/ExampleDoubleCheckVoipCsvExport.csv' -IMPORT_CSV_ENCODING = 'UTF-8' -USER_NAME_PREFIX = 'dtc' -CALLTHROUGH_NAME_TO_BE_USED_FOR_DEFAULT_ACTIVATION = 'Callthrough for employees' - -# GS Cluster configuration -WRITE_GS_CLUSTER_SYNC_LOG = true -HOMEBASE_IP_ADDRESS = '0.0.0.0' +GsParameter.all.each do |gs_parameter| + gs_parameter.generate_constant +end \ No newline at end of file -- cgit v1.2.3 From e76890d5f4634d47514a592d501d9792ae2ff7bb Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 21:00:52 +0100 Subject: Different scaffold for GsParameter. --- config/initializers/gemeinschaft_parameters.rb | 6 +-- config/locales/views/gs_parameters/de.yml | 60 ++++++++++++++++++++++++++ config/locales/views/gs_parameters/en.yml | 60 ++++++++++++++++++++++++++ 3 files changed, 123 insertions(+), 3 deletions(-) create mode 100644 config/locales/views/gs_parameters/de.yml create mode 100644 config/locales/views/gs_parameters/en.yml (limited to 'config') diff --git a/config/initializers/gemeinschaft_parameters.rb b/config/initializers/gemeinschaft_parameters.rb index dd6b2eb..844ff32 100644 --- a/config/initializers/gemeinschaft_parameters.rb +++ b/config/initializers/gemeinschaft_parameters.rb @@ -1,5 +1,5 @@ # Set some constants. -GsParameter.all.each do |gs_parameter| - gs_parameter.generate_constant -end \ No newline at end of file +# GsParameter.all.each do |gs_parameter| +# gs_parameter.generate_constant +# end diff --git a/config/locales/views/gs_parameters/de.yml b/config/locales/views/gs_parameters/de.yml new file mode 100644 index 0000000..f6935b8 --- /dev/null +++ b/config/locales/views/gs_parameters/de.yml @@ -0,0 +1,60 @@ +de: + gs_parameters: + name: 'Gsparameter' + controller: + successfuly_created: 'Gsparameter wurde angelegt.' + successfuly_updated: 'Gsparameter wurde aktualisiert.' + successfuly_destroyed: 'Gsparameter wurde gelöscht.' + index: + page_title: 'Übersicht von Gsparameter' + name: 'Name' + section: 'Section' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gsparameter' + destroy: 'Löschen' + edit: 'Bearbeiten' + show: 'Anzeigen' + create: 'Neu anlegen' + create_for: 'Gsparameter neu anlegen für %{resource}' + show: + page_title: 'Gsparameter bearbeiten' + name: 'Name' + section: 'Section' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' + destroy: 'Löschen' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + new: + page_title: 'Gsparameter neu anlegen' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: + page_title: 'Gsparameter bearbeiten' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + form: + name: + label: 'Name' + hint: '' + section: + label: 'Section' + hint: '' + value: + label: 'Value' + hint: '' + class_type: + label: 'Class type' + hint: '' + description: + label: 'Description' + hint: '' + button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/gs_parameters/en.yml b/config/locales/views/gs_parameters/en.yml new file mode 100644 index 0000000..040a6b8 --- /dev/null +++ b/config/locales/views/gs_parameters/en.yml @@ -0,0 +1,60 @@ +en: + gs_parameters: + name: 'Gsparameter' + controller: + successfuly_created: 'Successfully created Gsparameter.' + successfuly_updated: 'Successfully updated Gsparameter.' + successfuly_destroyed: 'Successfully destroyed Gsparameter.' + index: + page_title: 'Listing Gsparameter' + name: 'Name' + section: 'Section' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Are you sure you want to delete this Gsparameter?' + destroy: 'Delete' + edit: 'Edit' + show: 'View' + create: 'New' + create_for: 'New Gsparameter for %{resource}' + show: + page_title: 'Show Gsparameter' + name: 'Name' + section: 'Section' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Are you sure you want to delete this element?' + destroy: 'Delete' + edit: 'Edit' + view_all: 'View All' + new: + page_title: 'New Gsparameter' + actions: + back_to_list: 'Back to Index' + edit: + page_title: 'Editing Gsparameter' + actions: + back_to_list: 'Back to Index' + edit: 'Edit' + view_all: 'View All' + form: + name: + label: 'Name' + hint: '' + section: + label: 'Section' + hint: '' + value: + label: 'Value' + hint: '' + class_type: + label: 'Class type' + hint: '' + description: + label: 'Description' + hint: '' + button: 'Submit' \ No newline at end of file -- cgit v1.2.3 From ddb3dfa92ec0878240211cb2b7a8e125961b1360 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 23:01:16 +0100 Subject: Moved to GsParemeter.get and set defaults for a couple of validations. --- config/initializers/gemeinschaft_parameters.rb | 4 +--- config/routes.rb | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/initializers/gemeinschaft_parameters.rb b/config/initializers/gemeinschaft_parameters.rb index 844ff32..e3fa11f 100644 --- a/config/initializers/gemeinschaft_parameters.rb +++ b/config/initializers/gemeinschaft_parameters.rb @@ -1,5 +1,3 @@ # Set some constants. -# GsParameter.all.each do |gs_parameter| -# gs_parameter.generate_constant -# end + diff --git a/config/routes.rb b/config/routes.rb index 4137965..ee333fe 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -55,7 +55,7 @@ Gemeinschaft42c::Application.routes.draw do end end - if CALLTHROUGH_HAS_WHITELISTS == true + if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true resources :whitelists, :only => [] do resources :phone_numbers do member do @@ -239,7 +239,7 @@ Gemeinschaft42c::Application.routes.draw do resources :conferences resources :phone_number_ranges resources :callthroughs - if CALLTHROUGH_HAS_WHITELISTS == true + if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true resources :whitelists end resources :hunt_groups @@ -254,7 +254,7 @@ Gemeinschaft42c::Application.routes.draw do put 'move_lower' end end - if CALLTHROUGH_HAS_WHITELISTS == true + if GsParameter.get('CALLTHROUGH_HAS_WHITELISTS') == true resources :whitelists end end -- cgit v1.2.3 From 57196d838691aeba38ad7e088e83c0881a213861 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 5 Jan 2013 23:07:21 +0100 Subject: Deleted a not anymore needed initializer. --- config/initializers/gemeinschaft_parameters.rb | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 config/initializers/gemeinschaft_parameters.rb (limited to 'config') diff --git a/config/initializers/gemeinschaft_parameters.rb b/config/initializers/gemeinschaft_parameters.rb deleted file mode 100644 index e3fa11f..0000000 --- a/config/initializers/gemeinschaft_parameters.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Set some constants. - - -- cgit v1.2.3 From 464a2f4907bd27b62f7b5cc5d7537b90469b03bd Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 6 Jan 2013 20:52:04 +0100 Subject: GsParameter can only be created or destroyed by migrations. --- config/locales/views/gs_parameters/de.yml | 32 +++++++++++++++---------------- config/locales/views/gs_parameters/en.yml | 21 ++++++++++---------- config/routes.rb | 2 +- 3 files changed, 28 insertions(+), 27 deletions(-) (limited to 'config') diff --git a/config/locales/views/gs_parameters/de.yml b/config/locales/views/gs_parameters/de.yml index f6935b8..718b693 100644 --- a/config/locales/views/gs_parameters/de.yml +++ b/config/locales/views/gs_parameters/de.yml @@ -1,42 +1,42 @@ de: gs_parameters: - name: 'Gsparameter' + name: 'Gemeinschaft Parameter' controller: - successfuly_created: 'Gsparameter wurde angelegt.' - successfuly_updated: 'Gsparameter wurde aktualisiert.' - successfuly_destroyed: 'Gsparameter wurde gelöscht.' + successfuly_created: 'Ein Gemeinschaft Parameter wurde angelegt.' + successfuly_updated: 'Ein Gemeinschaft Parameter wurde aktualisiert. Bitte rebooten Sie Ihr System jetzt!' + successfuly_destroyed: 'Ein Gemeinschaft Parameter wurde gelöscht.' index: - page_title: 'Übersicht von Gsparameter' + page_title: 'Übersicht aller Gemeinschaft Parameter' name: 'Name' section: 'Section' - value: 'Value' + value: 'Wert' class_type: 'Class type' - description: 'Description' + description: 'Beschreibung' actions: - confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gsparameter' + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gemeinschaft Parmeter' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' create: 'Neu anlegen' - create_for: 'Gsparameter neu anlegen für %{resource}' + create_for: 'Gemeinschaft Parmeter neu anlegen für %{resource}' show: - page_title: 'Gsparameter bearbeiten' + page_title: 'Gemeinschaft Parmeter bearbeiten' name: 'Name' section: 'Section' - value: 'Value' + value: 'Wert' class_type: 'Class type' - description: 'Description' + description: 'Beschreibung' actions: confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' view_all: 'Alle anzeigen' new: - page_title: 'Gsparameter neu anlegen' + page_title: 'Gemeinschaft Parmeter neu anlegen' actions: back_to_list: 'Zurück zur Übersicht' edit: - page_title: 'Gsparameter bearbeiten' + page_title: 'Gemeinschaft Parmeter bearbeiten' actions: back_to_list: 'Zurück zur Übersicht' edit: 'Bearbeiten' @@ -49,12 +49,12 @@ de: label: 'Section' hint: '' value: - label: 'Value' + label: 'Wert' hint: '' class_type: label: 'Class type' hint: '' description: - label: 'Description' + label: 'Beschreibung' hint: '' button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/gs_parameters/en.yml b/config/locales/views/gs_parameters/en.yml index 040a6b8..cf8a9e6 100644 --- a/config/locales/views/gs_parameters/en.yml +++ b/config/locales/views/gs_parameters/en.yml @@ -1,26 +1,26 @@ en: gs_parameters: - name: 'Gsparameter' + name: 'Gemeinschaft parameter' controller: - successfuly_created: 'Successfully created Gsparameter.' - successfuly_updated: 'Successfully updated Gsparameter.' - successfuly_destroyed: 'Successfully destroyed Gsparameter.' + successfuly_created: 'Successfully created a Gemeinschaft parameter.' + successfuly_updated: 'Successfully updated a Gemeinschaft parameter. Please reboot your system now!' + successfuly_destroyed: 'Successfully destroyed a Gemeinschaft parameter.' index: - page_title: 'Listing Gsparameter' + page_title: 'Listing Gemeinschaft parameter' name: 'Name' section: 'Section' value: 'Value' class_type: 'Class type' description: 'Description' actions: - confirm: 'Are you sure you want to delete this Gsparameter?' + confirm: 'Are you sure you want to delete this Gemeinschaft parameter?' destroy: 'Delete' edit: 'Edit' show: 'View' create: 'New' - create_for: 'New Gsparameter for %{resource}' + create_for: 'New Gemeinschaft parameter for %{resource}' show: - page_title: 'Show Gsparameter' + page_title: 'Show Gemeinschaft parameter' name: 'Name' section: 'Section' value: 'Value' @@ -31,12 +31,13 @@ en: destroy: 'Delete' edit: 'Edit' view_all: 'View All' + reboot_warning: 'Nach der Änderung eines Gemeinschaft Parameters müssen Sie das System neu booten!' new: - page_title: 'New Gsparameter' + page_title: 'New Gemeinschaft parameter' actions: back_to_list: 'Back to Index' edit: - page_title: 'Editing Gsparameter' + page_title: 'Editing Gemeinschaft parameter' actions: back_to_list: 'Back to Index' edit: 'Edit' diff --git a/config/routes.rb b/config/routes.rb index ee333fe..a0ad6aa 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,5 @@ Gemeinschaft42c::Application.routes.draw do - resources :gs_parameters + resources :gs_parameters, :only => [:show, :index, :update, :edit] resources :automatic_call_distributors -- cgit v1.2.3 From e908d078ffd35acf321a1ed6fdab9e0568f10455 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 6 Jan 2013 20:53:51 +0100 Subject: Fixed typo. --- config/locales/views/gs_parameters/de.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'config') diff --git a/config/locales/views/gs_parameters/de.yml b/config/locales/views/gs_parameters/de.yml index 718b693..65ee24a 100644 --- a/config/locales/views/gs_parameters/de.yml +++ b/config/locales/views/gs_parameters/de.yml @@ -13,14 +13,14 @@ de: class_type: 'Class type' description: 'Beschreibung' actions: - confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gemeinschaft Parmeter' + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gemeinschaft Parameter' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' create: 'Neu anlegen' - create_for: 'Gemeinschaft Parmeter neu anlegen für %{resource}' + create_for: 'Gemeinschaft Parameter neu anlegen für %{resource}' show: - page_title: 'Gemeinschaft Parmeter bearbeiten' + page_title: 'Gemeinschaft Parameter bearbeiten' name: 'Name' section: 'Section' value: 'Wert' @@ -32,11 +32,11 @@ de: edit: 'Bearbeiten' view_all: 'Alle anzeigen' new: - page_title: 'Gemeinschaft Parmeter neu anlegen' + page_title: 'Gemeinschaft Parameter neu anlegen' actions: back_to_list: 'Zurück zur Übersicht' edit: - page_title: 'Gemeinschaft Parmeter bearbeiten' + page_title: 'Gemeinschaft Parameter bearbeiten' actions: back_to_list: 'Zurück zur Übersicht' edit: 'Bearbeiten' -- cgit v1.2.3 From bc99518a1650963153c164b5eaeb11033dcf8bac Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 6 Jan 2013 20:55:24 +0100 Subject: Fixed wording. --- config/locales/views/gs_parameters/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/views/gs_parameters/de.yml b/config/locales/views/gs_parameters/de.yml index 65ee24a..90f3643 100644 --- a/config/locales/views/gs_parameters/de.yml +++ b/config/locales/views/gs_parameters/de.yml @@ -20,7 +20,7 @@ de: create: 'Neu anlegen' create_for: 'Gemeinschaft Parameter neu anlegen für %{resource}' show: - page_title: 'Gemeinschaft Parameter bearbeiten' + page_title: 'Gemeinschaft Parameter anzeigen' name: 'Name' section: 'Section' value: 'Wert' -- cgit v1.2.3 From b67c3f5ff6474ba117c75eb81c7d2d9371e8a103 Mon Sep 17 00:00:00 2001 From: spag Date: Tue, 8 Jan 2013 14:11:54 +0100 Subject: Click to dial in phone book --- config/locales/views/phone_numbers/de.yml | 3 ++- config/locales/views/phone_numbers/en.yml | 1 + config/routes.rb | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/locales/views/phone_numbers/de.yml b/config/locales/views/phone_numbers/de.yml index 40fc7f8..e801ab4 100644 --- a/config/locales/views/phone_numbers/de.yml +++ b/config/locales/views/phone_numbers/de.yml @@ -34,7 +34,8 @@ de: confirm: 'Sind Sie sicher, dass Sie diese Telefonnummer löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' - view_all: 'View all phone numbers' + view_all: 'Alle anzeigen' + call: 'Anrufen' new: page_title: 'Neue Telefonnummer' edit: diff --git a/config/locales/views/phone_numbers/en.yml b/config/locales/views/phone_numbers/en.yml index 31af5c8..be3b4f5 100644 --- a/config/locales/views/phone_numbers/en.yml +++ b/config/locales/views/phone_numbers/en.yml @@ -35,6 +35,7 @@ en: destroy: 'Delete' edit: 'Edit' view_all: 'View all phone numbers' + call: 'Call' new: page_title: 'New Phone number' edit: diff --git a/config/routes.rb b/config/routes.rb index a0ad6aa..6d45f9f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -304,6 +304,7 @@ Gemeinschaft42c::Application.routes.draw do member do put 'move_higher' put 'move_lower' + put 'call' end end end -- cgit v1.2.3 From 2ac13c8df129cedd81950eb7c5697fbd57cd9612 Mon Sep 17 00:00:00 2001 From: spag Date: Wed, 9 Jan 2013 12:48:49 +0100 Subject: entity added --- config/locales/views/gs_parameters/de.yml | 3 +++ config/locales/views/gs_parameters/en.yml | 3 +++ 2 files changed, 6 insertions(+) (limited to 'config') diff --git a/config/locales/views/gs_parameters/de.yml b/config/locales/views/gs_parameters/de.yml index 90f3643..9e22eb0 100644 --- a/config/locales/views/gs_parameters/de.yml +++ b/config/locales/views/gs_parameters/de.yml @@ -42,6 +42,9 @@ de: edit: 'Bearbeiten' view_all: 'Alle anzeigen' form: + entity: + label: 'Instanz' + hint: '' name: label: 'Name' hint: '' diff --git a/config/locales/views/gs_parameters/en.yml b/config/locales/views/gs_parameters/en.yml index cf8a9e6..9dbdcb2 100644 --- a/config/locales/views/gs_parameters/en.yml +++ b/config/locales/views/gs_parameters/en.yml @@ -43,6 +43,9 @@ en: edit: 'Edit' view_all: 'View All' form: + entity: + label: 'Entity' + hint: '' name: label: 'Name' hint: '' -- cgit v1.2.3 From 7b1295884861b222e441f431089ea3a6d99fd569 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 10 Jan 2013 11:45:46 +0100 Subject: Started to fragment cache gs_parameter views. --- 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 bd34e4f..5130681 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,7 +11,7 @@ Gemeinschaft42c::Application.configure do # Show full error reports and disable caching config.consider_all_requests_local = true - config.action_controller.perform_caching = false + config.action_controller.perform_caching = true # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false -- cgit v1.2.3 From 2b57fadfebf7f7df6a589ab089eec522413e8390 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 10 Jan 2013 12:29:07 +0100 Subject: Added fragment caching to gs_parameters. --- config/environments/development.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'config') diff --git a/config/environments/development.rb b/config/environments/development.rb index 5130681..5076f48 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -11,7 +11,10 @@ Gemeinschaft42c::Application.configure do # Show full error reports and disable caching config.consider_all_requests_local = true + + # Enable caching for development config.action_controller.perform_caching = true + CacheDigests::TemplateDigestor.cache = ActiveSupport::Cache::NullStore.new # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false -- cgit v1.2.3 From ae296748501982bac71525507ff9c1fdfefb8ad2 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Thu, 10 Jan 2013 12:35:36 +0100 Subject: Activated memcached as the cache store. --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/environments/production.rb b/config/environments/production.rb index 4e5bdd8..26b2f35 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -37,7 +37,7 @@ Gemeinschaft42c::Application.configure do # config.logger = SyslogLogger.new # Use a different cache store in production - # config.cache_store = :mem_cache_store + config.cache_store = :mem_cache_store # Enable serving of images, stylesheets, and JavaScripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" -- cgit v1.2.3 From b65c9f21c97371b6fbdeeae2e44f4111313b4337 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 11 Jan 2013 10:30:24 +0100 Subject: Activated dalli as the memcached client. --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/environments/production.rb b/config/environments/production.rb index 26b2f35..f715d91 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -37,7 +37,7 @@ Gemeinschaft42c::Application.configure do # config.logger = SyslogLogger.new # Use a different cache store in production - config.cache_store = :mem_cache_store + config.cache_store = :dalli_store # Enable serving of images, stylesheets, and JavaScripts from an asset server # config.action_controller.asset_host = "http://assets.example.com" -- cgit v1.2.3 From a742a9038210691169b407c2897a38ded8618f84 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 11 Jan 2013 12:28:35 +0100 Subject: Generate a secret_token (for signed cookies). --- config/initializers/secret_token.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index 6f04f07..ecd511c 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -4,4 +4,4 @@ # If you change this key, all old signed cookies will become invalid! # Make sure the secret is at least 30 characters and all random, # no regular words or you'll be exposed to dictionary attacks. -Gemeinschaft42c::Application.config.secret_token = '9a59cac7fe4b23e0253a7beb341d9498d721923e966b45983f441f991e81f758067a6d9a949247d489773288284ab96b5015be52bf7b2834e666d43f864034e4' +Gemeinschaft42c::Application.config.secret_token = GsParameter.get('SECRET_TOKEN') -- cgit v1.2.3 From af49b3390ce352297c3b601c69b6b0557a9ae01d Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 11 Jan 2013 19:30:56 +0100 Subject: Load the production database configuration from the system odbc.ini file. --- config/database.yml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/database.yml b/config/database.yml index bd1748e..706ed06 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,13 +1,26 @@ development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + +# Read the database configuration from the system odbc +# configuration. +# +<%- system_odbc_ini_file = '/var/lib/.odbc.ini' %> +<%- if File.exists?(system_odbc_ini_file) %> +<%- system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> +<%- if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> +production: adapter: mysql2 encoding: utf8 - database: gemeinschaft - pool: 5 - username: gemeinschaft - password: gemeinschaft + database: <%= system_odbc_configuration['gemeinschaft']['DATABASE'] %> + pool: 10 + username: <%= system_odbc_configuration['gemeinschaft']['USER'] %> + password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock - reconnect: true - + reconnect: true +<%- else %> production: adapter: mysql2 encoding: utf8 @@ -17,6 +30,8 @@ production: password: gemeinschaft socket: /var/run/mysqld/mysqld.sock reconnect: true +<%- end %> +<%- end %> # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -- cgit v1.2.3 From 82e93efa43f54760beed29803931d7a4ced4fc18 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 11 Jan 2013 19:34:51 +0100 Subject: Erb bug fix. --- config/database.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/database.yml b/config/database.yml index 706ed06..8ec5d75 100644 --- a/config/database.yml +++ b/config/database.yml @@ -7,10 +7,10 @@ development: # Read the database configuration from the system odbc # configuration. # -<%- system_odbc_ini_file = '/var/lib/.odbc.ini' %> -<%- if File.exists?(system_odbc_ini_file) %> -<%- system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> -<%- if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> +<% system_odbc_ini_file = '/var/lib/.odbc.ini' %> +<% if File.exists?(system_odbc_ini_file) %> +<% system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> +<% if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> production: adapter: mysql2 encoding: utf8 @@ -20,7 +20,7 @@ production: password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock reconnect: true -<%- else %> +<% else %> production: adapter: mysql2 encoding: utf8 @@ -30,8 +30,8 @@ production: password: gemeinschaft socket: /var/run/mysqld/mysqld.sock reconnect: true -<%- end %> -<%- end %> +<% end %> +<% end %> # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -- cgit v1.2.3 From e294c7d3febf5aaae8f7141f07111293bcb9d54d Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Fri, 11 Jan 2013 19:44:42 +0100 Subject: correct path to .odbc.ini --- config/database.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/database.yml b/config/database.yml index 8ec5d75..8dbc998 100644 --- a/config/database.yml +++ b/config/database.yml @@ -7,7 +7,7 @@ development: # Read the database configuration from the system odbc # configuration. # -<% system_odbc_ini_file = '/var/lib/.odbc.ini' %> +<% system_odbc_ini_file = '/var/lib/freeswitch/.odbc.ini' %> <% if File.exists?(system_odbc_ini_file) %> <% system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> <% if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> -- cgit v1.2.3 From 640db8fccdad8e60224af30359cef0dd2c9086e6 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Fri, 11 Jan 2013 20:31:47 +0100 Subject: fix database.yml for development environment closes issue #90 --- config/database.yml | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) (limited to 'config') diff --git a/config/database.yml b/config/database.yml index 8dbc998..2a7dcb5 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,12 +1,3 @@ -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Read the database configuration from the system odbc -# configuration. -# <% system_odbc_ini_file = '/var/lib/freeswitch/.odbc.ini' %> <% if File.exists?(system_odbc_ini_file) %> <% system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> @@ -20,9 +11,19 @@ production: password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock reconnect: true + +development: + adapter: mysql2 + encoding: utf8 + database: <%= system_odbc_configuration['gemeinschaft']['DATABASE'] %> + pool: 5 + username: <%= system_odbc_configuration['gemeinschaft']['USER'] %> + password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> + socket: /var/run/mysqld/mysqld.sock + reconnect: true <% else %> production: - adapter: mysql2 + adapter: mysql2 encoding: utf8 database: gemeinschaft pool: 10 @@ -30,6 +31,16 @@ production: password: gemeinschaft socket: /var/run/mysqld/mysqld.sock reconnect: true + +development: + adapter: mysql2 + encoding: utf8 + database: gemeinschaft + pool: 5 + username: gemeinschaft + password: gemeinschaft + socket: /var/run/mysqld/mysqld.sock + reconnect: true <% end %> <% end %> -- cgit v1.2.3 From d8287a7dbcc287791ed069cfc14ca6b9db0e66a7 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 12 Jan 2013 10:28:49 +0100 Subject: Fixed a logic if/else bug. --- config/database.yml | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'config') diff --git a/config/database.yml b/config/database.yml index 2a7dcb5..364cbdb 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,17 +1,23 @@ <% system_odbc_ini_file = '/var/lib/freeswitch/.odbc.ini' %> -<% if File.exists?(system_odbc_ini_file) %> -<% system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> -<% if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> +<% if !File.exists?(system_odbc_ini_file) %> +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + production: - adapter: mysql2 + adapter: mysql2 encoding: utf8 - database: <%= system_odbc_configuration['gemeinschaft']['DATABASE'] %> + database: gemeinschaft pool: 10 - username: <%= system_odbc_configuration['gemeinschaft']['USER'] %> - password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> + username: gemeinschaft + password: gemeinschaft socket: /var/run/mysqld/mysqld.sock reconnect: true - +<% else %> +<% system_odbc_configuration = IniFile.load(system_odbc_ini_file) %> +<% if !system_odbc_configuration['gemeinschaft']['DATABASE'].blank? && !system_odbc_configuration['gemeinschaft']['USER'].blank? %> development: adapter: mysql2 encoding: utf8 @@ -21,24 +27,14 @@ development: password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock reconnect: true -<% else %> -production: - adapter: mysql2 - encoding: utf8 - database: gemeinschaft - pool: 10 - username: gemeinschaft - password: gemeinschaft - socket: /var/run/mysqld/mysqld.sock - reconnect: true -development: +production: adapter: mysql2 encoding: utf8 - database: gemeinschaft - pool: 5 - username: gemeinschaft - password: gemeinschaft + database: <%= system_odbc_configuration['gemeinschaft']['DATABASE'] %> + pool: 10 + username: <%= system_odbc_configuration['gemeinschaft']['USER'] %> + password: <%= system_odbc_configuration['gemeinschaft']['PASSWORD'] %> socket: /var/run/mysqld/mysqld.sock reconnect: true <% end %> -- cgit v1.2.3 From aa896ace9575e1be265a8214add35892063579e6 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Sun, 13 Jan 2013 16:28:47 +0000 Subject: gateway route added --- config/routes.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 6d45f9f..4e812c0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,10 @@ Gemeinschaft42c::Application.routes.draw do + + resources :gateways do + resources :gateway_settings + resources :gateway_parameters + end + resources :gs_parameters, :only => [:show, :index, :update, :edit] resources :automatic_call_distributors -- cgit v1.2.3 From b31a5fdecf45de8a6b0de948e431880de0adbe80 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Sun, 13 Jan 2013 16:38:04 +0000 Subject: gateway locales --- config/locales/views/gateways/de.yml | 60 ++++++++++++++++++++++++++++++++++++ config/locales/views/gateways/en.yml | 60 ++++++++++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 config/locales/views/gateways/de.yml create mode 100644 config/locales/views/gateways/en.yml (limited to 'config') diff --git a/config/locales/views/gateways/de.yml b/config/locales/views/gateways/de.yml new file mode 100644 index 0000000..cfe5615 --- /dev/null +++ b/config/locales/views/gateways/de.yml @@ -0,0 +1,60 @@ +de: + gateways: + name: 'Gateway' + controller: + successfuly_created: 'Gateway wurde angelegt.' + successfuly_updated: 'Gateway wurde aktualisiert.' + successfuly_destroyed: 'Gateway wurde gelöscht.' + index: + page_title: 'Übersicht von Gateway' + name: 'Name' + technology: 'Technology' + inbound: 'Inbound' + outbound: 'Outbound' + description: 'Description' + actions: + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gateway' + destroy: 'Löschen' + edit: 'Bearbeiten' + show: 'Anzeigen' + create: 'Neu anlegen' + create_for: 'Gateway neu anlegen für %{resource}' + show: + page_title: 'Gateway bearbeiten' + name: 'Name' + technology: 'Technology' + inbound: 'Inbound' + outbound: 'Outbound' + description: 'Description' + actions: + confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' + destroy: 'Löschen' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + new: + page_title: 'Gateway neu anlegen' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: + page_title: 'Gateway bearbeiten' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + form: + name: + label: 'Name' + hint: '' + technology: + label: 'Technology' + hint: '' + inbound: + label: 'Inbound' + hint: '' + outbound: + label: 'Outbound' + hint: '' + description: + label: 'Description' + hint: '' + button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/gateways/en.yml b/config/locales/views/gateways/en.yml new file mode 100644 index 0000000..2abf0f2 --- /dev/null +++ b/config/locales/views/gateways/en.yml @@ -0,0 +1,60 @@ +en: + gateways: + name: 'Gateway' + controller: + successfuly_created: 'Successfully created Gateway.' + successfuly_updated: 'Successfully updated Gateway.' + successfuly_destroyed: 'Successfully destroyed Gateway.' + index: + page_title: 'Listing Gateway' + name: 'Name' + technology: 'Technology' + inbound: 'Inbound' + outbound: 'Outbound' + description: 'Description' + actions: + confirm: 'Are you sure you want to delete this Gateway?' + destroy: 'Delete' + edit: 'Edit' + show: 'View' + create: 'New' + create_for: 'New Gateway for %{resource}' + show: + page_title: 'Show Gateway' + name: 'Name' + technology: 'Technology' + inbound: 'Inbound' + outbound: 'Outbound' + description: 'Description' + actions: + confirm: 'Are you sure you want to delete this element?' + destroy: 'Delete' + edit: 'Edit' + view_all: 'View All' + new: + page_title: 'New Gateway' + actions: + back_to_list: 'Back to Index' + edit: + page_title: 'Editing Gateway' + actions: + back_to_list: 'Back to Index' + edit: 'Edit' + view_all: 'View All' + form: + name: + label: 'Name' + hint: '' + technology: + label: 'Technology' + hint: '' + inbound: + label: 'Inbound' + hint: '' + outbound: + label: 'Outbound' + hint: '' + description: + label: 'Description' + hint: '' + button: 'Submit' \ No newline at end of file -- cgit v1.2.3 From 68e819dac27c262e918950f740b75a7739901aee Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Sun, 13 Jan 2013 16:38:19 +0000 Subject: gateway settings locales --- config/locales/views/gateway_settings/de.yml | 60 ++++++++++++++++++++++++++++ config/locales/views/gateway_settings/en.yml | 60 ++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 config/locales/views/gateway_settings/de.yml create mode 100644 config/locales/views/gateway_settings/en.yml (limited to 'config') diff --git a/config/locales/views/gateway_settings/de.yml b/config/locales/views/gateway_settings/de.yml new file mode 100644 index 0000000..b008e5e --- /dev/null +++ b/config/locales/views/gateway_settings/de.yml @@ -0,0 +1,60 @@ +de: + gateway_settings: + name: 'Gatewaysetting' + controller: + successfuly_created: 'Gatewaysetting wurde angelegt.' + successfuly_updated: 'Gatewaysetting wurde aktualisiert.' + successfuly_destroyed: 'Gatewaysetting wurde gelöscht.' + index: + page_title: 'Übersicht von Gatewaysetting' + gateway_id: 'Gateway' + name: 'Name' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gatewaysetting' + destroy: 'Löschen' + edit: 'Bearbeiten' + show: 'Anzeigen' + create: 'Neu anlegen' + create_for: 'Gatewaysetting neu anlegen für %{resource}' + show: + page_title: 'Gatewaysetting bearbeiten' + gateway_id: 'Gateway' + name: 'Name' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' + destroy: 'Löschen' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + new: + page_title: 'Gatewaysetting neu anlegen' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: + page_title: 'Gatewaysetting bearbeiten' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + form: + gateway_id: + label: 'Gateway' + hint: '' + name: + label: 'Name' + hint: '' + value: + label: 'Value' + hint: '' + class_type: + label: 'Class type' + hint: '' + description: + label: 'Description' + hint: '' + button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/gateway_settings/en.yml b/config/locales/views/gateway_settings/en.yml new file mode 100644 index 0000000..3072eb9 --- /dev/null +++ b/config/locales/views/gateway_settings/en.yml @@ -0,0 +1,60 @@ +en: + gateway_settings: + name: 'Gatewaysetting' + controller: + successfuly_created: 'Successfully created Gatewaysetting.' + successfuly_updated: 'Successfully updated Gatewaysetting.' + successfuly_destroyed: 'Successfully destroyed Gatewaysetting.' + index: + page_title: 'Listing Gatewaysetting' + gateway_id: 'Gateway' + name: 'Name' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Are you sure you want to delete this Gatewaysetting?' + destroy: 'Delete' + edit: 'Edit' + show: 'View' + create: 'New' + create_for: 'New Gatewaysetting for %{resource}' + show: + page_title: 'Show Gatewaysetting' + gateway_id: 'Gateway' + name: 'Name' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Are you sure you want to delete this element?' + destroy: 'Delete' + edit: 'Edit' + view_all: 'View All' + new: + page_title: 'New Gatewaysetting' + actions: + back_to_list: 'Back to Index' + edit: + page_title: 'Editing Gatewaysetting' + actions: + back_to_list: 'Back to Index' + edit: 'Edit' + view_all: 'View All' + form: + gateway_id: + label: 'Gateway' + hint: '' + name: + label: 'Name' + hint: '' + value: + label: 'Value' + hint: '' + class_type: + label: 'Class type' + hint: '' + description: + label: 'Description' + hint: '' + button: 'Submit' \ No newline at end of file -- cgit v1.2.3 From 9847f54b4ee56c87c0b215df003493ae723d1edf Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Sun, 13 Jan 2013 16:38:31 +0000 Subject: gateway parameters locales --- config/locales/views/gateway_parameters/de.yml | 60 ++++++++++++++++++++++++++ config/locales/views/gateway_parameters/en.yml | 60 ++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 config/locales/views/gateway_parameters/de.yml create mode 100644 config/locales/views/gateway_parameters/en.yml (limited to 'config') diff --git a/config/locales/views/gateway_parameters/de.yml b/config/locales/views/gateway_parameters/de.yml new file mode 100644 index 0000000..9c1cc3b --- /dev/null +++ b/config/locales/views/gateway_parameters/de.yml @@ -0,0 +1,60 @@ +de: + gateway_parameters: + name: 'Gatewayparameter' + controller: + successfuly_created: 'Gatewayparameter wurde angelegt.' + successfuly_updated: 'Gatewayparameter wurde aktualisiert.' + successfuly_destroyed: 'Gatewayparameter wurde gelöscht.' + index: + page_title: 'Übersicht von Gatewayparameter' + gateway_id: 'Gateway' + name: 'Name' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gatewayparameter' + destroy: 'Löschen' + edit: 'Bearbeiten' + show: 'Anzeigen' + create: 'Neu anlegen' + create_for: 'Gatewayparameter neu anlegen für %{resource}' + show: + page_title: 'Gatewayparameter bearbeiten' + gateway_id: 'Gateway' + name: 'Name' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' + destroy: 'Löschen' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + new: + page_title: 'Gatewayparameter neu anlegen' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: + page_title: 'Gatewayparameter bearbeiten' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + form: + gateway_id: + label: 'Gateway' + hint: '' + name: + label: 'Name' + hint: '' + value: + label: 'Value' + hint: '' + class_type: + label: 'Class type' + hint: '' + description: + label: 'Description' + hint: '' + button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/gateway_parameters/en.yml b/config/locales/views/gateway_parameters/en.yml new file mode 100644 index 0000000..8d84298 --- /dev/null +++ b/config/locales/views/gateway_parameters/en.yml @@ -0,0 +1,60 @@ +en: + gateway_parameters: + name: 'Gatewayparameter' + controller: + successfuly_created: 'Successfully created Gatewayparameter.' + successfuly_updated: 'Successfully updated Gatewayparameter.' + successfuly_destroyed: 'Successfully destroyed Gatewayparameter.' + index: + page_title: 'Listing Gatewayparameter' + gateway_id: 'Gateway' + name: 'Name' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Are you sure you want to delete this Gatewayparameter?' + destroy: 'Delete' + edit: 'Edit' + show: 'View' + create: 'New' + create_for: 'New Gatewayparameter for %{resource}' + show: + page_title: 'Show Gatewayparameter' + gateway_id: 'Gateway' + name: 'Name' + value: 'Value' + class_type: 'Class type' + description: 'Description' + actions: + confirm: 'Are you sure you want to delete this element?' + destroy: 'Delete' + edit: 'Edit' + view_all: 'View All' + new: + page_title: 'New Gatewayparameter' + actions: + back_to_list: 'Back to Index' + edit: + page_title: 'Editing Gatewayparameter' + actions: + back_to_list: 'Back to Index' + edit: 'Edit' + view_all: 'View All' + form: + gateway_id: + label: 'Gateway' + hint: '' + name: + label: 'Name' + hint: '' + value: + label: 'Value' + hint: '' + class_type: + label: 'Class type' + hint: '' + description: + label: 'Description' + hint: '' + button: 'Submit' \ No newline at end of file -- cgit v1.2.3 From bfacc7b5de2f3a5a9d09a16683a9ba1fcf184d98 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 13 Jan 2013 22:11:11 +0100 Subject: Fixed some gateway stuff. --- config/hirb.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/hirb.yml b/config/hirb.yml index f011c9d..da7c083 100644 --- a/config/hirb.yml +++ b/config/hirb.yml @@ -198,4 +198,11 @@ - first_name - user_name - user - + GatewaySetting: + :options: + :fields: + - id + - gateway + - name + - value + - class_type -- cgit v1.2.3 From 042e13773647764c4f55b5e60008ce96c45e34d5 Mon Sep 17 00:00:00 2001 From: spag Date: Tue, 15 Jan 2013 13:52:10 +0100 Subject: locales --- config/locales/views/gateway_settings/de.yml | 26 +++++++++++++------------- config/locales/views/gateway_settings/en.yml | 16 ++++++++-------- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'config') diff --git a/config/locales/views/gateway_settings/de.yml b/config/locales/views/gateway_settings/de.yml index b008e5e..698a81a 100644 --- a/config/locales/views/gateway_settings/de.yml +++ b/config/locales/views/gateway_settings/de.yml @@ -1,42 +1,42 @@ de: gateway_settings: - name: 'Gatewaysetting' + name: 'Gateway Einstellungen' controller: - successfuly_created: 'Gatewaysetting wurde angelegt.' - successfuly_updated: 'Gatewaysetting wurde aktualisiert.' - successfuly_destroyed: 'Gatewaysetting wurde gelöscht.' + successfuly_created: 'Gateway Einstellung wurde angelegt.' + successfuly_updated: 'Gateway Einstellung wurde aktualisiert.' + successfuly_destroyed: 'Gateway Einstellung wurde gelöscht.' index: - page_title: 'Übersicht von Gatewaysetting' + page_title: 'Gateway Einstellungen' gateway_id: 'Gateway' name: 'Name' value: 'Value' class_type: 'Class type' - description: 'Description' + description: 'Beschreibung' actions: - confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gatewaysetting' + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Gateway Einstellungen' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' create: 'Neu anlegen' - create_for: 'Gatewaysetting neu anlegen für %{resource}' + create_for: 'Gateway Einstellungen neu anlegen für %{resource}' show: - page_title: 'Gatewaysetting bearbeiten' + page_title: 'Gateway Einstellungen bearbeiten' gateway_id: 'Gateway' name: 'Name' value: 'Value' class_type: 'Class type' - description: 'Description' + description: 'Beschreibung' actions: confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' view_all: 'Alle anzeigen' new: - page_title: 'Gatewaysetting neu anlegen' + page_title: 'Gateway Einstellungen neu anlegen' actions: back_to_list: 'Zurück zur Übersicht' edit: - page_title: 'Gatewaysetting bearbeiten' + page_title: 'Gateway Einstellungen bearbeiten' actions: back_to_list: 'Zurück zur Übersicht' edit: 'Bearbeiten' @@ -55,6 +55,6 @@ de: label: 'Class type' hint: '' description: - label: 'Description' + label: 'Beschreibung' hint: '' button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/gateway_settings/en.yml b/config/locales/views/gateway_settings/en.yml index 3072eb9..63c1609 100644 --- a/config/locales/views/gateway_settings/en.yml +++ b/config/locales/views/gateway_settings/en.yml @@ -2,23 +2,23 @@ en: gateway_settings: name: 'Gatewaysetting' controller: - successfuly_created: 'Successfully created Gatewaysetting.' - successfuly_updated: 'Successfully updated Gatewaysetting.' - successfuly_destroyed: 'Successfully destroyed Gatewaysetting.' + successfuly_created: 'Successfully created entry.' + successfuly_updated: 'Successfully updated entry.' + successfuly_destroyed: 'Successfully destroyed entry.' index: - page_title: 'Listing Gatewaysetting' + page_title: 'Gateway settings' gateway_id: 'Gateway' name: 'Name' value: 'Value' class_type: 'Class type' description: 'Description' actions: - confirm: 'Are you sure you want to delete this Gatewaysetting?' + confirm: 'Are you sure you want to delete this entry?' destroy: 'Delete' edit: 'Edit' show: 'View' create: 'New' - create_for: 'New Gatewaysetting for %{resource}' + create_for: 'New settings entry for %{resource}' show: page_title: 'Show Gatewaysetting' gateway_id: 'Gateway' @@ -32,11 +32,11 @@ en: edit: 'Edit' view_all: 'View All' new: - page_title: 'New Gatewaysetting' + page_title: 'New Gateway settings entry' actions: back_to_list: 'Back to Index' edit: - page_title: 'Editing Gatewaysetting' + page_title: 'Editing Gateway settings' actions: back_to_list: 'Back to Index' edit: 'Edit' -- cgit v1.2.3 From f984b76b33c4a371f5c34eab4399b21caeabbff9 Mon Sep 17 00:00:00 2001 From: spag Date: Tue, 15 Jan 2013 13:58:09 +0100 Subject: locales --- config/locales/views/gateways/de.yml | 3 ++- config/locales/views/gateways/en.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/locales/views/gateways/de.yml b/config/locales/views/gateways/de.yml index cfe5615..28bc46c 100644 --- a/config/locales/views/gateways/de.yml +++ b/config/locales/views/gateways/de.yml @@ -20,7 +20,8 @@ de: create: 'Neu anlegen' create_for: 'Gateway neu anlegen für %{resource}' show: - page_title: 'Gateway bearbeiten' + page_title: 'Gateway' + id: 'ID' name: 'Name' technology: 'Technology' inbound: 'Inbound' diff --git a/config/locales/views/gateways/en.yml b/config/locales/views/gateways/en.yml index 2abf0f2..7732da1 100644 --- a/config/locales/views/gateways/en.yml +++ b/config/locales/views/gateways/en.yml @@ -20,7 +20,8 @@ en: create: 'New' create_for: 'New Gateway for %{resource}' show: - page_title: 'Show Gateway' + page_title: 'Gateway' + id: 'ID' name: 'Name' technology: 'Technology' inbound: 'Inbound' -- cgit v1.2.3 From a0569f5546781b8e87011a79e2fccaae8c06e862 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 15 Jan 2013 22:42:03 +0100 Subject: s/Benutzer/User/g --- config/locales/views/users/de.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'config') diff --git a/config/locales/views/users/de.yml b/config/locales/views/users/de.yml index 951600d..e4a0ae2 100644 --- a/config/locales/views/users/de.yml +++ b/config/locales/views/users/de.yml @@ -1,15 +1,15 @@ de: users: - name: "Benutzer" + name: "User" controller: - successfuly_created: 'Der Benutzer %{resource} wurde erstellt.' - successfuly_created_and_login: 'Der Benutzer %{resource} wurde erstellt. Sie sind jetzt als dieser Benutzer angemeldet.' - successfuly_updated: 'Benutzer-Daten aktualisiert.' - successfuly_destroyed: 'Der Benutzer wurde gelöscht.' + successfuly_created: 'Der User %{resource} wurde erstellt.' + successfuly_created_and_login: 'Der User %{resource} wurde erstellt. Sie sind jetzt als dieser User angemeldet.' + successfuly_updated: 'User-Daten aktualisiert.' + successfuly_destroyed: 'Der User wurde gelöscht.' avatar_destroyed: 'Der Avatar wurde gelöscht.' index: - page_title: 'Benutzer' - user_name: 'Benutzer-Name' + page_title: 'User' + user_name: 'User-Name' email: 'E-Mail Adresse' first_name: 'Vorname' middle_name: 'Zweiter Vorname' @@ -20,15 +20,15 @@ de: language_id: 'Sprache' send_voicemail_as_email_attachment: 'Sprachnachrichten per E-Mail' actions: - confirm: 'Sind Sie sicher, dass Sie diesen Benutzer löschen möchten?' + confirm: 'Sind Sie sicher, dass Sie diesen User löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' show: 'Anzeigen' - create: 'Neuen Benutzer anlegen' - create_for: 'Neuen Benutzer für %{resource} anlegen' + create: 'Neuen User anlegen' + create_for: 'Neuen User für %{resource} anlegen' show: - page_title: 'Benutzer anzeigen' - user_name: 'Benutzer-Name' + page_title: 'User anzeigen' + user_name: 'User-Name' email: 'E-Mail Adresse' first_name: 'Vorname' middle_name: 'Zweiter Vorname' @@ -39,17 +39,17 @@ de: language_id: 'Sprache' send_voicemail_as_email_attachment: 'Sprachnachrichten per E-Mail' actions: - confirm: 'Sind Sie sicher, dass Sie diesen Benutzer löschen möchten?' + confirm: 'Sind Sie sicher, dass Sie diesen User löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' - view_all: 'Alle Benutzer anzeigen' + view_all: 'Alle User anzeigen' new: - page_title: 'Neuen Benutzer anlegen' + page_title: 'Neuen User anlegen' edit: - page_title: 'Benutzer %{resource} bearbeiten' + page_title: 'User %{resource} bearbeiten' form: user_name: - label: 'Benutzer-Name' + label: 'User-Name' hint: '' email: label: 'E-Mail Adresse' -- cgit v1.2.3 From 9c23099b8f93e0ace47caba051204eb6624b8c95 Mon Sep 17 00:00:00 2001 From: "Mario \"Kuroir\" Ricalde" Date: Wed, 16 Jan 2013 02:45:18 -0600 Subject: Updates Rails to 3.2.9 --- config/application.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index d09cf24..776cf81 100644 --- a/config/application.rb +++ b/config/application.rb @@ -4,7 +4,7 @@ require 'rails/all' if defined?(Bundler) # If you precompile assets before deploying to production, use this line - Bundler.require *Rails.groups(:assets => %w(development test)) + Bundler.require(*Rails.groups(:assets => %w(development test))) # If you want your assets lazily compiled in production, use this line # Bundler.require(:default, :assets, Rails.env) end @@ -21,19 +21,19 @@ module Gemeinschaft42c # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - + # --- rather use Apache + Passenger for SSL -----{ #config.plugins = [ :exception_notification, :ssl_requirement, :all ] - + #config.middleware.insert_before ActionDispatch::Static, "Rack::SSL" #config.middleware.insert_before ActionDispatch::Static, Rack::SSL, :exclude => proc { |env| env['HTTPS'] != 'on' } #config.force_ssl = true - + #require 'rack/ssl' #config.middleware.use Rack::SSL # -----------------------------------------------} - - + + # Activate observers that should always be running. # config.active_record.observers = :cacher, :garbage_collector, :forum_observer @@ -58,7 +58,7 @@ module Gemeinschaft42c # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' - + # Load the PhoneControllers config.autoload_paths += %W(#{config.root}/lib/phone_controllers) end -- cgit v1.2.3 From 113e3c6c6117fbeca7b9bf1f0e6dc26b0db9c407 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 16 Jan 2013 08:33:45 -0500 Subject: call_routes added --- config/locales/views/call_routes/de.yml | 60 +++++++++++++++++++++++++++++++++ config/locales/views/call_routes/en.yml | 60 +++++++++++++++++++++++++++++++++ config/routes.rb | 2 ++ 3 files changed, 122 insertions(+) create mode 100644 config/locales/views/call_routes/de.yml create mode 100644 config/locales/views/call_routes/en.yml (limited to 'config') diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml new file mode 100644 index 0000000..34af575 --- /dev/null +++ b/config/locales/views/call_routes/de.yml @@ -0,0 +1,60 @@ +de: + call_routes: + name: 'Call route' + controller: + successfuly_created: 'Call route wurde angelegt.' + successfuly_updated: 'Call route wurde aktualisiert.' + successfuly_destroyed: 'Call route wurde gelöscht.' + index: + page_title: 'Übersicht von Call route' + table: 'Table' + name: 'Name' + endpoint_type: 'Endpoint type' + endpoint_id: 'Endpoint' + position: 'Position' + actions: + confirm: '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}' + show: + page_title: 'Call route bearbeiten' + table: 'Table' + name: 'Name' + endpoint_type: 'Endpoint type' + endpoint_id: 'Endpoint' + position: 'Position' + actions: + confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' + destroy: 'Löschen' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + new: + page_title: 'Call route neu anlegen' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: + page_title: 'Call route bearbeiten' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + form: + table: + label: 'Table' + hint: '' + name: + label: 'Name' + hint: '' + endpoint_type: + label: 'Endpoint type' + hint: '' + endpoint_id: + label: 'Endpoint' + hint: '' + position: + label: 'Position' + hint: '' + button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/call_routes/en.yml b/config/locales/views/call_routes/en.yml new file mode 100644 index 0000000..251f76e --- /dev/null +++ b/config/locales/views/call_routes/en.yml @@ -0,0 +1,60 @@ +en: + call_routes: + name: 'Call route' + controller: + successfuly_created: 'Successfully created Call route.' + successfuly_updated: 'Successfully updated Call route.' + successfuly_destroyed: 'Successfully destroyed Call route.' + index: + page_title: 'Listing Call route' + table: 'Table' + name: 'Name' + endpoint_type: 'Endpoint type' + endpoint_id: 'Endpoint' + position: 'Position' + actions: + confirm: 'Are you sure you want to delete this Call route?' + destroy: 'Delete' + edit: 'Edit' + show: 'View' + create: 'New' + create_for: 'New Call route for %{resource}' + show: + page_title: 'Show Call route' + table: 'Table' + name: 'Name' + endpoint_type: 'Endpoint type' + endpoint_id: 'Endpoint' + position: 'Position' + actions: + confirm: 'Are you sure you want to delete this element?' + destroy: 'Delete' + edit: 'Edit' + view_all: 'View All' + new: + page_title: 'New Call route' + actions: + back_to_list: 'Back to Index' + edit: + page_title: 'Editing Call route' + actions: + back_to_list: 'Back to Index' + edit: 'Edit' + view_all: 'View All' + form: + table: + label: 'Table' + hint: '' + name: + label: 'Name' + hint: '' + endpoint_type: + label: 'Endpoint type' + hint: '' + endpoint_id: + label: 'Endpoint' + hint: '' + position: + label: 'Position' + hint: '' + button: 'Submit' \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 4e812c0..2834d69 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Gemeinschaft42c::Application.routes.draw do + resources :call_routes + resources :gateways do resources :gateway_settings resources :gateway_parameters -- cgit v1.2.3 From 8c83a89c6fbfdb31cae8ea6fcf2fd50c12c076a5 Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 16 Jan 2013 08:37:56 -0500 Subject: route_elements added --- config/locales/views/route_elements/de.yml | 75 ++++++++++++++++++++++++++++++ config/locales/views/route_elements/en.yml | 75 ++++++++++++++++++++++++++++++ config/routes.rb | 2 + 3 files changed, 152 insertions(+) create mode 100644 config/locales/views/route_elements/de.yml create mode 100644 config/locales/views/route_elements/en.yml (limited to 'config') diff --git a/config/locales/views/route_elements/de.yml b/config/locales/views/route_elements/de.yml new file mode 100644 index 0000000..d2c6c39 --- /dev/null +++ b/config/locales/views/route_elements/de.yml @@ -0,0 +1,75 @@ +de: + route_elements: + name: 'Route element' + controller: + successfuly_created: 'Route element wurde angelegt.' + successfuly_updated: 'Route element wurde aktualisiert.' + successfuly_destroyed: 'Route element wurde gelöscht.' + index: + page_title: 'Übersicht von Route element' + call_route_id: 'Call route' + var_in: 'Var in' + var_out: 'Var out' + pattern: 'Pattern' + replacement: 'Replacement' + action: 'Action' + mandatory: 'Mandatory' + position: 'Position' + actions: + confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Route element' + destroy: 'Löschen' + edit: 'Bearbeiten' + show: 'Anzeigen' + create: 'Neu anlegen' + create_for: 'Route element neu anlegen für %{resource}' + show: + page_title: 'Route element bearbeiten' + call_route_id: 'Call route' + var_in: 'Var in' + var_out: 'Var out' + pattern: 'Pattern' + replacement: 'Replacement' + action: 'Action' + mandatory: 'Mandatory' + position: 'Position' + actions: + confirm: 'Sind Sie sicher, dass die dieses Element löschen möchten?' + destroy: 'Löschen' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + new: + page_title: 'Route element neu anlegen' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: + page_title: 'Route element bearbeiten' + actions: + back_to_list: 'Zurück zur Übersicht' + edit: 'Bearbeiten' + view_all: 'Alle anzeigen' + form: + call_route_id: + label: 'Call route' + hint: '' + var_in: + label: 'Var in' + hint: '' + var_out: + label: 'Var out' + hint: '' + pattern: + label: 'Pattern' + hint: '' + replacement: + label: 'Replacement' + hint: '' + action: + label: 'Action' + hint: '' + mandatory: + label: 'Mandatory' + hint: '' + position: + label: 'Position' + hint: '' + button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/route_elements/en.yml b/config/locales/views/route_elements/en.yml new file mode 100644 index 0000000..1340309 --- /dev/null +++ b/config/locales/views/route_elements/en.yml @@ -0,0 +1,75 @@ +en: + route_elements: + name: 'Route element' + controller: + successfuly_created: 'Successfully created Route element.' + successfuly_updated: 'Successfully updated Route element.' + successfuly_destroyed: 'Successfully destroyed Route element.' + index: + page_title: 'Listing Route element' + call_route_id: 'Call route' + var_in: 'Var in' + var_out: 'Var out' + pattern: 'Pattern' + replacement: 'Replacement' + action: 'Action' + mandatory: 'Mandatory' + position: 'Position' + actions: + confirm: 'Are you sure you want to delete this Route element?' + destroy: 'Delete' + edit: 'Edit' + show: 'View' + create: 'New' + create_for: 'New Route element for %{resource}' + show: + page_title: 'Show Route element' + call_route_id: 'Call route' + var_in: 'Var in' + var_out: 'Var out' + pattern: 'Pattern' + replacement: 'Replacement' + action: 'Action' + mandatory: 'Mandatory' + position: 'Position' + actions: + confirm: 'Are you sure you want to delete this element?' + destroy: 'Delete' + edit: 'Edit' + view_all: 'View All' + new: + page_title: 'New Route element' + actions: + back_to_list: 'Back to Index' + edit: + page_title: 'Editing Route element' + actions: + back_to_list: 'Back to Index' + edit: 'Edit' + view_all: 'View All' + form: + call_route_id: + label: 'Call route' + hint: '' + var_in: + label: 'Var in' + hint: '' + var_out: + label: 'Var out' + hint: '' + pattern: + label: 'Pattern' + hint: '' + replacement: + label: 'Replacement' + hint: '' + action: + label: 'Action' + hint: '' + mandatory: + label: 'Mandatory' + hint: '' + position: + label: 'Position' + hint: '' + button: 'Submit' \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 2834d69..3874170 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Gemeinschaft42c::Application.routes.draw do + resources :route_elements + resources :call_routes resources :gateways do -- cgit v1.2.3 From 0ee17f52f8ad337c1240b4c55dbd8f6c6c74dc90 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Wed, 16 Jan 2013 16:32:59 +0100 Subject: Fixed routes and breadcrumbs. #106 --- config/routes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 3874170..249c947 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,8 @@ Gemeinschaft42c::Application.routes.draw do - resources :route_elements - - resources :call_routes + resources :call_routes do + resources :route_elements + end resources :gateways do resources :gateway_settings -- cgit v1.2.3 From ea70e08534319dd3f15c34859c498771fa7d9b32 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Wed, 16 Jan 2013 21:06:15 +0100 Subject: add configuration for unicorn server --- config/unicorn.rb | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 config/unicorn.rb (limited to 'config') diff --git a/config/unicorn.rb b/config/unicorn.rb new file mode 100644 index 0000000..d379569 --- /dev/null +++ b/config/unicorn.rb @@ -0,0 +1,35 @@ +worker_processes 2 +working_directory "/opt/GS5/" + +# This loads the application in the master process before forking +# worker processes +# Read more about it here: +# http://unicorn.bogomips.org/Unicorn/Configurator.html +preload_app true + +timeout 30 + +# This is where we specify the socket. +# We will point the upstream Nginx module to this socket later on +listen "/opt/GS5/tmp/sockets/unicorn.sock", :backlog => 64 + +pid "/opt/GS5/tmp/pids/unicorn.pid" + +# Set the path of the log files inside the log folder of the testapp +stderr_path "/opt/GS5/log/unicorn.stderr.log" +stdout_path "/opt/GS5/log/unicorn.stdout.log" + +before_fork do |server, worker| +# This option works in together with preload_app true setting +# What is does is prevent the master process from holding +# the database connection + defined?(ActiveRecord::Base) and + ActiveRecord::Base.connection.disconnect! +end + +after_fork do |server, worker| +# Here we are establishing the connection after forking worker +# processes + defined?(ActiveRecord::Base) and + ActiveRecord::Base.establish_connection +end -- cgit v1.2.3 From 86b9ba00a88b455f88ced10cf959660b96113c88 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Wed, 16 Jan 2013 23:24:41 +0100 Subject: better process handling --- config/unicorn.rb | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'config') diff --git a/config/unicorn.rb b/config/unicorn.rb index d379569..8157562 100644 --- a/config/unicorn.rb +++ b/config/unicorn.rb @@ -1,35 +1,34 @@ -worker_processes 2 -working_directory "/opt/GS5/" +APP_ROOT = File.expand_path(File.dirname(File.dirname(__FILE__))) + +worker_processes 1 +working_directory APP_ROOT -# This loads the application in the master process before forking -# worker processes -# Read more about it here: -# http://unicorn.bogomips.org/Unicorn/Configurator.html preload_app true timeout 30 -# This is where we specify the socket. -# We will point the upstream Nginx module to this socket later on -listen "/opt/GS5/tmp/sockets/unicorn.sock", :backlog => 64 +listen APP_ROOT + "/tmp/sockets/unicorn.sock", :backlog => 64 -pid "/opt/GS5/tmp/pids/unicorn.pid" +pid APP_ROOT + "/tmp/pids/unicorn.pid" -# Set the path of the log files inside the log folder of the testapp -stderr_path "/opt/GS5/log/unicorn.stderr.log" -stdout_path "/opt/GS5/log/unicorn.stdout.log" +stderr_path APP_ROOT + "/log/unicorn.stderr.log" +stdout_path APP_ROOT + "/log/unicorn.stdout.log" before_fork do |server, worker| -# This option works in together with preload_app true setting -# What is does is prevent the master process from holding -# the database connection - defined?(ActiveRecord::Base) and - ActiveRecord::Base.connection.disconnect! + defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect! + + old_pid = Rails.root + '/tmp/pids/unicorn.pid.oldbin' + if File.exists?(old_pid) && server.pid != old_pid + begin + Process.kill("QUIT", File.read(old_pid).to_i) + rescue Errno::ENOENT, Errno::ESRCH + puts "Old master alerady dead" + end + end end after_fork do |server, worker| -# Here we are establishing the connection after forking worker -# processes - defined?(ActiveRecord::Base) and - ActiveRecord::Base.establish_connection + defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection + child_pid = server.config[:pid].sub('.pid', ".#{worker.nr}.pid") + system("echo #{Process.pid} > #{child_pid}") end -- cgit v1.2.3 From 8b37b125399ba4019091b83efe889dc8af89185f Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Fri, 18 Jan 2013 13:41:02 +0100 Subject: set log_level to warn for production environment (takeover from GBE) --- config/environments/production.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/environments/production.rb b/config/environments/production.rb index f715d91..344f8f8 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -30,8 +30,8 @@ Gemeinschaft42c::Application.configure do # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. # config.force_ssl = true - # See everything in the log (default is :info) - # config.log_level = :debug + # Show only warnings in log files + config.log_level = :warn # Use a different logger for distributed setups # config.logger = SyslogLogger.new -- cgit v1.2.3 From 12e91c4932e32808e5a9bf3f454920e7fb1b7d61 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 18 Jan 2013 17:27:15 +0100 Subject: Imports the GS version number from ENV['GS_VERSION']. #98 --- config/initializers/update_gs_version_number.rb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 config/initializers/update_gs_version_number.rb (limited to 'config') diff --git a/config/initializers/update_gs_version_number.rb b/config/initializers/update_gs_version_number.rb new file mode 100644 index 0000000..303b1e0 --- /dev/null +++ b/config/initializers/update_gs_version_number.rb @@ -0,0 +1,6 @@ +# The Gemeinschaft version is stored in an environment variable. +# It equals the branch in git. +# +if !ENV['GS_VERSION'].nil? && GsParameter.get('GEMEINSCHAFT_VERSION') != ENV['GS_VERSION'] + GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').first.update_attributes(:name => ENV['GS_VERSION']) +end \ No newline at end of file -- cgit v1.2.3 From 8d1167c53e9edaf6e5a2b3e89dd4fd2a2c872dbb Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 18 Jan 2013 17:55:10 +0100 Subject: Added GsParameter.table_exists? #98 --- config/initializers/update_gs_version_number.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/update_gs_version_number.rb b/config/initializers/update_gs_version_number.rb index 303b1e0..914f007 100644 --- a/config/initializers/update_gs_version_number.rb +++ b/config/initializers/update_gs_version_number.rb @@ -1,6 +1,6 @@ # The Gemeinschaft version is stored in an environment variable. # It equals the branch in git. # -if !ENV['GS_VERSION'].nil? && GsParameter.get('GEMEINSCHAFT_VERSION') != ENV['GS_VERSION'] +if !ENV['GS_VERSION'].nil? && GsParameter.table_exists? && GsParameter.get('GEMEINSCHAFT_VERSION') != ENV['GS_VERSION'] GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').first.update_attributes(:name => ENV['GS_VERSION']) end \ No newline at end of file -- cgit v1.2.3 From 313a6bfb2c5eddca7872bda007b7eae87306e5c6 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 18 Jan 2013 19:06:01 +0100 Subject: Update config/initializers/update_gs_version_number.rb --- config/initializers/update_gs_version_number.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/initializers/update_gs_version_number.rb b/config/initializers/update_gs_version_number.rb index 914f007..972c480 100644 --- a/config/initializers/update_gs_version_number.rb +++ b/config/initializers/update_gs_version_number.rb @@ -2,5 +2,7 @@ # It equals the branch in git. # if !ENV['GS_VERSION'].nil? && GsParameter.table_exists? && GsParameter.get('GEMEINSCHAFT_VERSION') != ENV['GS_VERSION'] - GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').first.update_attributes(:name => ENV['GS_VERSION']) -end \ No newline at end of file + if GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').any? + GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').first.update_attributes(:name => ENV['GS_VERSION']) + end +end -- cgit v1.2.3 From edb3c4d6eeb603a84403bf81e695330a8ea9c603 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 08:37:14 +0100 Subject: Bugfix --- config/initializers/update_gs_version_number.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'config') diff --git a/config/initializers/update_gs_version_number.rb b/config/initializers/update_gs_version_number.rb index 972c480..4770858 100644 --- a/config/initializers/update_gs_version_number.rb +++ b/config/initializers/update_gs_version_number.rb @@ -2,7 +2,8 @@ # It equals the branch in git. # if !ENV['GS_VERSION'].nil? && GsParameter.table_exists? && GsParameter.get('GEMEINSCHAFT_VERSION') != ENV['GS_VERSION'] - if GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').any? - GsParameter.where(:name => 'GEMEINSCHAFT_VERSION').first.update_attributes(:name => ENV['GS_VERSION']) - end + version = GsParameter.find_or_create_by_name('GEMEINSCHAFT_VERSION') + version.section = 'Generic' + version.value = ENV['GS_VERSION'] + version.save end -- cgit v1.2.3 From b4abd87252db53e3d79a9601cf9c581f61827f10 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sat, 19 Jan 2013 09:05:50 +0100 Subject: Added call_routes to tenant#show --- config/locales/views/call_routes/de.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'config') diff --git a/config/locales/views/call_routes/de.yml b/config/locales/views/call_routes/de.yml index 34af575..71ad51a 100644 --- a/config/locales/views/call_routes/de.yml +++ b/config/locales/views/call_routes/de.yml @@ -1,27 +1,27 @@ 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: 'Übersicht von Call route' - table: 'Table' + page_title: 'Liste aller Call Routen' + routing_table: 'Routing Table' name: 'Name' endpoint_type: 'Endpoint type' endpoint_id: 'Endpoint' position: 'Position' actions: - confirm: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Call route' + confirm: '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' - table: 'Table' + page_title: 'Call Route bearbeiten' + routing_table: 'Routing Table' name: 'Name' endpoint_type: 'Endpoint type' endpoint_id: 'Endpoint' @@ -32,18 +32,18 @@ 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' view_all: 'Alle anzeigen' form: - table: - label: 'Table' + routing_table: + label: 'Routing Table' hint: '' name: label: 'Name' -- cgit v1.2.3 From 1e290840497225c50373d0b860036505fa91e13a Mon Sep 17 00:00:00 2001 From: spag Date: Sat, 19 Jan 2013 09:09:53 +0100 Subject: move routes added --- config/routes.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index 249c947..b25081a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,16 @@ Gemeinschaft42c::Application.routes.draw do resources :call_routes do - resources :route_elements + resources :route_elements do + member do + put 'move_higher' + put 'move_lower' + end + end + member do + put 'move_higher' + put 'move_lower' + end end resources :gateways do -- cgit v1.2.3 From 66147369d3f1a96ebd7c20bb89165a116ec1e147 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 19:20:30 +0100 Subject: Use thin to get rid of those annoying "WARN Could not determine content-length of response body." log entries. --- 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 5076f48..1a3acae 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -40,7 +40,7 @@ Gemeinschaft42c::Application.configure do # Enable Hirb: extend Hirb::Console - Hirb::View.enable + Hirb::View.enable end -- cgit v1.2.3 From 4ea0e252683d89794deff7b1b3689d2cdf61e0d0 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Sun, 20 Jan 2013 19:54:11 +0100 Subject: Added a gateways table to tenant#view. --- config/locales/views/gateways/de.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/locales/views/gateways/de.yml b/config/locales/views/gateways/de.yml index 28bc46c..befe6b6 100644 --- a/config/locales/views/gateways/de.yml +++ b/config/locales/views/gateways/de.yml @@ -6,9 +6,9 @@ de: successfuly_updated: 'Gateway wurde aktualisiert.' successfuly_destroyed: 'Gateway wurde gelöscht.' index: - page_title: 'Übersicht von Gateway' + page_title: 'Liste aller Gateways' name: 'Name' - technology: 'Technology' + technology: 'Technologie' inbound: 'Inbound' outbound: 'Outbound' description: 'Description' @@ -23,7 +23,7 @@ de: page_title: 'Gateway' id: 'ID' name: 'Name' - technology: 'Technology' + technology: 'Technologie' inbound: 'Inbound' outbound: 'Outbound' description: 'Description' @@ -47,7 +47,7 @@ de: label: 'Name' hint: '' technology: - label: 'Technology' + label: 'Technologie' hint: '' inbound: label: 'Inbound' -- cgit v1.2.3 From 86e94e36e52ff7a3dbc7219db5b3bea5a7f56711 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 14:09:38 +0100 Subject: factory_defaults_prerouting --- 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 a1dd989..d087583 100644 --- a/config/locales/views/gemeinschaft_setups/de.yml +++ b/config/locales/views/gemeinschaft_setups/de.yml @@ -25,4 +25,7 @@ de: language_id: label: 'Sprache' hint: '' + default_area_code: + label: 'Standard Ortsvorwahl' + hint: '030 für Berlin, 0261 für Koblenz, 02631 für Neuwied, usw.' button: 'Absenden' \ No newline at end of file diff --git a/config/locales/views/gemeinschaft_setups/en.yml b/config/locales/views/gemeinschaft_setups/en.yml index aef2686..5e22e58 100644 --- a/config/locales/views/gemeinschaft_setups/en.yml +++ b/config/locales/views/gemeinschaft_setups/en.yml @@ -25,4 +25,7 @@ en: language_id: label: 'Language' hint: '' + default_area_code: + label: 'Default area code' + hint: '' button: 'Submit' \ No newline at end of file -- cgit v1.2.3 From 18ed88c7e3c789366f6e5443dc4ee0bc981a4b88 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 20:18:16 +0100 Subject: Started the migration to Twitter Bootstrap. --- config/application.rb | 1 + config/environments/development.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 776cf81..ad58092 100644 --- a/config/application.rb +++ b/config/application.rb @@ -17,6 +17,7 @@ module Gemeinschaft42c # Custom directories with classes and modules you want to be autoloadable. # config.autoload_paths += %W(#{config.root}/extras) + config.autoload_paths += %W(#{config.root}/lib) # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. 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 c8973406e83861f593af33c959abd4529a855437 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Mon, 21 Jan 2013 20:30:07 +0100 Subject: rails generate simple_form:install --bootstrap --- config/initializers/simple_form.rb | 173 +++++++++++++++++++++++++++++++++++-- config/locales/simple_form.en.yml | 2 +- 2 files changed, 166 insertions(+), 9 deletions(-) (limited to 'config') diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index 2e3d9fb..ab84483 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -1,19 +1,176 @@ # Use this setup block to configure all options available in SimpleForm. SimpleForm.setup do |config| - config.wrappers :tag => :div, :class => :input, - :error_class => :field_with_errors do |b| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + config.wrappers :default, :class => :input, + :hint_class => :field_with_hint, :error_class => :field_with_errors do |b| + ## Extensions enabled by default + # Any of these extensions can be disabled for a + # given input by passing: `f.input EXTENSION_NAME => false`. + # You can make any of these extensions optional by + # renaming `b.use` to `b.optional`. - # Form extensions + # Determines whether to use HTML5 (:email, :url, ...) + # and required attributes b.use :html5 - b.optional :pattern - b.use :maxlength + + # Calculates placeholders automatically from I18n + # You can also pass a string as f.input :placeholder => "Placeholder" b.use :placeholder - b.use :readonly - # Form components + ## Optional extensions + # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable the lookup for any of those + # extensions by default, you can change `b.optional` to `b.use`. + + # Calculates maxlength from length validations for string inputs + b.optional :maxlength + + # Calculates pattern from format validations for string inputs + b.optional :pattern + + # Calculates min and max from length validations for numeric inputs + b.optional :min_max + + # Calculates readonly automatically from readonly attributes + b.optional :readonly + + ## Inputs b.use :label_input - b.use :error, :wrap_with => { :tag => :span, :class => :error } b.use :hint, :wrap_with => { :tag => :span, :class => :hint } + b.use :error, :wrap_with => { :tag => :span, :class => :error } + end + + config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper :tag => 'div', :class => 'controls' do |ba| + ba.use :input + ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' } + ba.use :hint, :wrap_with => { :tag => 'p', :class => 'help-block' } + end + end + + config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper :tag => 'div', :class => 'controls' do |input| + input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend| + prepend.use :input + end + input.use :hint, :wrap_with => { :tag => 'span', :class => 'help-block' } + input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' } + end end + config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper :tag => 'div', :class => 'controls' do |input| + input.wrapper :tag => 'div', :class => 'input-append' do |append| + append.use :input + end + input.use :hint, :wrap_with => { :tag => 'span', :class => 'help-block' } + input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' } + end + end + + # Wrappers for forms and inputs using the Twitter Bootstrap toolkit. + # Check the Bootstrap docs (http://twitter.github.com/bootstrap) + # to learn about the different styles for forms and inputs, + # buttons and other elements. + config.default_wrapper = :bootstrap + + # Define the way to render check boxes / radio buttons with labels. + # Defaults to :nested for bootstrap config. + # :inline => input + label + # :nested => label > input + config.boolean_style = :nested + + # Default class for buttons + config.button_class = 'btn' + + # Method used to tidy up errors. + # config.error_method = :first + + # Default tag used for error notification helper. + config.error_notification_tag = :div + + # CSS class to add for error notification helper. + config.error_notification_class = 'alert alert-error' + + # ID to add for error notification helper. + # config.error_notification_id = nil + + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. Please note that when using :boolean_style = :nested, + # SimpleForm will force this option to be a label. + # config.item_wrapper_tag = :span + + # You can define a class to use in all item wrappers. Defaulting to none. + # config.item_wrapper_class = nil + + # How the label text should be generated altogether with the required text. + # config.label_text = lambda { |label, required| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + config.label_class = 'control-label' + + # You can define the class to use on all forms. Default is simple_form. + # config.form_class = :simple_form + + # You can define which elements should obtain additional classes + # config.generate_additional_classes_for = [:wrapper, :label, :input] + + # Whether attributes are required by default (or not). Default is true. + # config.required_by_default = true + + # Tell browsers whether to use default HTML5 validations (novalidate option). + # Default is enabled. + config.browser_validations = false + + # Collection of methods to detect if a file type was given. + # config.file_methods = [ :mounted_as, :file?, :public_filename ] + + # Custom mappings for input types. This should be a hash containing a regexp + # to match as key, and the input type that will be used when the field name + # matches the regexp as value. + # config.input_mappings = { /count/ => :integer } + + # Default priority for time_zone inputs. + # config.time_zone_priority = nil + + # Default priority for country inputs. + # config.country_priority = nil + + # Default size for text inputs. + # config.default_input_size = 50 + + # When false, do not use translations for labels. + # config.translate_labels = true + + # Automatically discover new inputs in Rails' autoload path. + # config.inputs_discovery = true + + # Cache SimpleForm inputs discovery + # config.cache_discovery = !Rails.env.development? end diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 007d9f9..409e265 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -9,7 +9,7 @@ en: # When using html, text and mark won't be used. # html: '*' error_notification: - default_message: "Some errors were found, please take a look." + default_message: "Some errors were found, please take a look:" # Labels and hints examples # labels: # password: 'Password' -- cgit v1.2.3 From 186ce80e7b22920ea7d54c579f635eec2d1ee98f Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Tue, 22 Jan 2013 12:14:46 +0100 Subject: Added a voicemail and fax trigger. #127 --- config/routes.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'config') diff --git a/config/routes.rb b/config/routes.rb index b25081a..22a36e5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,10 @@ 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" + end + resources :call_routes do resources :route_elements do member do -- cgit v1.2.3 From 5d15c975b7d4509d786ab7b95ec61ed7ad166b14 Mon Sep 17 00:00:00 2001 From: Julian Pawlowski Date: Tue, 22 Jan 2013 12:15:48 +0100 Subject: add GS_BUILDNAME as tooltip in the footer --- config/initializers/update_gs_version_number.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'config') diff --git a/config/initializers/update_gs_version_number.rb b/config/initializers/update_gs_version_number.rb index 4770858..d9e1aae 100644 --- a/config/initializers/update_gs_version_number.rb +++ b/config/initializers/update_gs_version_number.rb @@ -7,3 +7,10 @@ if !ENV['GS_VERSION'].nil? && GsParameter.table_exists? && GsParameter.get('GEME version.value = ENV['GS_VERSION'] version.save end + +if !ENV['GS_BUILDNAME'].nil? && GsParameter.table_exists? && GsParameter.get('GS_BUILDNAME') != ENV['GS_BUILDNAME'] + buildname = GsParameter.find_or_create_by_name('GEMEINSCHAFT_BUILDNAME') + buildname.section = 'Generic' + buildname.value = ENV['GS_BUILDNAME'] + buildname.save +end -- cgit v1.2.3