Refs #2263 : Calendars final touches

6 files changed, 7 insertions, 2 deletions

diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb
index 6ff4845f9..c973c754c 100644
--- a/app/helpers/breadcrumb_helper.rb
+++ b/app/helpers/breadcrumb_helper.rb
@@ -73,6 +73,7 @@ module BreadcrumbHelper
   end
 
   def calendar_breadcrumb(action)
+    add_breadcrumb I18n.t('breadcrumbs.referentials'), referentials_path
     add_breadcrumb I18n.t('calendars.index.title'), calendars_path
     add_breadcrumb @calendar.name if %i(show edit).include? action
   end
diff --git a/app/views/calendars/_calendars.html.slim b/app/views/calendars/_calendars.html.slim
index 261052baf..e91e9c530 100644
--- a/app/views/calendars/_calendars.html.slim
+++ b/app/views/calendars/_calendars.html.slim
@@ -1,6 +1,6 @@
 - if @calendars.any?
   = table_builder @calendars,
-    { @calendars.human_attribute_name(:short_name) => 'short_name', @calendars.human_attribute_name(:shared) => 'shared' },
+    { @calendars.human_attribute_name(:name) => 'name', @calendars.human_attribute_name(:short_name) => 'short_name', @calendars.human_attribute_name(:shared) => 'shared' },
     [:show, :edit, :delete],
     'table table-bordered'
 
diff --git a/app/views/referentials/index.html.slim b/app/views/referentials/index.html.slim
index b8c16b5ae..8186f725f 100644
--- a/app/views/referentials/index.html.slim
+++ b/app/views/referentials/index.html.slim
@@ -13,6 +13,7 @@
   ul.actions
     li = link_to 'Données Reflex', stop_area_referential_path(1)
     li = link_to 'Données CodifLigne', line_referential_path(1)
+    li= link_to t('calendars.standard_calendars'), calendars_path
     / FIXME #823
     - if false
       li = link_to t('referentials.actions.new'), new_referential_path, class: 'add'
diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb
index b439821d2..8f0eb6c10 100644
--- a/config/initializers/apartment.rb
+++ b/config/initializers/apartment.rb
@@ -38,7 +38,8 @@ Apartment.configure do |config|
     "ReferentialCloning",
     "Workbench",
     "CleanUp",
-    "CleanUpResult"
+    "CleanUpResult",
+    "Calendar"
   ]
 
   # use postgres schemas?
diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml
index 90ab12e76..97109a812 100644
--- a/config/locales/calendars.en.yml
+++ b/config/locales/calendars.en.yml
@@ -1,5 +1,6 @@
 en:
   calendars:
+    standard_calendars: Standard calendars
     actions:
       new: Add a new calendar
       edit: Edit this calendar
diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml
index ba45ad074..6abfb0f4a 100644
--- a/config/locales/calendars.fr.yml
+++ b/config/locales/calendars.fr.yml
@@ -1,5 +1,6 @@
 fr:
   calendars:
+    standard_calendars: Calendriers standards
     actions:
       new: Ajouter un calendrier
       edit: Modifier cet calendrier