Merge pull request #484 from af83/6545-add_generic_navbar

Add generic navbar and fix codifligne, reflex navigation. Fixes #6545

8 files changed, 22 insertions, 9 deletions

diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index e57cbc4f2..e60ff187f 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -169,7 +169,6 @@ end
 
 crumb :companies do |line_referential|
   link I18n.t('companies.index.title'), line_referential_companies_path(line_referential)
-  parent :line_referential, line_referential
 end
 
 crumb :company do |company|
@@ -179,7 +178,6 @@ end
 
 crumb :networks do |line_referential|
   link I18n.t('networks.index.title'), line_referential_networks_path(line_referential)
-  parent :line_referential, line_referential
 end
 
 crumb :network do |network|
@@ -189,7 +187,6 @@ end
 
 crumb :group_of_lines do |line_referential|
   link I18n.t('group_of_lines.index.title'), line_referential_group_of_lines_path(line_referential)
-  parent :line_referential, line_referential
 end
 
 crumb :group_of_line do |group_of_line|
@@ -199,7 +196,6 @@ end
 
 crumb :lines do |line_referential|
   link I18n.t('lines.index.title'), line_referential_lines_path
-  parent :line_referential, line_referential
 end
 
 crumb :line do |line|
diff --git a/config/locales/layouts.en.yml b/config/locales/layouts.en.yml
index 954525ac4..76a4d65d1 100644
--- a/config/locales/layouts.en.yml
+++ b/config/locales/layouts.en.yml
@@ -15,7 +15,9 @@ en:
       return_to_dashboard: "Return to Dashboard"
       dashboard: Dashboard
       referential_datas: "Datas"
-      current_offer: 
+      line_referential: "Line referential"
+      stop_area_referential: "Stop area referential"
+      current_offer:
         one: Current offer
         other: Current offers
       workbench_output:
@@ -68,4 +70,4 @@ en:
   attributes:
     author: "Edited by"
     created_at: "Created at"
-    updated_at: "Updated at"
\ No newline at end of file
+    updated_at: "Updated at"
diff --git a/config/locales/layouts.fr.yml b/config/locales/layouts.fr.yml
index f125a002d..019c72701 100644
--- a/config/locales/layouts.fr.yml
+++ b/config/locales/layouts.fr.yml
@@ -15,12 +15,14 @@ fr:
       return_to_dashboard: "Retour au Tableau de Bord"
       dashboard: Tableau de bord
       referential_datas: "Données"
-      current_offer: 
+      line_referential: "Référentiel de lignes"
+      stop_area_referential: "Référentiel d'arrêts"
+      current_offer:
         one: Offres courante
         other: Offres courantes
       workbench_outputs:
-        organisation: Offres de mon organisation
-        idf: Offres IDF
+        organisation: Offre de mon organisation
+        workgroup: Offre du groupe de travail
       tools: Outils
       sync: Synchronisation
       sync_icar: Synchronisation iCAR
diff --git a/config/locales/line_referential_syncs.en.yml b/config/locales/line_referential_syncs.en.yml
index 5cbab1173..8d17fcefc 100644
--- a/config/locales/line_referential_syncs.en.yml
+++ b/config/locales/line_referential_syncs.en.yml
@@ -1,4 +1,6 @@
 en:
+  line_referential_syncs:
+    search_no_results: "No line referential synchronisation matching your query"  
   activerecord:
     errors:
       models:
diff --git a/config/locales/line_referential_syncs.fr.yml b/config/locales/line_referential_syncs.fr.yml
index 33827fac9..7f1b1ba75 100644
--- a/config/locales/line_referential_syncs.fr.yml
+++ b/config/locales/line_referential_syncs.fr.yml
@@ -1,4 +1,6 @@
 fr:
+  line_referential_syncs:
+    search_no_results: "Aucun synchronisation de référentiel de lignes ne correspond à votre recherche"
   activerecord:
     errors:
       models:
diff --git a/config/locales/stop_area_referential_syncs.en.yml b/config/locales/stop_area_referential_syncs.en.yml
index 2bfe0bc0a..1605f73f2 100644
--- a/config/locales/stop_area_referential_syncs.en.yml
+++ b/config/locales/stop_area_referential_syncs.en.yml
@@ -1,4 +1,6 @@
 en:
+  stop_area_referential_syncs:
+    search_no_results: "No stop area referential synchronisation matching your query"
   activerecord:
     errors:
       models:
diff --git a/config/locales/stop_area_referential_syncs.fr.yml b/config/locales/stop_area_referential_syncs.fr.yml
index cbed11883..b4ed7202b 100644
--- a/config/locales/stop_area_referential_syncs.fr.yml
+++ b/config/locales/stop_area_referential_syncs.fr.yml
@@ -1,4 +1,6 @@
 fr:
+  stop_area_referential_syncs:
+    search_no_results: "Aucun synchronisation de référentiel d'arrêts ne correspond à votre recherche"
   activerecord:
     errors:
       models:
diff --git a/config/locales/zzz-stif.yml b/config/locales/zzz-stif.yml
new file mode 100644
index 000000000..a9e6a0ef4
--- /dev/null
+++ b/config/locales/zzz-stif.yml
@@ -0,0 +1,5 @@
+fr:
+  layouts:
+    navbar:
+      workbench_outputs:
+        workgroup: Offre IDF