Refactoring move render pageheader into layout

36 files changed, 22 insertions, 68 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index eec7dda4f..da293905f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -14,12 +14,12 @@ module ApplicationHelper
   end
 
   def page_header_meta(object)
-    info = t('last_update', time: l(object.updated_at, format: :short)).html_safe
+    info = t('last_update', time: l(object.updated_at, format: :short))
     if object.try(:versions) && object.versions.last
       author = object.versions.last.try(:whodunnit)
       info   = "#{info} #{t('whodunnit', author: author)}" if author
     end
-    content_tag :div, info, class: 'small'
+    content_tag :div, info.html_safe, class: 'small'
   end
 
   def page_header_content_for(object)
diff --git a/app/views/api_keys/edit.html.slim b/app/views/api_keys/edit.html.slim
index c5d3ff34d..50808b5a4 100644
--- a/app/views/api_keys/edit.html.slim
+++ b/app/views/api_keys/edit.html.slim
@@ -1,11 +1,10 @@
+- page_header_content_for @api_key
 - content_for :page_header_content do
   - if policy(@api_key).destroy?
   .row.mb-sm
     .col-lg-12.text-right
       = link_to(t('actions.destroy'), api_key_path(@api_key), :method => :delete, class: 'btn btn-default')
 
-= render partial: 'layouts/navigation/page_header', locals: {object: @api_key}
-
 .page_content
   .container-fluid
     .row
diff --git a/app/views/api_keys/new.html.slim b/app/views/api_keys/new.html.slim
index 061499f8f..2bed9f912 100644
--- a/app/views/api_keys/new.html.slim
+++ b/app/views/api_keys/new.html.slim
@@ -1,5 +1,3 @@
-= render partial: 'layouts/navigation/page_header'
-
 .page_content
   .container-fluid
     .row
diff --git a/app/views/companies/edit.html.slim b/app/views/companies/edit.html.slim
index 9c1434cfb..d2bb26e77 100644
--- a/app/views/companies/edit.html.slim
+++ b/app/views/companies/edit.html.slim
@@ -1,4 +1,3 @@
 - breadcrumb :company, @company
-= render partial: 'layouts/navigation/page_header', locals: {object: @company}
-
+- page_header_content_for @company
 = render 'form'
diff --git a/app/views/companies/index.html.slim b/app/views/companies/index.html.slim
index 127014058..5d746642f 100644
--- a/app/views/companies/index.html.slim
+++ b/app/views/companies/index.html.slim
@@ -3,8 +3,6 @@
   - if policy(Chouette::Company).create?
     = link_to(t('companies.actions.new'), new_line_referential_company_path(@line_referential), class: 'btn btn-primary')
 
-= render partial: 'layouts/navigation/page_header'
-
 .page_content
   .container-fluid
     - if params[:q].present? or @companies.any?
diff --git a/app/views/companies/new.html.slim b/app/views/companies/new.html.slim
index 68c0f76c3..bcc583279 100644
--- a/app/views/companies/new.html.slim
+++ b/app/views/companies/new.html.slim
@@ -1,2 +1 @@
-= title_tag t('companies.new.title')
 = render 'form'
diff --git a/app/views/companies/show.html.slim b/app/views/companies/show.html.slim
index 2d6eed147..f8b939ba0 100644
--- a/app/views/companies/show.html.slim
+++ b/app/views/companies/show.html.slim
@@ -11,8 +11,8 @@
         = link_to line_referential_company_path(@line_referential, @company), method: :delete, data: {confirm:  t('companies.actions.destroy_confirm')}, class: 'btn btn-primary' do
           span.fa.fa-trash
           span = t('companies.actions.destroy')
+- page_header_content_for @company
 
-= render partial: 'layouts/navigation/page_header', locals: {object: @company}
 
 .page_content
   .container-fluid
diff --git a/app/views/compliance_control_blocks/edit.html.slim b/app/views/compliance_control_blocks/edit.html.slim
index c921d6dce..49aee7705 100644
--- a/app/views/compliance_control_blocks/edit.html.slim
+++ b/app/views/compliance_control_blocks/edit.html.slim
@@ -1,4 +1,4 @@
-= render partial: 'layouts/navigation/page_header', locals: {object: @compliance_control_block}
+- page_header_content_for @compliance_control_block
 
 .page_content
   .container-fluid
diff --git a/app/views/compliance_control_blocks/new.html.slim b/app/views/compliance_control_blocks/new.html.slim
index c33d9884b..7d2551311 100644
--- a/app/views/compliance_control_blocks/new.html.slim
+++ b/app/views/compliance_control_blocks/new.html.slim
@@ -1,5 +1,3 @@
-= render partial: 'layouts/navigation/page_header'
-
 .page_content
   .container-fluid
     .row
diff --git a/app/views/compliance_controls/edit.html.slim b/app/views/compliance_controls/edit.html.slim
index 3b466bba9..00456410c 100644
--- a/app/views/compliance_controls/edit.html.slim
+++ b/app/views/compliance_controls/edit.html.slim
@@ -1,5 +1,5 @@
 - breadcrumb :compliance_control, @compliance_control
-= render partial: 'layouts/navigation/page_header', locals: {object: @compliance_control}
+- page_header_content_for @compliance_control
 
 .page_content
   .container-fluid
diff --git a/app/views/compliance_controls/new.html.slim b/app/views/compliance_controls/new.html.slim
index b45a62c11..f7f47fba3 100644
--- a/app/views/compliance_controls/new.html.slim
+++ b/app/views/compliance_controls/new.html.slim
@@ -1,6 +1,4 @@
 - breadcrumb :compliance_control_set, parent
-= render partial: 'layouts/navigation/page_header'
-
 .page_content
   .container-fluid
     .row
diff --git a/app/views/compliance_controls/select_type.html.slim b/app/views/compliance_controls/select_type.html.slim
index ea31ec83a..d1c518ecf 100644
--- a/app/views/compliance_controls/select_type.html.slim
+++ b/app/views/compliance_controls/select_type.html.slim
@@ -1,6 +1,4 @@
 - breadcrumb :compliance_control_set, parent
-= render partial: 'layouts/navigation/page_header'
-
 .page_content
   .container-fluid
     .row
diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim
index e6f2544af..54b07abf1 100644
--- a/app/views/compliance_controls/show.html.slim
+++ b/app/views/compliance_controls/show.html.slim
@@ -1,8 +1,8 @@
 - breadcrumb :compliance_control, @compliance_control
 - content_for :page_header_actions do
   = link_to(t('actions.edit'), edit_compliance_control_set_compliance_control_path(params[:compliance_control_set_id], params[:id]), class: 'btn btn-default')
+- page_header_content_for @compliance_control
 
-= render partial: 'layouts/navigation/page_header', locals: {object: @compliance_control}
 
 .page_content
   .container-fluid
diff --git a/app/views/import_resources/index.html.slim b/app/views/import_resources/index.html.slim
index 70d554053..565dd04e4 100644
--- a/app/views/import_resources/index.html.slim
+++ b/app/views/import_resources/index.html.slim
@@ -1,4 +1,3 @@
-= render partial: 'layouts/navigation/page_header'
 
 .page_content.import_messages
   .container-fluid
diff --git a/app/views/imports/index.html.slim b/app/views/imports/index.html.slim
index 13cd542c0..79452bbfc 100644
--- a/app/views/imports/index.html.slim
+++ b/app/views/imports/index.html.slim
@@ -2,8 +2,6 @@
 - content_for :page_header_actions do
   = link_to(t('imports.actions.new'), new_workbench_import_path(workbench_id: @workbench), class: 'btn btn-primary')
 
-= render partial: 'layouts/navigation/page_header'
-
 .page_content
   .container-fluid
     - if params[:q].present? or @imports.any?
diff --git a/app/views/imports/new.html.slim b/app/views/imports/new.html.slim
index 714acdd09..3e35028f7 100644
--- a/app/views/imports/new.html.slim
+++ b/app/views/imports/new.html.slim
@@ -1,5 +1,4 @@
 - breadcrumb :imports, @workbench
-= render partial: 'layouts/navigation/page_header'
 
 .page_content
   .container-fluid
diff --git a/app/views/imports/show.html.slim b/app/views/imports/show.html.slim
index e47829298..5e22e03e0 100644
--- a/app/views/imports/show.html.slim
+++ b/app/views/imports/show.html.slim
@@ -9,7 +9,7 @@
             class: 'btn btn-primary' do
               = link.content
 
-= render partial: 'layouts/navigation/page_header', locals: {object: @import}
+- page_header_content_for @import
 
 .page_content
   .container-fluid
diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim
index 09de04ef9..d53403ff3 100644
--- a/app/views/journey_patterns_collections/show.html.slim
+++ b/app/views/journey_patterns_collections/show.html.slim
@@ -1,5 +1,5 @@
 - breadcrumb :journey_patterns, @referential, @route
-= render partial: 'layouts/navigation/page_header', locals: {object: @route}
+- page_header_content_for @route
 
 - @journey_patterns.each do |jp|
   - jp.errors.each do |error_message|
diff --git a/app/views/line_footnotes/edit.html.slim b/app/views/line_footnotes/edit.html.slim
index 59ae094c7..203bdab94 100644
--- a/app/views/line_footnotes/edit.html.slim
+++ b/app/views/line_footnotes/edit.html.slim
@@ -1,4 +1,4 @@
-= render partial: 'layouts/navigation/page_header', locals: {object: @line}
+- page_header_content_for @line
 
 .page_content
   .container-fluid
diff --git a/app/views/line_footnotes/show.html.slim b/app/views/line_footnotes/show.html.slim
index 6127fafc1..e4f2a1d42 100644
--- a/app/views/line_footnotes/show.html.slim
+++ b/app/views/line_footnotes/show.html.slim
@@ -4,7 +4,7 @@
   - if policy(@line).update_footnote?
     = link_to(t('actions.edit'), edit_referential_line_footnotes_path(@referential, @line), class: 'btn btn-primary')
 
-= render partial: 'layouts/navigation/page_header', locals: {object: @line}
+- page_header_content_for @line
 
 .page_content
   .container-fluid
diff --git a/app/views/lines/edit.html.slim b/app/views/lines/edit.html.slim
index cf8d46e82..8b1612205 100644
--- a/app/views/lines/edit.html.slim
+++ b/app/views/lines/edit.html.slim
@@ -1,4 +1,4 @@
 - breadcrumb :line, @line
-= render partial: 'layouts/navigation/page_header', locals: {object: @line}
+- page_header_content_for @line
 
 = render 'form'
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index c12d67726..8b035b477 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -3,8 +3,6 @@
   - if (policy(Chouette::Line).create? && @line_referential.organisations.include?(current_organisation))
     = link_to(t('lines.actions.new'), new_line_referential_line_path(@line_referential), class: 'btn btn-primary')
 
-= render partial: 'layouts/navigation/page_header'
-
 .page_content
   .container-fluid
     - if params[:q].present? or @lines.any?
diff --git a/app/views/lines/new.html.slim b/app/views/lines/new.html.slim
index 50ccab280..3a322db54 100644
--- a/app/views/lines/new.html.slim
+++ b/app/views/lines/new.html.slim
@@ -1,4 +1,2 @@
 - breadcrumb :lines, @line_referential
-= render partial: 'layouts/navigation/page_header'
-
 = render 'form'
diff --git a/app/views/lines/show.html.slim b/app/views/lines/show.html.slim
index ae415121f..7c48bd063 100644
--- a/app/views/lines/show.html.slim
+++ b/app/views/lines/show.html.slim
@@ -9,7 +9,7 @@
             class: 'btn btn-primary' do
               = link.content
 
-= render partial: 'layouts/navigation/page_header', locals: {object: @line}
+- page_header_content_for @line
 
 .page_content
   .container-fluid
diff --git a/app/views/referential_companies/edit.html.slim b/app/views/referential_companies/edit.html.slim
index ab233df50..b3fcf6cd8 100644
--- a/app/views/referential_companies/edit.html.slim
+++ b/app/views/referential_companies/edit.html.slim
@@ -1,3 +1,3 @@
 - breadcrumb :referential_company, @referential, @company
-= render partial: 'layouts/navigation/page_header', locals: {object: @company}
+- page_header_content_for @company
 = render 'form'
diff --git a/app/views/referential_companies/index.html.slim b/app/views/referential_companies/index.html.slim
index 123c20f5e..de0f7de69 100644
--- a/app/views/referential_companies/index.html.slim
+++ b/app/views/referential_companies/index.html.slim
@@ -3,8 +3,6 @@
   - if policy(Chouette::Company).create?
     = link_to(t('companies.actions.new'), new_referential_company_path(@referential), class: 'btn btn-default')
 
-= render partial: 'layouts/navigation/page_header'
-
 .page_content
   .container-fluid
     - if params[:q].present? or @companies.any?
diff --git a/app/views/referential_companies/new.html.slim b/app/views/referential_companies/new.html.slim
index ce7b784dd..5e59db139 100644
--- a/app/views/referential_companies/new.html.slim
+++ b/app/views/referential_companies/new.html.slim
@@ -1,3 +1,2 @@
 - breadcrumb :referential_companies, @referential
-= render partial: 'layouts/navigation/page_header'
 = render 'form'
diff --git a/app/views/referential_companies/show.html.slim b/app/views/referential_companies/show.html.slim
index bfc11260e..1599145be 100644
--- a/app/views/referential_companies/show.html.slim
+++ b/app/views/referential_companies/show.html.slim
@@ -11,7 +11,7 @@
           span.fa.fa-trash
           span = t('companies.actions.destroy')
 
-= render partial: 'layouts/navigation/page_header', locals: {object: @company}
+- page_header_content_for @company
 
 .page_content
   .container-fluid
diff --git a/app/views/referential_lines/edit.html.slim b/app/views/referential_lines/edit.html.slim
index 6d33ef4db..45f26a05c 100644
--- a/app/views/referential_lines/edit.html.slim
+++ b/app/views/referential_lines/edit.html.slim
@@ -1,3 +1,3 @@
-- breadcrumb :referential_line, @line, @referential
-= render partial: 'layouts/navigation/page_header'
+- breadcrumb :referential_line, @referential, @line
+- page_header_content_for @line
 = render 'form'
diff --git a/app/views/referential_lines/new.html.slim b/app/views/referential_lines/new.html.slim
index 3f6958ac4..bcc583279 100644
--- a/app/views/referential_lines/new.html.slim
+++ b/app/views/referential_lines/new.html.slim
@@ -1,2 +1 @@
-= render partial: 'layouts/navigation/page_header'
 = render 'form'
diff --git a/app/views/referential_lines/show.html.slim b/app/views/referential_lines/show.html.slim
index dc0db41c0..cb4791855 100644
--- a/app/views/referential_lines/show.html.slim
+++ b/app/views/referential_lines/show.html.slim
@@ -8,8 +8,7 @@
           data: link.data,
           class: 'btn btn-primary' do
             = link.content
-
-= render partial: 'layouts/navigation/page_header', locals: {object: @line}
+- page_header_content_for @line
 
 .page_content
   .container-fluid
diff --git a/app/views/stop_area_referentials/show.html.slim b/app/views/stop_area_referentials/show.html.slim
index 40fe718a5..d43333fd9 100644
--- a/app/views/stop_area_referentials/show.html.slim
+++ b/app/views/stop_area_referentials/show.html.slim
@@ -8,8 +8,7 @@
       = link_to stop_area_referential_stop_areas_path(@stop_area_referential), class: 'btn btn-primary' do
         = Referential.human_attribute_name(:stop_areas)
         em.small = " (#{@stop_area_referential.stop_areas.size})"
-
-= render partial: 'layouts/navigation/page_header', locals: {object: @stop_area_referential}
+- page_header_content_for @stop_area_referential
 
 .page_content
   .container-fluid
diff --git a/app/views/time_table_combinations/new.html.slim b/app/views/time_table_combinations/new.html.slim
index e49a10bc6..f18553081 100644
--- a/app/views/time_table_combinations/new.html.slim
+++ b/app/views/time_table_combinations/new.html.slim
@@ -1,10 +1,4 @@
-/ PageHeader
-= pageheader 'map-marker',
-             t('time_tables.show.combine_form'),
-             '',
-             ''
 
-/ PageContent
 .page_content
   .container-fluid
     .row
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
index 2046ecca6..ef9b5a780 100644
--- a/app/views/vehicle_journeys/index.html.slim
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -1,11 +1,4 @@
 - breadcrumb :vehicle_journeys, @referential, @route
-/ PageHeader
-= pageheader 'horaires-des-courses',
-             t('vehicle_journeys.index.title', route: @route.name ),
-             'Lorem ipsum dolor sit amet',
-             '' do
-
-/ PageContent
 .page_content
   .container-fluid
     .row
diff --git a/app/views/vehicle_journeys/show.html.slim b/app/views/vehicle_journeys/show.html.slim
index 8ff4b188d..c67632864 100644
--- a/app/views/vehicle_journeys/show.html.slim
+++ b/app/views/vehicle_journeys/show.html.slim
@@ -1,2 +1,3 @@
+- page_header_content_for @vehicle_journey
 == render 'show_details', vehicle_journey: @vehicle_journey
-== render 'show_sidebar'
\ No newline at end of file
+== render 'show_sidebar'
diff --git a/spec/views/companies/edit.html.erb_spec.rb b/spec/views/companies/edit.html.erb_spec.rb
index 4566ed64c..379f4dfa0 100644
--- a/spec/views/companies/edit.html.erb_spec.rb
+++ b/spec/views/companies/edit.html.erb_spec.rb
@@ -6,13 +6,6 @@ describe "/companies/edit", :type => :view do
   let!(:companies) { Array.new(2) { create(:company) } }
   let!(:line_referential) { assign :line_referential, company.line_referential }
 
-  describe "test" do
-    it "should render h2 with the company name" do
-      render
-      expect(rendered).to have_selector("h2", :text => Regexp.new(company.name))
-    end
-  end
-
   describe "form" do
     it "should render input for name" do
       render