aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2018-04-18 22:45:10 +0200
committerGitHub2018-04-18 22:45:10 +0200
commit91aedb06bb2310867b34ac3adcdd8427e56f736b (patch)
tree77dd843a52f69870e0c1e9487e6b0206b00aa62e
parent35ef1a2abe0a664b259c99538bb95f04ef6408d4 (diff)
parente5b11ab69698502c1642652e3c1249c2abd573b2 (diff)
downloadchouette-core-91aedb06bb2310867b34ac3adcdd8427e56f736b.tar.bz2
Merge pull request #484 from af83/6545-add_generic_navbar
Add generic navbar and fix codifligne, reflex navigation. Fixes #6545
-rw-r--r--app/helpers/line_referential_syncs_helper.rb31
-rw-r--r--app/helpers/stop_area_referential_syncs_helper.rb31
-rw-r--r--app/views/layouts/navigation/_main_nav_left_content.html.slim87
-rw-r--r--app/views/layouts/navigation/_main_nav_left_content_stif.html.slim232
-rw-r--r--app/views/line_referentials/show.html.slim57
-rw-r--r--app/views/stop_area_referentials/show.html.slim54
-rw-r--r--config/breadcrumbs.rb4
-rw-r--r--config/locales/layouts.en.yml6
-rw-r--r--config/locales/layouts.fr.yml8
-rw-r--r--config/locales/line_referential_syncs.en.yml2
-rw-r--r--config/locales/line_referential_syncs.fr.yml2
-rw-r--r--config/locales/stop_area_referential_syncs.en.yml2
-rw-r--r--config/locales/stop_area_referential_syncs.fr.yml2
-rw-r--r--config/locales/zzz-stif.yml5
14 files changed, 338 insertions, 185 deletions
diff --git a/app/helpers/line_referential_syncs_helper.rb b/app/helpers/line_referential_syncs_helper.rb
new file mode 100644
index 000000000..37f08b154
--- /dev/null
+++ b/app/helpers/line_referential_syncs_helper.rb
@@ -0,0 +1,31 @@
+module LineReferentialSyncsHelper
+
+ def last_line_ref_sync_message(line_ref_sync)
+ line_ref_sync.line_referential_sync_messages.last
+ end
+
+ def line_referential_sync_created_at(line_ref_sync)
+ l(last_line_ref_sync_message(line_ref_sync).created_at, format: :short_with_time)
+ end
+
+ def line_referential_sync_status(line_ref_sync)
+ status = line_ref_sync.status
+
+ if %w[new pending].include? status
+ content_tag :span, '', class: "fa fa-clock-o"
+ else
+ cls =''
+ cls = 'success' if status == 'successful'
+ cls = 'danger' if status == 'failed'
+
+ content_tag :span, '', class: "fa fa-circle text-#{cls}"
+ end
+ end
+
+ def line_referential_sync_message(line_ref_sync)
+ last_line_ref_sync_message = last_line_ref_sync_message(line_ref_sync)
+ data = last_line_ref_sync_message.message_attributes.symbolize_keys!
+ data[:processing_time] = distance_of_time_in_words(data[:processing_time].to_i)
+ t("line_referential_sync.message.#{last_line_ref_sync_message.message_key}", last_line_ref_sync_message.message_attributes.symbolize_keys!).html_safe
+ end
+end
diff --git a/app/helpers/stop_area_referential_syncs_helper.rb b/app/helpers/stop_area_referential_syncs_helper.rb
new file mode 100644
index 000000000..3e2837fda
--- /dev/null
+++ b/app/helpers/stop_area_referential_syncs_helper.rb
@@ -0,0 +1,31 @@
+module StopAreaReferentialSyncsHelper
+
+ def last_stop_area_ref_sync_message(stop_area_ref_sync)
+ stop_area_ref_sync.stop_area_referential_sync_messages.last
+ end
+
+ def stop_area_referential_sync_created_at(stop_area_ref_sync)
+ l(last_stop_area_ref_sync_message(stop_area_ref_sync).created_at, format: :short_with_time)
+ end
+
+ def stop_area_referential_sync_status(stop_area_ref_sync)
+ status = stop_area_ref_sync.status
+
+ if %w[new pending].include? status
+ content_tag :span, '', class: "fa fa-clock-o"
+ else
+ cls =''
+ cls = 'success' if status == 'successful'
+ cls = 'danger' if status == 'failed'
+
+ content_tag :span, '', class: "fa fa-circle text-#{cls}"
+ end
+ end
+
+ def stop_area_referential_sync_message(stop_area_ref_sync)
+ last_stop_area_ref_sync_message = last_stop_area_ref_sync_message(stop_area_ref_sync)
+ data = last_stop_area_ref_sync_message.message_attributes.symbolize_keys!
+ data[:processing_time] = distance_of_time_in_words(data[:processing_time].to_i)
+ t("stop_area_referential_sync.message.#{last_stop_area_ref_sync_message.message_key}", last_stop_area_ref_sync_message.message_attributes.symbolize_keys!).html_safe
+ end
+end
diff --git a/app/views/layouts/navigation/_main_nav_left_content.html.slim b/app/views/layouts/navigation/_main_nav_left_content.html.slim
index e69de29bb..f04d05700 100644
--- a/app/views/layouts/navigation/_main_nav_left_content.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left_content.html.slim
@@ -0,0 +1,87 @@
+- if current_organisation
+ - current_organisation.workbenches.each do |workbench|
+ #menu-items.panel-group
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miOne', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = t('layouts.navbar.current_offer.other')
+
+ #miOne.panel-collapse.collapse
+ .list-group
+ = link_to root_path, class: "list-group-item" do
+ span = t('layouts.navbar.dashboard')
+ = link_to workbench_output_path(workbench), class: 'list-group-item' do
+ span = t('layouts.navbar.workbench_outputs.organisation')
+ = link_to '#', class: 'list-group-item disabled' do
+ span = t('layouts.navbar.workbench_outputs.workgroup')
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miTwo', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ - t('activerecord.models.workbench.one').capitalize
+
+ #miTwo.panel-collapse.collapse
+ .list-group
+ = link_to workbench_path(workbench), class: "list-group-item" do
+ span = t('activerecord.models.referential.other').capitalize
+ = link_to workbench_imports_path(workbench), class: "list-group-item" do
+ span = t('activerecord.models.import.other').capitalize
+ = link_to workbench_exports_path(workbench), class: "list-group-item" do
+ span = t('activerecord.models.export.other').capitalize
+ = link_to workgroup_calendars_path(workbench.workgroup), class: 'list-group-item' do
+ span = t('activerecord.models.calendar.other').capitalize
+ = link_to workbench_compliance_check_sets_path(workbench), class: 'list-group-item' do
+ span = t('activerecord.models.compliance_check_set.other').capitalize
+ = link_to compliance_control_sets_path, class: 'list-group-item' do
+ span = t('activerecord.models.compliance_control_set.other').capitalize
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miThree', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = t('layouts.navbar.referential_datas')
+
+ #miThree.panel-collapse.collapse
+ - if @referential.try(:id) && respond_to?(:current_referential)
+ .list-group
+ .list-group-item
+ = (current_referential.name).upcase
+ .list-group
+ = link_to referential_time_tables_path(current_referential), class: 'list-group-item' do
+ span = t('time_tables.index.title').capitalize
+ - if has_feature?(:purchase_windows)
+ = link_to referential_purchase_windows_path(current_referential), class: 'list-group-item' do
+ span = t('purchase_windows.index.title').capitalize
+
+ - else
+ .panel-body
+ em.text-muted
+ = t('layouts.navbar.select_referential_for_more_features')
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miFour', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = t('layouts.navbar.line_referential')
+
+ #miFour.panel-collapse.collapse
+ .list-group
+ = link_to line_referential_lines_path(workbench.line_referential), class: "list-group-item" do
+ span = Chouette::Line.t.capitalize
+ = link_to line_referential_networks_path(workbench.line_referential), class: "list-group-item" do
+ span = Chouette::Network.t.capitalize
+ = link_to line_referential_companies_path(workbench.line_referential), class: "list-group-item" do
+ span = Chouette::Company.t.capitalize
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miFive', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = t('layouts.navbar.stop_area_referential')
+
+ #miFive.panel-collapse.collapse
+ .list-group
+ = link_to stop_area_referential_stop_areas_path(workbench.stop_area_referential), class: "list-group-item" do
+ span = Chouette::StopArea.t.capitalize
diff --git a/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim b/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
index 3741ef19b..589f99ae3 100644
--- a/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
+++ b/app/views/layouts/navigation/_main_nav_left_content_stif.html.slim
@@ -1,109 +1,125 @@
-- @localizationUrl = "#{params[:controller]}##{params[:action]}"
-
-#menu-items.panel-group
- .menu-item.panel
- .panel-heading
- h4.panel-title
- = link_to '#miOne', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
- = t('layouts.navbar.current_offer.other')
-
- #miOne.panel-collapse.collapse
- .list-group
- = link_to root_path, class: "list-group-item #{(@localizationUrl == 'workbenches#index') ? 'active' : ''}" do
- span = t('layouts.navbar.dashboard')
- = link_to workbench_output_path(current_user.workbenches.first), class: 'list-group-item' do
- span = t('layouts.navbar.workbench_outputs.organisation')
- = link_to '#', class: 'list-group-item' do
- span = t('layouts.navbar.workbench_outputs.idf')
-
- .menu-item.panel
- .panel-heading
- h4.panel-title
- = link_to '#miTwo', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
- - t('activerecord.models.workbench.one').capitalize
-
- #miTwo.panel-collapse.collapse
- .list-group
- - current_user.workbenches.each do |current_workbench|
- = link_to workbench_path(current_workbench), class: "list-group-item #{params[:controller] == 'workbenches' ? 'active' : ''}" do
- span = t('activerecord.models.referential.other').capitalize
- = link_to workbench_imports_path(current_workbench), class: "list-group-item #{(params[:controller] == 'imports') ? 'active' : ''}" do
- span = t('activerecord.models.import.other').capitalize
- = link_to workbench_exports_path(current_workbench), class: "list-group-item #{(params[:controller] == 'exports') ? 'active' : ''}" do
- span = t('activerecord.models.export.other').capitalize
- = link_to workgroup_calendars_path(current_workbench.workgroup), class: 'list-group-item' do
- span = t('activerecord.models.calendar.other').capitalize
- = link_to workbench_compliance_check_sets_path(current_workbench), class: 'list-group-item' do
- span = t('activerecord.models.compliance_check_set.other').capitalize
- = link_to compliance_control_sets_path, class: 'list-group-item' do
- span = t('activerecord.models.compliance_control_set.other').capitalize
-
- .menu-item.panel
- .panel-heading
- h4.panel-title
- = link_to '#miThree', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
- = t('layouts.navbar.referential_datas')
-
- #miThree.panel-collapse.collapse
- - if @referential.try(:id) && respond_to?(:current_referential)
- .list-group
- .list-group-item
- = (current_referential.name).upcase
+- if current_organisation
+ - current_organisation.workbenches.each do |workbench|
+ #menu-items.panel-group
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miOne', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = t('layouts.navbar.current_offer.other')
+
+ #miOne.panel-collapse.collapse
+ .list-group
+ = link_to root_path, class: "list-group-item" do
+ span = t('layouts.navbar.dashboard')
+ = link_to workbench_output_path(workbench), class: 'list-group-item' do
+ span = t('layouts.navbar.workbench_outputs.organisation')
+ = link_to '#', class: 'list-group-item disabled' do
+ span = t('layouts.navbar.workbench_outputs.workgroup')
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miTwo', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ - t('activerecord.models.workbench.one').capitalize
+
+ #miTwo.panel-collapse.collapse
+ .list-group
+ = link_to workbench_path(workbench), class: "list-group-item" do
+ span = t('activerecord.models.referential.other').capitalize
+ = link_to workbench_imports_path(workbench), class: "list-group-item" do
+ span = t('activerecord.models.import.other').capitalize
+ = link_to workbench_exports_path(workbench), class: "list-group-item" do
+ span = t('activerecord.models.export.other').capitalize
+ = link_to workgroup_calendars_path(workbench.workgroup), class: 'list-group-item' do
+ span = t('activerecord.models.calendar.other').capitalize
+ = link_to workbench_compliance_check_sets_path(workbench), class: 'list-group-item' do
+ span = t('activerecord.models.compliance_check_set.other').capitalize
+ = link_to compliance_control_sets_path, class: 'list-group-item' do
+ span = t('activerecord.models.compliance_control_set.other').capitalize
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miThree', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = Referential.ts.capitalize
+
+ #miThree.panel-collapse.collapse
+ - if @referential.try(:id) && respond_to?(:current_referential)
.list-group
- = link_to referential_networks_path(current_referential), class: 'list-group-item' do
- span = t('networks.index.title')
-
- = link_to referential_companies_path(current_referential), class: 'list-group-item' do
- span = t('companies.index.title')
-
- = link_to '#', class: 'list-group-item disabled' do
- span = t('layouts.navbar.shapes')
-
- = link_to referential_time_tables_path(current_referential), class: 'list-group-item' do
- span = t('time_tables.index.title')
-
- - else
- .panel-body
- em.text-muted
- = t('layouts.navbar.select_referential_for_more_features')
-
- .menu-item.panel
- .panel-heading
- h4.panel-title
- = link_to '#miFour', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
- = t('layouts.navbar.sync')
-
- #miFour.panel-collapse.collapse
- .list-group
- = link_to line_referential_path(1), class: "list-group-item #{(@localizationUrl == 'line_referentials#show') ? 'active' : ''}" do
- span = t('layouts.navbar.sync_ilico')
- = link_to stop_area_referential_path(1), class: "list-group-item #{(@localizationUrl == 'stop_area_referentials#show') ? 'active' : ''}" do
- span = t('layouts.navbar.sync_icar')
-
- .menu-item.panel
- .panel-heading
- h4.panel-title
- = link_to '#miFive', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
- = t('layouts.navbar.tools')
-
- #miFive.panel-collapse.collapse
- .list-group
- = link_to Rails.application.config.try(:portal_url), target: '_blank', class: 'list-group-item' do
- span
- span.fa.fa-2x.fa-circle
- = t('layouts.navbar.portal')
-
- = link_to Rails.application.config.try(:codifligne_url), target: '_blank', class: 'list-group-item' do
- span
- span.fa.fa-2x.fa-circle
- = t('layouts.navbar.ilico')
-
- = link_to Rails.application.config.try(:reflex_url), target: '_blank', class: 'list-group-item' do
- span
- span.fa.fa-2x.fa-circle
- = t('layouts.navbar.icar')
-
- = link_to '#', target: '_blank', class: 'list-group-item' do
- span
- span.fa.fa-2x.fa-circle
- = t('layouts.navbar.support') \ No newline at end of file
+ .list-group-item
+ = (current_referential.name).upcase
+ .list-group
+ = link_to referential_networks_path(current_referential), class: 'list-group-item' do
+ span = t('networks.index.title')
+
+ = link_to referential_companies_path(current_referential), class: 'list-group-item' do
+ span = t('companies.index.title')
+
+ = link_to '#', class: 'list-group-item disabled' do
+ span = t('layouts.navbar.shapes')
+
+ = link_to referential_time_tables_path(current_referential), class: 'list-group-item' do
+ span = t('time_tables.index.title')
+
+ - else
+ .panel-body
+ em.text-muted
+ = t('layouts.navbar.select_referential_for_more_features')
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miFour', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = t('layouts.navbar.line_referential')
+
+ #miFour.panel-collapse.collapse
+ .list-group
+ = link_to line_referential_path(workbench.line_referential), class: "list-group-item" do
+ span = t('layouts.navbar.sync_ilico')
+ = link_to line_referential_lines_path(workbench.line_referential), class: "list-group-item" do
+ span = Chouette::Line.t.capitalize
+ = link_to line_referential_networks_path(workbench.line_referential), class: "list-group-item" do
+ span = Chouette::Network.t.capitalize
+ = link_to line_referential_companies_path(workbench.line_referential), class: "list-group-item" do
+ span = Chouette::Company.t.capitalize
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miFive', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = t('layouts.navbar.stop_area_referential')
+
+ #miFive.panel-collapse.collapse
+ .list-group
+ = link_to stop_area_referential_path(workbench.stop_area_referential), class: "list-group-item" do
+ span = t('layouts.navbar.sync_icar')
+ = link_to stop_area_referential_stop_areas_path(workbench.stop_area_referential), class: "list-group-item" do
+ span = Chouette::StopArea.t.capitalize
+
+ .menu-item.panel
+ .panel-heading
+ h4.panel-title
+ = link_to '#miSix', data: {toggle: 'collapse', parent: '#menu-items'}, 'aria-expanded' => 'false' do
+ = t('layouts.navbar.tools')
+
+ #miSix.panel-collapse.collapse
+ .list-group
+ = link_to Rails.application.config.try(:portal_url), target: '_blank', class: 'list-group-item' do
+ span
+ span.fa.fa-2x.fa-circle
+ = t('layouts.navbar.portal')
+
+ = link_to Rails.application.config.try(:codifligne_url), target: '_blank', class: 'list-group-item' do
+ span
+ span.fa.fa-2x.fa-circle
+ = t('layouts.navbar.ilico')
+
+ = link_to Rails.application.config.try(:reflex_url), target: '_blank', class: 'list-group-item' do
+ span
+ span.fa.fa-2x.fa-circle
+ = t('layouts.navbar.icar')
+
+ = link_to '#', target: '_blank', class: 'list-group-item' do
+ span
+ span.fa.fa-2x.fa-circle
+ = t('layouts.navbar.support')
diff --git a/app/views/line_referentials/show.html.slim b/app/views/line_referentials/show.html.slim
index 763eb076e..4a4acc427 100644
--- a/app/views/line_referentials/show.html.slim
+++ b/app/views/line_referentials/show.html.slim
@@ -4,44 +4,29 @@
- content_for :page_header_actions do
= link_to(t('actions.sync'), sync_line_referential_path(@line_referential), method: :post, class: 'btn btn-default')
-- 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
- = Referential.human_attribute_name(:companies)
- em.small = " (#{@line_referential.companies.size})"
- = link_to line_referential_networks_path(@line_referential), class: 'btn btn-primary' do
- = Referential.human_attribute_name(:networks)
- em.small = " (#{@line_referential.networks.size})"
- = link_to line_referential_lines_path(@line_referential), class: 'btn btn-primary' do
- = Referential.human_attribute_name(:lines)
- em.small = " (#{@line_referential.lines.size})"
-
.page_content
.container-fluid
.row
.col-lg-12
- - unless @line_referential.line_referential_syncs.empty?
- table.table
- thead
- tr
- th = t('.synchronized')
- th = t('.status')
- th = t('.message')
+ = table_builder_2 @line_referential.line_referential_syncs,
+ [ \
+ TableBuilderHelper::Column.new( \
+ name: t('.synchronized'), \
+ attribute: Proc.new { |sync| line_referential_sync_created_at(sync) }, \
+ ), \
+ TableBuilderHelper::Column.new( \
+ name: t('.status'), \
+ attribute: Proc.new { |sync| line_referential_sync_status(sync) }, \
+ ), \
+ TableBuilderHelper::Column.new( \
+ name: t('.message'), \
+ attribute: Proc.new { |sync| line_referential_sync_message(sync) }, \
+ ), \
+ ],
+ sortable: false,
+ cls: 'table'
- tbody
- - @line_referential.line_referential_syncs.each_with_index do |sync, i|
- / Display only 10 msgs
- - if i < 10
- - unless sync.line_referential_sync_messages.empty?
- - sync.line_referential_sync_messages.last.tap do |log|
- - if log.criticity = log.criticity
- tr
- td style='width: 150px'
- = l(log.created_at, format: :short_with_time)
- td.text-center
- .fa.fa-circle class="text-#{criticity_class(log.criticity)}"
- td
- - data = log.message_attributes.symbolize_keys!
- - data[:processing_time] = distance_of_time_in_words(data[:processing_time].to_i)
- = t("line_referential_sync.message.#{log.message_key}", log.message_attributes.symbolize_keys!).html_safe
+ - unless @line_referential.line_referential_syncs.any?
+ .row.mt-xs
+ .col-lg-12
+ = replacement_msg t('line_referential_syncs.search_no_results')
diff --git a/app/views/stop_area_referentials/show.html.slim b/app/views/stop_area_referentials/show.html.slim
index 911006c39..9a0079330 100644
--- a/app/views/stop_area_referentials/show.html.slim
+++ b/app/views/stop_area_referentials/show.html.slim
@@ -2,40 +2,30 @@
- if policy(@stop_area_referential).synchronize?
- 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.count})"
-- page_header_content_for @stop_area_referential
-
+
.page_content
.container-fluid
.row
.col-lg-12
- - unless @stop_area_referential.stop_area_referential_syncs.empty?
- table.table
- thead
- tr
- th Synchronisé
- th Statut
- th Message
+ = table_builder_2 @stop_area_referential.stop_area_referential_syncs,
+ [ \
+ TableBuilderHelper::Column.new( \
+ name: t('.synchronized'), \
+ attribute: Proc.new { |sync| stop_area_referential_sync_created_at(sync) }, \
+ ), \
+ TableBuilderHelper::Column.new( \
+ name: t('.status'), \
+ attribute: Proc.new { |sync| stop_area_referential_sync_status(sync) }, \
+ ), \
+ TableBuilderHelper::Column.new( \
+ name: t('.message'), \
+ attribute: Proc.new { |sync| stop_area_referential_sync_message(sync) }, \
+ ), \
+ ],
+ sortable: false,
+ cls: 'table'
- tbody
- - @stop_area_referential.stop_area_referential_syncs.each_with_index do |sync, i|
- / Display only 10 msgs
- - if i < 10
- - unless sync.stop_area_referential_sync_messages.empty?
- - sync.stop_area_referential_sync_messages.last.tap do |log|
- - if log.criticity = log.criticity
- tr
- td style='width:150px'
- = l(log.created_at, format: :short_with_time)
- td.text-center
- .fa.fa-circle class="text-#{criticity_class(log.criticity)}"
- td
- - data = log.message_attributes.symbolize_keys!
- - data[:processing_time] = distance_of_time_in_words(data[:processing_time].to_i)
- = t("stop_area_referential_sync.message.#{log.message_key}", log.message_attributes.symbolize_keys!).html_safe
+ - unless @stop_area_referential.stop_area_referential_syncs.any?
+ .row.mt-xs
+ .col-lg-12
+ = replacement_msg t('stop_area_referential_syncs.search_no_results')
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