diff options
51 files changed, 142 insertions, 262 deletions
diff --git a/app/assets/stylesheets/typography/_sboiv.sass b/app/assets/stylesheets/typography/_sboiv.sass index e37f89f2d..cb7bc4d16 100644 --- a/app/assets/stylesheets/typography/_sboiv.sass +++ b/app/assets/stylesheets/typography/_sboiv.sass @@ -62,22 +62,22 @@ .sb-ZDEP:before content: '\e906' -.sb-transporteur:before +.sb-company:before content: '\e907' .sb-trace:before content: '\e908' -.sb-tableau-de-bord:before +.sb-dashboard:before content: '\e909' -.sb-synchro-ilico:before +.sb-line_referential:before content: '\e90a' -.sb-synchro-icar:before +.sb-stop_area_referential:before content: '\e90b' -.sb-reseau:before +.sb-network:before content: '\e90c' .sb-rapport-de-controle:before @@ -89,7 +89,7 @@ .sb-OAS:before content: '\e90f' -.sb-modele-calendrier:before +.sb-calendar:before content: '\e910' .sb-mission:before @@ -107,7 +107,7 @@ .sb-jeux-de-donnees:before content: '\e915' -.sb-jeux-de-controle:before +.sb-compliance_control_set:before content: '\e916' .sb-itl:before @@ -116,7 +116,7 @@ .sb-itineraire:before content: '\e918' -.sb-importer:before +.sb-import:before content: '\e919' .sb-horaires-des-courses:before diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb index de5085f3e..c90d0c296 100644 --- a/app/controllers/dashboards_controller.rb +++ b/app/controllers/dashboards_controller.rb @@ -5,6 +5,7 @@ # class DashboardsController < ChouetteController respond_to :html, only: [:show] + defaults :resource_class => Dashboard def show @dashboard = Dashboard.create self diff --git a/app/models/dashboard.rb b/app/models/dashboard.rb index a53267db5..46c621266 100644 --- a/app/models/dashboard.rb +++ b/app/models/dashboard.rb @@ -11,8 +11,11 @@ class Dashboard @@default_class = self mattr_accessor :default_class - attr_reader :context + def self.model_name + ActiveModel::Name.new Dashboard, Dashboard, "Dashboard" + end + attr_reader :context def initialize(context) @context = context end diff --git a/app/views/api_keys/edit.html.slim b/app/views/api_keys/edit.html.slim index 9d7d1fdb7..c5d3ff34d 100644 --- a/app/views/api_keys/edit.html.slim +++ b/app/views/api_keys/edit.html.slim @@ -1,16 +1,11 @@ -/ PageHeader -= pageheader 'Clé d\'API', - t('api_keys.edit.title'), - 'Lorem ipsum dolor sit amet', - t('last_update', time: l(@api_key.updated_at, format: :short)), - '' - - / Below are secondary actions & optional content (filters, ...) +- content_for :page_header_content do + - if policy(@api_key).destroy? .row.mb-sm .col-lg-12.text-right - = ( policy(@api_key).destroy? ? link_to(t('actions.destroy'), api_key_path(@api_key), :method => :delete, class: 'btn btn-default') : '' ) + = 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} -/ PageContent .page_content .container-fluid .row diff --git a/app/views/api_keys/new.html.slim b/app/views/api_keys/new.html.slim index 9acb08a94..061499f8f 100644 --- a/app/views/api_keys/new.html.slim +++ b/app/views/api_keys/new.html.slim @@ -1,10 +1,5 @@ -/ PageHeader -= pageheader 'Clé d\'API', - t('api_keys.new.title'), - 'Lorem ipsum dolor sit amet', - '' += render partial: 'layouts/navigation/page_header' -/ PageContent .page_content .container-fluid .row diff --git a/app/views/calendars/edit.html.slim b/app/views/calendars/edit.html.slim index 3463bd05c..79009725e 100644 --- a/app/views/calendars/edit.html.slim +++ b/app/views/calendars/edit.html.slim @@ -1,9 +1,5 @@ - breadcrumb :calendar, @calendar -/ PageHeader -= pageheader 'modele-calendrier', - t('.title', calendar: @calendar.name), - '', - t('last_update', time: l(@calendar.updated_at, format: :short)) += render partial: 'layouts/navigation/page_header', locals: {object: @calendar} / PageContent .page_content diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim index a95d54428..a80deb5e7 100644 --- a/app/views/calendars/index.html.slim +++ b/app/views/calendars/index.html.slim @@ -1,12 +1,10 @@ - breadcrumb :calendars -/ PageHeader -- header_params = ['modele-calendrier', - t('.title'), - ''] -- header_params << link_to(t('actions.add'), new_calendar_path, class: 'btn btn-default') if policy(Calendar).create? -= pageheader(*header_params) do +- content_for :page_header_actions do + - if policy(Calendar).create? + = link_to(t('actions.add'), new_calendar_path, class: 'btn btn-default') + += render partial: 'layouts/navigation/page_header' -/ PageContent .page_content .container-fluid - if params[:q].present? or @calendars.any? diff --git a/app/views/calendars/new.html.slim b/app/views/calendars/new.html.slim index 146173d35..6daf61136 100644 --- a/app/views/calendars/new.html.slim +++ b/app/views/calendars/new.html.slim @@ -1,11 +1,6 @@ - breadcrumb :calendars -/ PageHeader -= pageheader 'modele-calendrier', - t('.title'), - '', - '' += render partial: 'layouts/navigation/page_header' -/ PageContent .page_content .container-fluid .row diff --git a/app/views/calendars/show.html.slim b/app/views/calendars/show.html.slim index b2ace0ccc..bdc69c21c 100644 --- a/app/views/calendars/show.html.slim +++ b/app/views/calendars/show.html.slim @@ -1,12 +1,9 @@ - breadcrumb :calendar, @calendar -/ PageHeader -= pageheader 'modele-calendrier', - @calendar.name, - '', - t('last_update', time: l(@calendar.updated_at, format: :short)), - (policy(@calendar).edit? ? link_to(t('actions.edit'), edit_calendar_path(@calendar), class: 'btn btn-default') : '') do +- content_for :page_header_actions do + - if policy(@calendar).edit? + = link_to(t('actions.edit'), edit_calendar_path(@calendar), class: 'btn btn-default') - / Below is secondary actions & optional contents (filters, ...) +- content_for :page_header_content do .row.mb-sm .col-lg-12.text-right - @calendar.action_links.each do |link| @@ -16,7 +13,8 @@ class: 'btn btn-primary' do = link.content -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @calendar} + .page_content .container-fluid .row diff --git a/app/views/companies/edit.html.slim b/app/views/companies/edit.html.slim index 2f4c559b9..9c1434cfb 100644 --- a/app/views/companies/edit.html.slim +++ b/app/views/companies/edit.html.slim @@ -1,4 +1,4 @@ - breadcrumb :company, @company += render partial: 'layouts/navigation/page_header', locals: {object: @company} -= title_tag t('companies.edit.title', company: @company.name) = render 'form' diff --git a/app/views/companies/index.html.slim b/app/views/companies/index.html.slim index 8fcadc370..127014058 100644 --- a/app/views/companies/index.html.slim +++ b/app/views/companies/index.html.slim @@ -1,12 +1,10 @@ - breadcrumb :companies, @line_referential -/ PageHeader -= pageheader 'transporteur', - t('companies.index.title'), - 'Lorem ipsum dolor sit amet', - '', - (policy(Chouette::Company).create? ? link_to(t('companies.actions.new'), new_line_referential_company_path(@line_referential), class: 'btn btn-primary') : '') +- content_for :page_header_actions do + - 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' -/ PageContent .page_content .container-fluid - if params[:q].present? or @companies.any? diff --git a/app/views/companies/show.html.slim b/app/views/companies/show.html.slim index 4219595b8..2d6eed147 100644 --- a/app/views/companies/show.html.slim +++ b/app/views/companies/show.html.slim @@ -1,11 +1,6 @@ - breadcrumb :company, @company -/ PageHeader -= pageheader 'transporteur', - @company.name, - 'Lorem ipsum dolor sit amet', - t('last_update', time: l(@company.updated_at, format: :short)) do - / Below is secundary actions & optional contents (filters, ...) +- content_for :page_header_content do .row .col-lg-12.text-right.mb-sm - if policy(Chouette::Company).create? @@ -17,7 +12,8 @@ span.fa.fa-trash span = t('companies.actions.destroy') -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @company} + .page_content .container-fluid .row diff --git a/app/views/compliance_check_sets/executed.html.slim b/app/views/compliance_check_sets/executed.html.slim index bb055272d..bba8d4a2b 100644 --- a/app/views/compliance_check_sets/executed.html.slim +++ b/app/views/compliance_check_sets/executed.html.slim @@ -1,8 +1,7 @@ - breadcrumb :compliance_check_set, @workbench, @compliance_check_set -/ PageHeader -= pageheader 'jeux-de-donnees', - t('compliance_check_sets.executed.title', name: @compliance_check_set.name) -/ PageContent + += render partial: 'layouts/navigation/page_header', locals: {object: @compliance_check_set} + .page_content .container-fluid .row @@ -47,7 +46,7 @@ sortable: true, cls: 'table has-filter has-search', model: ComplianceCheck - + - @blocks_to_compliance_checks_map.each do |block, compliance_checks| - if compliance_checks.try(:any?) diff --git a/app/views/compliance_check_sets/index.html.slim b/app/views/compliance_check_sets/index.html.slim index 4ca5a2ee7..f086fd52d 100644 --- a/app/views/compliance_check_sets/index.html.slim +++ b/app/views/compliance_check_sets/index.html.slim @@ -1,13 +1,6 @@ - breadcrumb :compliance_check_sets, @workbench -/ PageHeader -- header_params = ['jeux-de-donnees', - t('compliance_check_sets.index.title'), - ''] -= pageheader(*header_params) do - / Below is secundary actions & optional contents (filters, ...) - .row.mb-sm - .col-lg-12.text-right += render partial: 'layouts/navigation/page_header' / PageContent .page_content diff --git a/app/views/compliance_control_blocks/edit.html.slim b/app/views/compliance_control_blocks/edit.html.slim index 637bb7311..c921d6dce 100644 --- a/app/views/compliance_control_blocks/edit.html.slim +++ b/app/views/compliance_control_blocks/edit.html.slim @@ -1,11 +1,7 @@ -/ PageHeader -= pageheader 'jeux-de-controle', - t('compliance_control_blocks.edit.title', compliance_control_block: @compliance_control_block.id) += render partial: 'layouts/navigation/page_header', locals: {object: @compliance_control_block} - -/ PageContent .page_content .container-fluid .row .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1 - = render 'form'
\ No newline at end of file + = render 'form' diff --git a/app/views/compliance_control_blocks/new.html.slim b/app/views/compliance_control_blocks/new.html.slim index 49404c552..c33d9884b 100644 --- a/app/views/compliance_control_blocks/new.html.slim +++ b/app/views/compliance_control_blocks/new.html.slim @@ -1,11 +1,7 @@ -/ PageHeader -= pageheader 'jeux-de-controle', - t('compliance_control_blocks.new.title') += render partial: 'layouts/navigation/page_header' - -/ PageContent .page_content .container-fluid .row .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1 - = render 'form'
\ No newline at end of file + = render 'form' diff --git a/app/views/compliance_control_sets/edit.html.slim b/app/views/compliance_control_sets/edit.html.slim index dbe537c93..94bce23ac 100644 --- a/app/views/compliance_control_sets/edit.html.slim +++ b/app/views/compliance_control_sets/edit.html.slim @@ -1,9 +1,5 @@ - breadcrumb :compliance_control_set, @compliance_control_set -/ PageHeader -= pageheader 'jeux-de-controle', - t('compliance_control_sets.edit.title', name: @compliance_control_set.name) - -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @compliance_control_set} .page_content .container-fluid .row diff --git a/app/views/compliance_control_sets/index.html.slim b/app/views/compliance_control_sets/index.html.slim index 69bff4725..c59621c93 100644 --- a/app/views/compliance_control_sets/index.html.slim +++ b/app/views/compliance_control_sets/index.html.slim @@ -1,16 +1,10 @@ - breadcrumb :compliance_control_sets -/ PageHeader -- header_params = ['jeux-de-controle', - t('compliance_control_sets.index.title'), - ''] -- header_params << link_to(t('compliance_control_sets.actions.new'), new_compliance_control_set_path, class: 'btn btn-default') if policy(Calendar).create? -= pageheader(*header_params) do +- content_for :page_header_actions do + - if policy(ComplianceControlSet).create? + = link_to(t('compliance_control_sets.actions.new'), new_compliance_control_set_path, class: 'btn btn-default') - / Below is secundary actions & optional contents (filters, ...) - .row.mb-sm - .col-lg-12.text-right += render partial: 'layouts/navigation/page_header' -/ PageContent .page_content .container-fluid .row diff --git a/app/views/compliance_control_sets/new.html.slim b/app/views/compliance_control_sets/new.html.slim index d543a6395..b01f410d8 100644 --- a/app/views/compliance_control_sets/new.html.slim +++ b/app/views/compliance_control_sets/new.html.slim @@ -1,7 +1,5 @@ - breadcrumb :compliance_control_sets -/ PageHeader -= pageheader 'jeux-de-controle', - t('compliance_control_sets.index.new') += render partial: 'layouts/navigation/page_header' / PageContent diff --git a/app/views/compliance_control_sets/show.html.slim b/app/views/compliance_control_sets/show.html.slim index a6e2c192a..f93b9410f 100644 --- a/app/views/compliance_control_sets/show.html.slim +++ b/app/views/compliance_control_sets/show.html.slim @@ -1,9 +1,5 @@ - breadcrumb :compliance_control_set, @compliance_control_set -/ PageHeader -= pageheader 'jeux-de-controle', - t('compliance_control_sets.show.title', name: @compliance_control_set.name) - - / Below is secondary actions & optional contents (filters, ...) +- content_for :page_header_content do .row.mb-sm .col-lg-12.text-right - @compliance_control_set.action_links.each do |link| @@ -16,7 +12,9 @@ class: 'btn btn-primary' do = link.content -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @compliance_control_set} + + .page_content .container-fluid .row diff --git a/app/views/compliance_controls/edit.html.slim b/app/views/compliance_controls/edit.html.slim index 192e3521f..3b466bba9 100644 --- a/app/views/compliance_controls/edit.html.slim +++ b/app/views/compliance_controls/edit.html.slim @@ -1,8 +1,5 @@ - breadcrumb :compliance_control, @compliance_control - -= pageheader 'jeux-de-controle', - t('compliance_controls.edit.title') - += render partial: 'layouts/navigation/page_header', locals: {object: @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 bd2db230b..b45a62c11 100644 --- a/app/views/compliance_controls/new.html.slim +++ b/app/views/compliance_controls/new.html.slim @@ -1,10 +1,5 @@ - breadcrumb :compliance_control_set, parent -/ PageHeader -- header_params = ['jeux-de-controle', - t('compliance_controls.new.title'), - ''] -= pageheader(*header_params) do - += render partial: 'layouts/navigation/page_header' .page_content .container-fluid @@ -14,4 +9,4 @@ = definition_list t('metadatas'), I18n.t('activerecord.attributes.compliance_control.predicate') => @compliance_control.class.predicate, - I18n.t('activerecord.attributes.compliance_control.prerequisite') => @compliance_control.class.prerequisite
\ No newline at end of file + I18n.t('activerecord.attributes.compliance_control.prerequisite') => @compliance_control.class.prerequisite diff --git a/app/views/compliance_controls/select_type.html.slim b/app/views/compliance_controls/select_type.html.slim index ec1c360cb..ea31ec83a 100644 --- a/app/views/compliance_controls/select_type.html.slim +++ b/app/views/compliance_controls/select_type.html.slim @@ -1,11 +1,6 @@ - breadcrumb :compliance_control_set, parent -/ PageHeader -- header_params = ['jeux-de-controle', - t('compliance_controls.select_type.title'), - ''] -= pageheader(*header_params) do += render partial: 'layouts/navigation/page_header' -/ PageContent .page_content .container-fluid .row diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim index f7ec118b0..e6f2544af 100644 --- a/app/views/compliance_controls/show.html.slim +++ b/app/views/compliance_controls/show.html.slim @@ -1,11 +1,9 @@ - breadcrumb :compliance_control, @compliance_control -/ PageHeader -= pageheader 'jeux-de-controle', - t('compliance_controls.show.title'), - '', - link_to(t('actions.edit'), edit_compliance_control_set_compliance_control_path(params[:compliance_control_set_id], params[:id]), class: 'btn btn-default') do +- 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') + += render partial: 'layouts/navigation/page_header', locals: {object: @compliance_control} -/ PageContent .page_content .container-fluid .row @@ -29,4 +27,4 @@ - if @compliance_control.compliance_control_block = definition_list t('compliance_controls.show.metadatas.compliance_control_block'), I18n.t('activerecord.attributes.compliance_control_blocks.transport_mode') => I18n.t("enumerize.transport_mode.#{@compliance_control.compliance_control_block.transport_mode}"), - I18n.t('activerecord.attributes.compliance_control_blocks.transport_submode') => I18n.t("enumerize.transport_submode.#{@compliance_control.compliance_control_block.transport_submode}")
\ No newline at end of file + I18n.t('activerecord.attributes.compliance_control_blocks.transport_submode') => I18n.t("enumerize.transport_submode.#{@compliance_control.compliance_control_block.transport_submode}") diff --git a/app/views/dashboards/show.html.slim b/app/views/dashboards/show.html.slim index e86af55a6..55845a5fe 100644 --- a/app/views/dashboards/show.html.slim +++ b/app/views/dashboards/show.html.slim @@ -1,16 +1,12 @@ - breadcrumb :root -/ PageHeader -= pageheader 'tableau-de-bord', - t('.title', organisation: current_organisation.name) - - / Below is secundary actions & optional contents (filters, ...) +- content_for :page_header_title, t('.title', organisation: current_organisation.name) +- content_for :page_header_content do .row.mb-sm .col-lg-12.text-right - if policy(Api::V1::ApiKey).create? = link_to t('actions.create_api_key'), new_api_key_path, class: 'btn btn-primary' - -/ PageContent += render partial: 'layouts/navigation/page_header' .page_content .container-fluid = render partial: @dashboard diff --git a/app/views/import_resources/index.html.slim b/app/views/import_resources/index.html.slim index 57c83ce82..70d554053 100644 --- a/app/views/import_resources/index.html.slim +++ b/app/views/import_resources/index.html.slim @@ -1,11 +1,5 @@ -/ PageHeader -= pageheader 'importer', - t('.title'), - '', - '', - '' += render partial: 'layouts/navigation/page_header' -/ PageContent .page_content.import_messages .container-fluid .row diff --git a/app/views/imports/index.html.slim b/app/views/imports/index.html.slim index 35cd666b1..13cd542c0 100644 --- a/app/views/imports/index.html.slim +++ b/app/views/imports/index.html.slim @@ -1,12 +1,9 @@ - breadcrumb :imports, @workbench -/ PageHeader -= pageheader 'importer', - t('.title'), - '', - '', - link_to(t('imports.actions.new'), new_workbench_import_path(workbench_id: @workbench), class: 'btn btn-primary') +- 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' -/ PageContent .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 b74d8eaf2..714acdd09 100644 --- a/app/views/imports/new.html.slim +++ b/app/views/imports/new.html.slim @@ -1,9 +1,6 @@ - breadcrumb :imports, @workbench -/ PageHeader -= pageheader 'importer', - t('.title') += render partial: 'layouts/navigation/page_header' -/ PageContent .page_content .container-fluid .row diff --git a/app/views/imports/show.html.slim b/app/views/imports/show.html.slim index 775b09e8b..e47829298 100644 --- a/app/views/imports/show.html.slim +++ b/app/views/imports/show.html.slim @@ -1,11 +1,5 @@ - breadcrumb :import, @workbench, @import -/ PageHeader -= pageheader 'importer', - @import.name, - '', - t('last_update', time: l(@import.updated_at, format: :short)) do - - / Below is secundary actions & optional contents (filters, ...) +- content_for :page_header_content do .row .col-lg-12.text-right.mb-sm - @import.action_links.each do |link| @@ -15,7 +9,8 @@ class: 'btn btn-primary' do = link.content -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @import} + .page_content .container-fluid .row diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim index 7c62b69ee..09de04ef9 100644 --- a/app/views/journey_patterns_collections/show.html.slim +++ b/app/views/journey_patterns_collections/show.html.slim @@ -1,9 +1,6 @@ - breadcrumb :journey_patterns, @referential, @route -/ pageheader -= pageheader 'mission', - "Missions de #{@route.try(:stop_points).first.try(:stop_area).name} vers #{@route.try(:stop_points).last.try(:stop_area).name}", - 'Lorem ipsum dolor sit amet', - '' += render partial: 'layouts/navigation/page_header', locals: {object: @route} + - @journey_patterns.each do |jp| - jp.errors.each do |error_message| = error_message diff --git a/app/views/layouts/navigation/_page_header.html.slim b/app/views/layouts/navigation/_page_header.html.slim index 942921e13..7e5bd2125 100644 --- a/app/views/layouts/navigation/_page_header.html.slim +++ b/app/views/layouts/navigation/_page_header.html.slim @@ -3,17 +3,19 @@ div.page_header div.row div.col-lg-9.col-md-8.col-sm-7.col-xs-7 div.page-icon - span.sb class="sb-#{resource_class.model_name.name.parameterize}" + span.sb class="sb-#{resource_class.model_name.name.underscore}" div.page-title - - if resource.persisted? - h1 = resource.name + - if content_for? :page_header_title + h1 = yield :page_header_title + - elsif defined?(object) + h1 = t("#{resource_class.model_name.name.underscore.pluralize}.#{params[:action]}.title", name: object.name) - else 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-action - - if resource.persisted? - div.small = t('last_update', time: l(resource.updated_at, format: :short)).html_safe + - if defined?(object) + div.small = t('last_update', time: l(object.updated_at, format: :short)).html_safe - if content_for? :page_header_actions = yield :page_header_actions diff --git a/app/views/line_footnotes/edit.html.slim b/app/views/line_footnotes/edit.html.slim index 4a0fbb931..59ae094c7 100644 --- a/app/views/line_footnotes/edit.html.slim +++ b/app/views/line_footnotes/edit.html.slim @@ -1,10 +1,5 @@ -/ PageHeader -= pageheader 'ligne', - "Notes sur la ligne #{@line.name}", - 'Lorem ipsum dolor sit amet', - (@line.footnotes.any? ? t('last_update', time: l(@line.footnotes.last.updated_at, format: :short)) : '') += render partial: 'layouts/navigation/page_header', locals: {object: @line} -/ PageContent .page_content .container-fluid .row diff --git a/app/views/line_footnotes/show.html.slim b/app/views/line_footnotes/show.html.slim index 0ed1d2958..6127fafc1 100644 --- a/app/views/line_footnotes/show.html.slim +++ b/app/views/line_footnotes/show.html.slim @@ -1,12 +1,11 @@ - breadcrumb :line_footnotes, @referential, @line -/ PageHeader -= pageheader 'ligne', - "Notes sur la ligne #{@line.name}", - 'Lorem ipsum dolor sit amet', - '', - (policy(@line).update_footnote? ? link_to(t('actions.edit'), edit_referential_line_footnotes_path(@referential, @line), class: 'btn btn-primary') : '') -/ PageContent +- content_for :page_header_actions do + - 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_content .container-fluid .row diff --git a/app/views/line_referentials/show.html.slim b/app/views/line_referentials/show.html.slim index b98e9d5bb..9e25a202d 100644 --- a/app/views/line_referentials/show.html.slim +++ b/app/views/line_referentials/show.html.slim @@ -1,12 +1,8 @@ - breadcrumb :line_referential, @line_referential -/ PageHeader -= pageheader 'synchro-ilico', - t('.title'), - 'Lorem ipsum dolor sit amet', - t('last_update', time: l(@line_referential.updated_at, format: :short)), - link_to(t('actions.sync'), sync_line_referential_path(@line_referential), method: :post, class: 'btn btn-default') do +- content_for :page_header_actions do + = link_to(t('actions.sync'), sync_line_referential_path(@line_referential), method: :post, class: 'btn btn-default') - / Below is secundary actions & opt. contents +- content_for :page_header_content do .row.mb-md .col-lg-12.text-right = link_to line_referential_companies_path(@line_referential), class: 'btn btn-primary' do @@ -19,7 +15,8 @@ = Referential.human_attribute_name(:lines) em.small = " (#{@line_referential.lines.size})" -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @line_referential} + .page_content .container-fluid .row diff --git a/app/views/lines/edit.html.slim b/app/views/lines/edit.html.slim index 3c2eee03f..cf8d46e82 100644 --- a/app/views/lines/edit.html.slim +++ b/app/views/lines/edit.html.slim @@ -1,5 +1,4 @@ - breadcrumb :line, @line - -= title_tag t('lines.edit.title', line: @line.name) += render partial: 'layouts/navigation/page_header', locals: {object: @line} = render 'form' diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim index 911c95e0c..c12d67726 100644 --- a/app/views/lines/index.html.slim +++ b/app/views/lines/index.html.slim @@ -1,12 +1,10 @@ - breadcrumb :lines, @line_referential -/ PageHeader -= pageheader 'ligne', - t('lines.index.title'), - 'Lorem ipsum dolor sit amet', - '', - ((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') : '') +- content_for :page_header_actions do + - 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' -/ PageContent .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 f09a4b4aa..50ccab280 100644 --- a/app/views/lines/new.html.slim +++ b/app/views/lines/new.html.slim @@ -1,5 +1,4 @@ - breadcrumb :lines, @line_referential - -= title_tag t('lines.new.title') += 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 ccf237154..ae415121f 100644 --- a/app/views/lines/show.html.slim +++ b/app/views/lines/show.html.slim @@ -1,11 +1,5 @@ - breadcrumb :line, @line -/ PageHeader -= pageheader 'ligne', - @line.name, - 'Lorem ipsum dolor sit amet', - t('last_update', time: l(@line.updated_at, format: :short)) do - - / Below is secundary actions & optional contents +- content_for :page_header_content do .row .col-lg-12.text-right.mb-sm - @line.action_links.each do |link| @@ -15,7 +9,8 @@ class: 'btn btn-primary' do = link.content -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @line} + .page_content .container-fluid .row diff --git a/app/views/networks/edit.html.slim b/app/views/networks/edit.html.slim index 2d511e15d..ad9f61347 100644 --- a/app/views/networks/edit.html.slim +++ b/app/views/networks/edit.html.slim @@ -1,4 +1,4 @@ - breadcrumb :network, @network -= title_tag t('networks.edit.title', network: @network.name) += render partial: 'layouts/navigation/page_header', locals: {object: @network} = render 'form' diff --git a/app/views/networks/index.html.slim b/app/views/networks/index.html.slim index 6004f5859..ce3a10710 100644 --- a/app/views/networks/index.html.slim +++ b/app/views/networks/index.html.slim @@ -1,12 +1,10 @@ - breadcrumb :networks, @line_referential -/ PageHeader -= pageheader 'reseau', - t('networks.index.title'), - 'Lorem ipsum dolor sit amet', - '', - (policy(Chouette::Network).create? ? link_to(t('networks.actions.new'), new_line_referential_network_path(@line_referential), class: 'btn btn-primary') : '') +- content_for :page_header_actions do + - if policy(Chouette::Network).create? + = link_to(t('networks.actions.new'), new_line_referential_network_path(@line_referential), class: 'btn btn-primary') + += render partial: 'layouts/navigation/page_header' -/ PageContent .page_content .container-fluid - if params[:q].present? or @networks.any? diff --git a/app/views/networks/new.html.slim b/app/views/networks/new.html.slim index cf04ab03f..0461a3d8c 100644 --- a/app/views/networks/new.html.slim +++ b/app/views/networks/new.html.slim @@ -1,4 +1,3 @@ - breadcrumb :networks, @line_referential -= title_tag t('networks.new.title') - += render partial: 'layouts/navigation/page_header' = render 'form' diff --git a/app/views/networks/show.html.slim b/app/views/networks/show.html.slim index 89aa1e50a..54f5e537e 100644 --- a/app/views/networks/show.html.slim +++ b/app/views/networks/show.html.slim @@ -1,11 +1,5 @@ - breadcrumb :network, @network -/ PageHeader -= pageheader 'reseau', - @network.name, - '', - t('last_update', time: l(@network.updated_at, format: :short)) do - - / Below is secundary actions & optional contents (filters, ...) +- content_for :page_header_content do .row .col-lg-12.text-right.mb-sm - @network.action_links.each do |link| @@ -15,7 +9,8 @@ class: 'btn btn-primary' do = link.content -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @network} + .page_content .container-fluid .row diff --git a/app/views/stop_area_referentials/show.html.slim b/app/views/stop_area_referentials/show.html.slim index 896ce756e..40fe718a5 100644 --- a/app/views/stop_area_referentials/show.html.slim +++ b/app/views/stop_area_referentials/show.html.slim @@ -1,18 +1,16 @@ - breadcrumb :stop_area_referential, @stop_area_referential -/ PageHeader -= pageheader 'synchro-icar', - t('.title'), - 'Lorem ipsum dolor sit amet', - t('last_update', time: l(@stop_area_referential.updated_at, format: :short)), - link_to(t('actions.sync'), sync_stop_area_referential_path(@stop_area_referential), method: :post, class: 'btn btn-default') do +- content_for :page_header_actions do + = link_to(t('actions.sync'), sync_stop_area_referential_path(@stop_area_referential), method: :post, class: 'btn btn-default') +- content_for :page_header_content do .row.mb-md .col-lg-12.text-right = 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})" -/ PageContent += render partial: 'layouts/navigation/page_header', locals: {object: @stop_area_referential} + .page_content .container-fluid .row diff --git a/config/locales/calendars.en.yml b/config/locales/calendars.en.yml index 3b015ff08..0076e5207 100644 --- a/config/locales/calendars.en.yml +++ b/config/locales/calendars.en.yml @@ -42,9 +42,9 @@ en: new: title: Add a new calendar edit: - title: Update calendar %{calendar} + title: Update calendar %{name} show: - title: Calendar %{calendar} + title: Calendar %{name} simple_form: labels: calendar: diff --git a/config/locales/calendars.fr.yml b/config/locales/calendars.fr.yml index 55ec9c620..fddb47d64 100644 --- a/config/locales/calendars.fr.yml +++ b/config/locales/calendars.fr.yml @@ -42,9 +42,9 @@ fr: new: title: Ajouter un calendrier edit: - title: Editer le calendrier %{calendar} + title: Editer le calendrier %{name} show: - title: Calendrier %{calendar} + title: Calendrier %{name} simple_form: labels: calendar: diff --git a/config/locales/companies.en.yml b/config/locales/companies.en.yml index 301f4d68d..a3cd520cb 100644 --- a/config/locales/companies.en.yml +++ b/config/locales/companies.en.yml @@ -9,9 +9,9 @@ en: new: title: "Add a new company" edit: - title: "Update company %{company}" + title: "Update company %{name}" show: - title: "Company %{company}" + title: "Company %{name}" index: title: "Companies" name: "Search by name..." diff --git a/config/locales/companies.fr.yml b/config/locales/companies.fr.yml index 58fcc2ed7..0cf729c35 100644 --- a/config/locales/companies.fr.yml +++ b/config/locales/companies.fr.yml @@ -9,9 +9,9 @@ fr: new: title: "Ajouter un transporteur" edit: - title: "Editer le transporteur %{company}" + title: "Editer le transporteur %{name}" show: - title: "Transporteur %{company}" + title: "Transporteur %{name}" index: title: "Transporteurs" name: "Recherche par nom..." diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index 15e08290d..cbca6baab 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -18,9 +18,9 @@ en: new: title: "Add a new line" edit: - title: "Update line %{line}" + title: "Update line %{name}" show: - title: "Line %{line}" + title: "Line %{name}" routes: title: "Routes list" group_of_lines: "Groups of lines" diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index c459eb51b..fa23f8369 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -18,9 +18,9 @@ fr: new: title: "Ajouter une ligne" edit: - title: "Editer la ligne %{line}" + title: "Editer la ligne %{name}" show: - title: "Ligne %{line}" + title: "Ligne %{name}" routes: title: "Liste des Itinéraires" itineraries: "Liste des séquences d'arrêts de la ligne" diff --git a/config/locales/networks.en.yml b/config/locales/networks.en.yml index 86be535e4..94a8d9df0 100644 --- a/config/locales/networks.en.yml +++ b/config/locales/networks.en.yml @@ -9,7 +9,7 @@ en: new: title: "Add a new network" edit: - title: "Update network %{network}" + title: "Update network %{name}" show: title: "Network" index: diff --git a/config/locales/networks.fr.yml b/config/locales/networks.fr.yml index 30d061968..48c32e7c1 100644 --- a/config/locales/networks.fr.yml +++ b/config/locales/networks.fr.yml @@ -9,9 +9,9 @@ fr: new: title: "Ajouter un réseau" edit: - title: "Editer le réseau %{network}" + title: "Editer le réseau %{name}" show: - title: "Réseau %{network}" + title: "Réseau %{name}" index: title: "Réseaux" name: "Recherche par nom..." |