Merge branch 'V2_5' : HUB ITLs adding

11 files changed, 117 insertions, 87 deletions

diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index e2ad34eee..a128195d2 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -95,7 +95,7 @@ SimpleForm.setup do |config|
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
 
   # You can define the class to use on all labels. Default is nil.
-  config.label_class = 'col-lg-2 control-label'
+  config.label_class = 'col-lg-3 control-label'
 
   # You can define the class to use on all forms. Default is simple_form.
   config.form_class = "simple_form form-horizontal"
@@ -132,7 +132,7 @@ SimpleForm.setup do |config|
   # config.default_input_size = 50
 
   # When false, do not use translations for labels.
-  # config.translate_labels = true
+  config.translate_labels = true
 
   # Automatically discover new inputs in Rails' autoload path.
   # config.inputs_discovery = false
diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index c3dd5e348..552a2ff66 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -4,7 +4,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'col-lg-10' do |ba|
+    b.wrapper :tag => 'div', :class => 'col-lg-9' 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' }
@@ -26,7 +26,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'col-lg-10' do |input|
+    b.wrapper :tag => 'div', :class => 'col-lg-9' do |input|
       input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
         prepend.use :input
       end
@@ -39,7 +39,7 @@ SimpleForm.setup do |config|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'col-lg-10' do |input|
+    b.wrapper :tag => 'div', :class => 'col-lg-9' do |input|
       input.wrapper :tag => 'div', :class => 'input-append' do |append|
         append.use :input
       end
@@ -54,5 +54,5 @@ SimpleForm.setup do |config|
   # buttons and other elements.
   config.default_wrapper = :bootstrap
   config.button_class = 'btn'
-  config.label_class = 'col-lg-2 control-label' 
+  config.label_class = 'col-lg-3 control-label' 
 end
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
index 017e167bd..d5c545342 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -6,11 +6,13 @@ en:
       new:
         title: Sign in
         commit: Sign in
-        welcome: "Welcome on Chouette"
-        introduction1: "Chouette is an Open Source software that can read and edit whole public transport service for passengers."
-        introduction2: "The software is delivered in Saas way and gives you :"
-        introduction_item1: "map view of lines, routes, journeys, stops, connections..."
-        introduction_item2: "data exchange functions in different formats like NEPTUNE, GTFS"
+        welcome: "Welcome to Chouette"
+        introduction1: "Chouette is an open source Software for editing, viewing and exchanging
+public transport reference data, and is the reference implementation for
+validating conformance of data wrt Neptune (French standard NFP 99 506)."
+        introduction2: "The application is deployed in Saas mode and supports :"
+        introduction_item1: "several data exchange formats (Neptune, GTFS, CSV ... Netex coming soon)"
+        introduction_item2: "and also several base map backgrounds (Google, OSM, IGN)."
     confirmations:
       new:
         title: Resend confirmation instructions
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index c5885effc..929aa682a 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -5,16 +5,20 @@ fr:
     attributes:
       user:
         password: Mot de passe
+        password_confirmation:  Confirmation du mot de passe
   devise:
     sessions:
       new:
         title: Se connecter
         commit: Se connecter
         welcome: "Bienvenue sur Chouette"
-        introduction1: "Chouette est un logiciel Open Source d'édition et d'échange d'offre de transport public planifiée."
-        introduction2: "Le logiciel est mis à disposition en mode Saas et se veut ouvert :"
-        introduction_item1: "visualisation cartographique des lignes, des arrêts, des parcours..."
-        introduction_item2: "échange de données selon différents formats (Neptune, GTFS)"
+        introduction1: "Chouette est un logiciel Open Source de saisie, de visualisation et
+d'échange d'offre de transport public planifiée, conçu pour être
+l'implémentation de référence pour valider la conformité de données à la
+norme Neptune (NFP 99 506)"
+        introduction2: "Déployé en mode Saas, ce logiciel est ouvert et peut gérer"
+        introduction_item1: "plusieurs formats (Neptune, GTFS, CSV, prochainement Netex)"
+        introduction_item2: "plusieurs fonds cartographiques, notamment IGN, OSM et Google."
     confirmations:
       new:
         title: Renvoyer le mail de confirmation
diff --git a/config/locales/enumerize.en.yml b/config/locales/enumerize.en.yml
new file mode 100644
index 000000000..574c316cd
--- /dev/null
+++ b/config/locales/enumerize.en.yml
@@ -0,0 +1,17 @@
+en:
+  simple_form:  
+    include_blanks:
+      defaults:
+        for_boarding: "Undefined"
+        for_alighting: "Undefined"
+  enumerize:
+    for_boarding:
+      normal: "Regularly scheduled pickup"
+      forbidden: "No pickup available"
+      request_stop: "Pickup if requested"
+      is_flexible: "Booking requested for pickup"        
+    for_alighting:
+      normal: "Regularly scheduled drop off"
+      forbidden: "No drop off available"
+      request_stop: "Drop off if requested"
+      is_flexible: "Booking requested for drop off"
\ No newline at end of file
diff --git a/config/locales/enumerize.fr.yml b/config/locales/enumerize.fr.yml
new file mode 100644
index 000000000..0dad16319
--- /dev/null
+++ b/config/locales/enumerize.fr.yml
@@ -0,0 +1,17 @@
+fr:
+  simple_form:  
+    include_blanks:     
+      defaults:
+        for_boarding: "Non défini"
+        for_alighting: "Non défini"
+  enumerize:
+    for_boarding:
+      normal: "Montée autorisée"
+      forbidden: "Montée interdite"
+      request_stop: "Montée sur demande au conducteur"
+      is_flexible: "Montée sur réservation"                
+    for_alighting:
+      normal: "Descente autorisée"
+      forbidden: "Descente interdite"
+      request_stop: "Descente sur demande au conducteur"
+      is_flexible: "Descente sur réservation"
\ No newline at end of file
diff --git a/config/locales/routes.yml b/config/locales/routes.yml
index b68f1802a..1807ef30d 100644
--- a/config/locales/routes.yml
+++ b/config/locales/routes.yml
@@ -3,6 +3,7 @@ en:
     actions:
       new: "Add a new route"
       edit: "Edit this route"
+      edit_boarding_alighting: "Stop alighting and boarding"
       destroy: "Remove this route"
       destroy_confirm: "Are you sure you want destroy this route?"
       export_kml: "Export KML route"
@@ -25,6 +26,11 @@ en:
       title: "Routes"
       selection: "Selection"
       selection_all: "All"
+    edit_boarding_alighting:
+      title: "Stop alighting and boarding properties"
+      stop_area_name: "Stop area name"
+      for_boarding: "Boarding"
+      for_alighting: "Alighting"
     route:
       no_journey_pattern: "No Journey pattern"
       wayback: 
@@ -58,6 +64,7 @@ en:
         object_version: "Version"
         creation_time: "Created on"
         creator_id: "Created by"
+        no_journey_pattern: "No journey pattern"        
   formtastic:
     titles:
       route:
@@ -68,6 +75,7 @@ fr:
     actions:
       new: "Ajouter une séquence d'arrêts"
       edit: "Modifier cette séquence d'arrêts"
+      edit_boarding_alighting: "Contraintes de montée - descente"
       destroy: "Supprimer cette séquence d'arrêts"
       destroy_confirm: "Etes vous sûr de supprimer cette séquence d'arrêts ?"
       export_kml: "Export KML de la séquence d'arrêts"
@@ -90,6 +98,11 @@ fr:
       title: "Séquences d'arrêts"
       selection: "Sélection"
       selection_all: "Tous"
+    edit_boarding_alighting:
+      title: "Contraintes de montée - descente aux arrêts"
+      stop_area_name: "Nom de l'arrêt"
+      for_boarding: "Montée"
+      for_alighting: "Descente"
     route:
       no_journey_pattern: "Pas de mission"
       wayback: 
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index 1974c5cb1..bb08b8ace 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -3,7 +3,9 @@ en:
     default_geometry_success: "%{count} modified stop areas"
     stop_area:
       no_position: "No Position" 
-      lines: "Lines :"
+      no_object: "Nothing"
+      lines: "Lines"
+      address: "Address"
       general: "General"
       localisation: "Localisation"
       accessibility: "Accessibility"      
@@ -118,8 +120,10 @@ fr:
   stop_areas:
     default_geometry_success: "%{count} arrêts modifiés"
     stop_area:
-      no_position: "Pas de position" 
-      lines: "Lignes :"
+      no_position: "Pas de position"
+      no_object: "Aucun(e)"
+      lines: "Lignes"
+      address: "Adresse"
       general: "General"
       localisation: "Localisation"
       accessibility: "Accessibilité"
diff --git a/config/locales/stop_points.yml b/config/locales/stop_points.yml
index 540fdc650..819ed4c0f 100644
--- a/config/locales/stop_points.yml
+++ b/config/locales/stop_points.yml
@@ -20,7 +20,10 @@ en:
       move: "Move"
       no_stop_point: "No stop point on route"
     stop_point:
-      lines: "lines"
+      no_position: "No position"
+      no_object: "Nothing"
+      lines: "Lines"
+      address: "Address"
   activerecord:        
     models:        
       stop_point: 
@@ -30,6 +33,11 @@ en:
     attributes:
       stop_point:
         lines: "lines"
+  simple_form:
+    labels:
+      stop_point:
+        for_boarding: "Pickup"
+        for_alighting: "Drop off"        
 fr:
   stop_points:
     reorder_success: "La list des arrêts a été mise à jour"
@@ -52,7 +60,10 @@ fr:
       move: "Déplacer"
       no_stop_point: "Aucun arrêt dans la séquence"
     stop_point:
-      lines: "lignes"
+      no_position: "Pas de position"
+      no_object: "Aucun(e)"
+      lines: "Lignes"
+      address: "Adresse"
   activerecord:        
     models:        
       stop_point: 
@@ -61,4 +72,9 @@ fr:
         other: "arrêts sur séquence d'arrêts"
     attributes:
       stop_point:
-        lines: "lignes"
+        lines: "Lignes"
+  simple_form:
+    labels:
+      stop_point:
+        for_boarding: "Montée"
+        for_alighting: "Descente"    
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index 85b990716..8f83cb530 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -38,7 +38,7 @@ en:
       resume_empty: "Empty timetable"
       legend: "Legend : "
       excluded_date: "Excluded date"
-      overlap_date: "Overlap date" 
+      overlap_date: "Overlap date"
       selected_date: "Date directly included"
       selected_period: "Date included in period"
     index:
@@ -49,10 +49,10 @@ en:
       to: " to : "
       selection: "Selection"
       selection_all: "All"
-      advanced_search: "Advanced Search"      
-  activerecord:        
-    models:        
-      time_table: 
+      advanced_search: "Advanced Search"
+  activerecord:
+    models:
+      time_table:
         zero:  "Timetable"
         one:   "Timetable"
         other: "Timetables"
@@ -80,7 +80,7 @@ en:
         periods: "Application periods"
         period_start: "From"
         period_end: "to"
-        tag_search: "Tags"         
+        tag_search: "Tags"
   formtastic:
     titles:
       time_table:
@@ -129,9 +129,9 @@ fr:
       resume_empty: "Calendrier vide"
       legend: "Légende : "
       excluded_date: "Date exclue"
-      overlap_date: "Date en doublon" 
-      selected_date: "Date inclue directement"
-      selected_period: "Date inclue par période"
+      overlap_date: "Date en doublon"
+      selected_date: "Date incluse directement"
+      selected_period: "Date incluse par période"
     index:
       comment: "Recherche par nom"
       tag_search: "Tags : vacances,jour fériés"
@@ -142,10 +142,10 @@ fr:
       title: "calendriers"
       selection: "Sélection"
       selection_all: "Tous"
-      advanced_search: "Recherche avancée"      
-  activerecord:        
-    models:        
-      time_table: 
+      advanced_search: "Recherche avancée"
+  activerecord:
+    models:
+      time_table:
         zero:  "Calendrier"
         one:   "Calendrier"
         other: "Calendriers"
@@ -172,10 +172,10 @@ fr:
         date: "Le"
         excluded_dates: "Dates exclues"
         periods: "Périodes d'application"
-        period_start: "Du" 
+        period_start: "Du"
         period_end: "au"
-        tag_search: "Etiquettes" 
-        tag_list: "Etiquettes" 
+        tag_search: "Etiquettes"
+        tag_list: "Etiquettes"
   formtastic:
     titles:
       time_table:
@@ -183,6 +183,6 @@ fr:
     placeholders:
       time_table:
         tag_search: "ex: Jours fériés,Vacances scolaires"
-          
+
 
 
diff --git a/config/routes.rb b/config/routes.rb
index 057a9bb90..f8af87e5a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,7 +9,7 @@ ChouetteIhm::Application.routes.draw do
     authenticated :user do
       root :to => 'referentials#index'
     end
-    
+
     unauthenticated do
       root :to => 'devise/sessions#new'
     end
@@ -61,29 +61,13 @@ ChouetteIhm::Application.routes.draw do
   resources :referentials do
     resources :api_keys
     resources :rule_parameter_sets
-    resources :stop_point_areas
+    resources :autocomplete_stop_areas
     match 'lines' => 'lines#destroy_all', :via => :delete
     resources :group_of_lines do
-      resources :stop_areas do
-        resources :access_points
-        resources :stop_area_copies
-        resources :stop_area_parents
-        resources :stop_area_children
-        resources :stop_area_routing_lines
-        resources :stop_area_routing_stops
-        member do
-          get 'add_children'
-          get 'select_parent'
-          get 'add_routing_lines'
-          get 'add_routing_stops'
-        end
-      end
-      resources :lines
       collection do
         get :name_filter
       end
     end
-
     resources :lines do
       collection do
         get :name_filter
@@ -91,21 +75,11 @@ ChouetteIhm::Application.routes.draw do
     end
 
     resources :lines, :networks, :group_of_lines do
-      resources :stop_areas do
-        resources :access_points
-        resources :stop_area_copies
-        resources :stop_area_parents
-        resources :stop_area_children
-        resources :stop_area_routing_lines
-        resources :stop_area_routing_stops
+      resources :routes do
         member do
-          get 'add_children'
-          get 'select_parent'
-          get 'add_routing_lines'
-          get 'add_routing_stops'
+          get 'edit_boarding_alighting'
+          put 'save_boarding_alighting'
         end
-      end
-      resources :routes do
         resources :journey_patterns do
           member do
             get 'new_vehicle_journey'
@@ -167,10 +141,7 @@ ChouetteIhm::Application.routes.draw do
     resources :stop_areas do
       resources :access_points
       resources :stop_area_copies
-      resources :stop_area_parents
-      resources :stop_area_children
       resources :stop_area_routing_lines
-      resources :stop_area_routing_stops
       member do
         get 'add_children'
         get 'select_parent'
@@ -184,25 +155,11 @@ ChouetteIhm::Application.routes.draw do
     end
 
     resources :connection_links do
-      resources :connection_link_areas
+      resources :stop_areas
       member do
         get 'select_areas'
       end
-      resources :stop_areas do
-        resources :access_points
-        resources :stop_area_parents
-        resources :stop_area_children
-        resources :stop_area_routing_lines
-        resources :stop_area_routing_stops
-        member do
-          get 'add_children'
-          get 'select_parent'
-          get 'add_routing_lines'
-          get 'add_routing_stops'
-        end
-      end
     end
-
     resources :clean_ups
 
   end