manage generic access_links and hide/show datas on several views

4 files changed, 19 insertions, 11 deletions

diff --git a/config/environments/production.rb b/config/environments/production.rb
index a418c74cd..79c6ca4a3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -69,7 +69,7 @@ ChouetteIhm::Application.configure do
   
   config.to_prepare do
     Devise::Mailer.layout "mailer"
-    Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-gui-2.0.0.2/chouette"
+    Chouette::Command.command = "/usr/local/opt/chouette-command/chouette-gui-2.0.1/chouette"
     Import.root = "/var/lib/chouette/imports"
     Export.root = "/var/lib/chouette/exports"
     FileValidation.root = "/var/lib/chouette/validations"
diff --git a/config/locales/access_points.yml b/config/locales/access_points.yml
index c213a8619..67be0f75a 100644
--- a/config/locales/access_points.yml
+++ b/config/locales/access_points.yml
@@ -15,9 +15,10 @@ en:
       title: Access point %{access_point}
       geographic_data: Geographic data 
       no_geographic_data: None
-      access_links: Access links
-      access_link_legend_1 : "grays arrows for undefined links, green for defined ones"
-      access_link_legend_2 : "clic on arrows to create/edit a link"
+      generic_access_links: Glogal access links
+      detail_access_links: Specific access links
+      access_link_legend_1: "grays arrows for undefined links, green for defined ones"
+      access_link_legend_2: "clic on arrows to create/edit a link"
     index:
       title: Access points
       name_or_country_code: Name
@@ -72,9 +73,10 @@ fr:
       title: Accès %{access_point}
       geographic_data: Données géographiques 
       no_geographic_data: Aucune
-      access_links: "Liens Arrêts - Accès"
-      access_link_legend_1 : "Les flêches grises représentent des liens non définis"
-      access_link_legend_2 : "cliquer sur les flêches pour créer/éditer un lien"
+      generic_access_links: "Liens Arrêts - Accès globaux"
+      detail_access_links: "Liens Arrêts - Accès détaillés"
+      access_link_legend_1: "Les flêches grises représentent des liens non définis"
+      access_link_legend_2: "cliquer sur les flêches pour créer/éditer un lien"
     index:
       name_or_country_code: Nom
       title: Accès de %{stop_area}
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index 10db2a6b7..390251e59 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -38,8 +38,10 @@ en:
       area_type: Area Type
     access_links: 
       title: "Access links for %{stop_area}'s access"
-      access_link_legend_1 : "grays arrows for undefined links, green for defined ones"
-      access_link_legend_2 : "clic on arrows to create/edit a link"
+      generic_access_links: Glogal links
+      detail_access_links: Specific links
+      access_link_legend_1: "grays arrows for undefined links, green for defined ones"
+      access_link_legend_2: "clic on arrows to create/edit a link"
     select_parent:
       title: Manage parent of stop area %{stop_area} 
     add_children:
@@ -119,8 +121,10 @@ fr:
       access_points: "Points d'accès"
     access_links: 
       title: "Liens Accès-Arrêts des accès de %{stop_area}"
-      access_link_legend_1 : "Les flêches grises représentent des liens non définis"
-      access_link_legend_2 : "cliquer sur les flêches pour créer/éditer un lien"
+      generic_access_links: "Liens globaux"
+      detail_access_links: "Liens détaillés"
+      access_link_legend_1: "Les flêches grises représentent des liens non définis"
+      access_link_legend_2: "cliquer sur les flêches pour créer/éditer un lien"
     index:
       name_or_country_code: Nom ou Code INSEE
       title: Arrêts
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index 469875c1d..4659f0f3e 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -55,6 +55,7 @@ en:
         object_version: Version
         creation_time: Created on
         creator_id: Created by 
+        calendars: "Calendar view"
         dates: Application dates
         date: On
         periods: Application periods
@@ -125,6 +126,7 @@ fr:
         object_version: Version
         creation_time: Créé le
         creator_id: Créé par
+        calendars: "Présentation calendaire"
         dates: "Dates d'application"
         date: Date
         periods: "Périodes d'application"