Merge branch 'master' into staging

22 files changed, 39 insertions, 33 deletions

diff --git a/app/assets/stylesheets/components/_page_header.sass b/app/assets/stylesheets/components/_page_header.sass
index 566f46d6b..30b88f2c1 100644
--- a/app/assets/stylesheets/components/_page_header.sass
+++ b/app/assets/stylesheets/components/_page_header.sass
@@ -59,7 +59,6 @@
 
   .page-action
     line-height: 42px
-    height: 45px
     margin-bottom: 10px
     text-align: right
 
diff --git a/app/assets/stylesheets/typography/_sboiv.sass b/app/assets/stylesheets/typography/_sboiv.sass
index 1345fbac6..6c82a5739 100644
--- a/app/assets/stylesheets/typography/_sboiv.sass
+++ b/app/assets/stylesheets/typography/_sboiv.sass
@@ -92,7 +92,7 @@
 .sb-calendar:before
   content: '\e910'
 
-.sb-mission:before
+.sb-journey_pattern:before
   content: '\e911'
 
 .sb-ligne_commerciale:before
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2ce1de497..d2cdaaa20 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -18,7 +18,7 @@ module ApplicationHelper
     info = t('last_update', time: l(object.updated_at, format: :short))
     if object.try(:versions)
       author = object.versions.try(:last).try(:whodunnit) || t('default_whodunnit')
-      info   = "#{info} #{t('whodunnit', author: author)}"
+      info   = "#{info} <br/> #{t('whodunnit', author: author)}"
     end
     content_tag :div, info.html_safe, class: 'small'
   end
diff --git a/app/helpers/import_resources_helper.rb b/app/helpers/import_resources_helper.rb
index 1d870f68e..3ee96eb9b 100644
--- a/app/helpers/import_resources_helper.rb
+++ b/app/helpers/import_resources_helper.rb
@@ -12,8 +12,4 @@ module ImportResourcesHelper
       content_tag :span, '', class: "fa fa-circle text-#{cls}"
   end
 
-  def import_resoruce_metrics(metrics)
-    metrics.delete_if {|k,v| !k.include?("count")}.deep_symbolize_keys
-  end
-
 end
diff --git a/app/services/http_service.rb b/app/services/http_service.rb
index d3999f293..db4441395 100644
--- a/app/services/http_service.rb
+++ b/app/services/http_service.rb
@@ -26,7 +26,8 @@ module HTTPService extend self
   # params: { netex_import: {referential_id: 13, workbench_id: 1}},
   # upload: {file: [StringIO.new('howdy'), 'application/zip', 'greeting']})
   def post_resource(host:, path:, token: nil, params: {}, upload: nil)
-    result = Faraday.new(url: host) do |c|
+    token = token || params
+    Faraday.new(url: host) do |c|
       c.headers['Authorization'] = "Token token=#{token.inspect}" if token
       c.request :multipart
       c.request :url_encoded
diff --git a/app/views/import_resources/index.html.slim b/app/views/import_resources/index.html.slim
index 565dd04e4..1c4a5a765 100644
--- a/app/views/import_resources/index.html.slim
+++ b/app/views/import_resources/index.html.slim
@@ -31,7 +31,7 @@
                 ), \
                 TableBuilderHelper::Column.new( \
                   name: 'Résultat des tests' , \
-                  attribute: Proc.new { |n| I18n.t('import_resources.index.metrics', import_resoruce_metrics(n.metrics) }, \
+                  attribute: Proc.new { |n| I18n.t('import_resources.index.metrics', n.metrics.deep_symbolize_keys) }, \
                   sortable: false, \
                 ), \
                 TableBuilderHelper::Column.new( \
diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim
index d53403ff3..834501da3 100644
--- a/app/views/journey_patterns_collections/show.html.slim
+++ b/app/views/journey_patterns_collections/show.html.slim
@@ -1,5 +1,6 @@
 - breadcrumb :journey_patterns, @referential, @route
 - page_header_content_for @route
+- content_for :page_header_title, t('journey_patterns.index.title', route: @route.name), flush: true
 
 - @journey_patterns.each do |jp|
   - jp.errors.each do |error_message|
diff --git a/app/views/layouts/navigation/_page_header.html.slim b/app/views/layouts/navigation/_page_header.html.slim
index 2548ddd81..90fd7d855 100644
--- a/app/views/layouts/navigation/_page_header.html.slim
+++ b/app/views/layouts/navigation/_page_header.html.slim
@@ -8,17 +8,16 @@ div.page_header
         div.page-title
           - if content_for? :page_header_title
             h1 = yield :page_header_title
-          - elsif defined?(resource_class)
-            h1 = t("#{resource_class.model_name.name.underscore.pluralize}.#{params[:action]}.title")
+          - else
+            - if defined?(resource_class)
+              h1 = t("#{resource_class.model_name.name.underscore.pluralize}.#{params[:action]}.title")
 
       div.col-lg-3.col-md-4.col-sm-5.col-xs-5.text-right
-        div.page-meta
-        - if content_for? :page_header_meta
-          div.small = yield :page_header_meta
-
         div.page-action
-        - if content_for? :page_header_actions
-          div.small = yield :page_header_actions
+          - if content_for? :page_header_meta
+            = yield :page_header_meta
+          - if content_for? :page_header_actions
+            = yield :page_header_actions
 
     - if content_for? :page_header_content
       = yield :page_header_content
diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index cb4791855..cfba8cab3 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -1,13 +1,13 @@
 - breadcrumb :referential_line, @referential, @line
 - content_for :page_header_content do
-.row
-  .col-lg-12.text-right.mb-sm
-    - @line.action_links.each do |link|
-      = link_to link.href,
-          method: link.method,
-          data: link.data,
-          class: 'btn btn-primary' do
-            = link.content
+  .row
+    .col-lg-12.text-right.mb-sm
+      - @line.action_links.each do |link|
+        = link_to link.href,
+            method: link.method,
+            data: link.data,
+            class: 'btn btn-primary' do
+              = link.content
 - page_header_content_for @line
 
 .page_content
diff --git a/app/views/time_tables/show.html.slim b/app/views/time_tables/show.html.slim
index 8326a4d05..036581268 100644
--- a/app/views/time_tables/show.html.slim
+++ b/app/views/time_tables/show.html.slim
@@ -2,6 +2,8 @@
 - breadcrumb :time_table, @referential, @time_table
 - page_header_content_for @time_table
 
+- content_for :page_header_title, t('time_tables.show.title', name: @time_table.comment), flush: true
+
 - content_for :page_header_actions do
   - if policy(@time_table).edit?
     = link_to(t('actions.edit'), edit_referential_time_table_path(@referential, @time_table), class: 'btn btn-default')
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
index ef9b5a780..52c1a9728 100644
--- a/app/views/vehicle_journeys/index.html.slim
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -1,4 +1,6 @@
 - breadcrumb :vehicle_journeys, @referential, @route
+- content_for :page_header_title, t('vehicle_journeys.index.title', route: @route.name)
+
 .page_content
   .container-fluid
     .row
diff --git a/config/breadcrumbs.rb b/config/breadcrumbs.rb
index 4ef16059f..14c3d5470 100644
--- a/config/breadcrumbs.rb
+++ b/config/breadcrumbs.rb
@@ -192,7 +192,7 @@ crumb :route do |referential, route|
 end
 
 crumb :journey_patterns do |referential, route|
-  link I18n.t('journey_patterns.index.title'), referential_line_route_journey_patterns_collection_path(referential, route.line, route)
+  link I18n.t('journey_patterns.index.title', route: route.name), referential_line_route_journey_patterns_collection_path(referential, route.line, route)
   parent :route, referential, route
 end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4834ceef4..e59960f95 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -47,7 +47,7 @@ en:
   errors:
     format: "%{message}"
 
-  last_update: 'Last update on<br>%{time}'
+  last_update: 'Last update on %{time}'
   whodunnit: 'By %{author}'
   default_whodunnit: 'web service'
   last_sync: 'Last sync on %{time}'
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 24482166c..175b71ebc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -47,7 +47,7 @@ fr:
   errors:
     format: "%{message}"
 
-  last_update: 'Dernière mise à jour<br>le %{time}'
+  last_update: 'Dernière mise à jour le %{time}'
   whodunnit: 'Par %{author}'
   default_whodunnit: 'web service'
   last_sync: 'Dernière mise à jour le %{time}'
diff --git a/config/locales/imports.en.yml b/config/locales/imports.en.yml
index 97574007c..926201150 100644
--- a/config/locales/imports.en.yml
+++ b/config/locales/imports.en.yml
@@ -17,6 +17,7 @@ en:
     new:
       title: "Imports"
     show:
+      title: "Import %{name}"
       report: "Report"
       imported_file: "Original file"
       compliance_check: "Validation report"
diff --git a/config/locales/imports.fr.yml b/config/locales/imports.fr.yml
index 59107cccb..207f5cc31 100644
--- a/config/locales/imports.fr.yml
+++ b/config/locales/imports.fr.yml
@@ -17,6 +17,7 @@ fr:
     new:
       title: "Imports"
     show:
+      title: "Import %{name}"
       report: "Rapport"
       imported_file: "Fichier source"
       compliance_check: "Test de conformité"
diff --git a/config/locales/journey_patterns.en.yml b/config/locales/journey_patterns.en.yml
index effac5569..e5248c29c 100644
--- a/config/locales/journey_patterns.en.yml
+++ b/config/locales/journey_patterns.en.yml
@@ -19,7 +19,7 @@ en:
       title: "Journey Pattern %{journey_pattern}"
       stop_points: "Stop point on journey pattern list"
     index:
-      title: "Journey Patterns"
+      title: "Journey Patterns of %{route}"
     form:
       warning: "Be careful, selection is also applied to the %{count} vehicle journeys associated to this journey pattern"
   activerecord:
diff --git a/config/locales/journey_patterns.fr.yml b/config/locales/journey_patterns.fr.yml
index 23c43e2a7..e989d5820 100644
--- a/config/locales/journey_patterns.fr.yml
+++ b/config/locales/journey_patterns.fr.yml
@@ -19,7 +19,7 @@ fr:
       title: "Mission %{journey_pattern}"
       stop_points: "Liste des arrêts de la mission"
     index:
-      title: "Missions"
+      title: "Missions de %{route}"
     form:
       warning: "Attention, la sélection s'applique aussi aux %{count} courses de la mission"
   activerecord:
diff --git a/config/locales/time_tables.en.yml b/config/locales/time_tables.en.yml
index e68836f99..ff36a6d7d 100644
--- a/config/locales/time_tables.en.yml
+++ b/config/locales/time_tables.en.yml
@@ -36,7 +36,7 @@ en:
       error_modal:
         title: "Error"
         withoutPeriodsWithDaysTypes: "A timetable can't have day type(s) without period(s)."
-        withPeriodsWithoutDayTypes: "A tiemetable can't have period(s) swithout day type(s)." 
+        withPeriodsWithoutDayTypes: "A tiemetable can't have period(s) swithout day type(s)."
       error_submit:
         periods_overlaps: "Periods cannot overlap in a timetable"
         dates_overlaps: "A period cannot overlap a date in a timetable"
@@ -63,7 +63,7 @@ en:
         begin: Period start
         end: Period end
     show:
-      title: "Timetable %{time_table}"
+      title: "Timetable %{name}"
       dates: "Application dates"
       periods: "Application periods"
       from: "from"
diff --git a/config/locales/time_tables.fr.yml b/config/locales/time_tables.fr.yml
index b85f7ca33..631ecca95 100644
--- a/config/locales/time_tables.fr.yml
+++ b/config/locales/time_tables.fr.yml
@@ -63,7 +63,7 @@ fr:
         begin: Début de période
         end: Fin de période
     show:
-      title: Calendrier %{time_table}
+      title: Calendrier %{name}
       dates: "Dates d'application"
       periods: "Périodes d'application"
       from: "du"
diff --git a/config/locales/workbenches.en.yml b/config/locales/workbenches.en.yml
index 3a2fcd598..7f21f47a0 100644
--- a/config/locales/workbenches.en.yml
+++ b/config/locales/workbenches.en.yml
@@ -1,5 +1,7 @@
 en:
   workbenches:
+    show:
+      title: "%{name}"
     index:
       title: "%{organisation} dashboard"
       offers:
diff --git a/config/locales/workbenches.fr.yml b/config/locales/workbenches.fr.yml
index 0f8a516e3..d76255e86 100644
--- a/config/locales/workbenches.fr.yml
+++ b/config/locales/workbenches.fr.yml
@@ -1,5 +1,7 @@
 fr:
   workbenches:
+    show:
+      title: "%{name}"
     referential_count:
       zero: "Aucun jeu de données dans cet espace de travail"
       one: "1 jeu de données dans cet espace de travail"