aboutsummaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/access_links/show.html.slim2
-rw-r--r--app/views/access_points/_form.html.slim2
-rw-r--r--app/views/access_points/show.html.slim4
-rw-r--r--app/views/autocomplete_calendars/autocomplete.rabl2
-rw-r--r--app/views/calendars/_filters.html.slim4
-rw-r--r--app/views/calendars/_form_simple.html.slim3
-rw-r--r--app/views/calendars/index.html.slim4
-rw-r--r--app/views/calendars/show.html.slim3
-rw-r--r--app/views/companies/new.html.slim2
-rw-r--r--app/views/compliance_check_sets/_filters.html.slim2
-rw-r--r--app/views/compliance_check_sets/show.html.slim2
-rw-r--r--app/views/compliance_control_sets/_filters.html.slim2
-rw-r--r--app/views/connection_links/show.html.slim2
-rw-r--r--app/views/dashboards/_dashboard.html.slim2
-rw-r--r--app/views/exports/_form.html.slim3
-rw-r--r--app/views/exports/show.html.slim11
-rw-r--r--app/views/group_of_lines/show.html.slim2
-rw-r--r--app/views/journey_patterns/show.html.slim2
-rw-r--r--app/views/journey_patterns_collections/show.html.slim1
-rw-r--r--app/views/layouts/navigation/_page_header.html.slim2
-rw-r--r--app/views/lines/_filters.html.slim20
-rw-r--r--app/views/lines/index.html.slim5
-rw-r--r--app/views/referential_group_of_lines/show.html.slim2
-rw-r--r--app/views/referential_stop_areas/_form.html.slim3
-rw-r--r--app/views/referentials/show.html.slim2
-rw-r--r--app/views/routes/costs.rabl4
-rw-r--r--app/views/shared/_development_toolbar.html.slim14
-rw-r--r--app/views/shared/controls/_metadatas.html.slim8
-rw-r--r--app/views/shared/iev_interfaces/_filters.html.slim2
-rw-r--r--app/views/shared/iev_interfaces/_messages.html.slim2
-rw-r--r--app/views/stop_areas/_form.html.slim2
-rw-r--r--app/views/vehicle_journey_imports/new.html.slim6
-rw-r--r--app/views/vehicle_journeys/_form.html.slim1
-rw-r--r--app/views/vehicle_journeys/_show_details.html.slim4
-rw-r--r--app/views/workbenches/show.html.slim1
35 files changed, 74 insertions, 59 deletions
diff --git a/app/views/access_links/show.html.slim b/app/views/access_links/show.html.slim
index 59f72a55f..ebc801313 100644
--- a/app/views/access_links/show.html.slim
+++ b/app/views/access_links/show.html.slim
@@ -1,8 +1,6 @@
= title_tag t('access_links.show.title', access_link: @access_link.name )
.access_link_show
- = @map.to_html
-
.summary
p
label = "#{@access_link.human_attribute_name('access_link_type')} : "
diff --git a/app/views/access_points/_form.html.slim b/app/views/access_points/_form.html.slim
index 5ba7a6863..5c0c59174 100644
--- a/app/views/access_points/_form.html.slim
+++ b/app/views/access_points/_form.html.slim
@@ -1,6 +1,4 @@
.container-fluid
- = @map.to_html if @map
-
= semantic_form_for [@referential, @stop_area, @access_point] do |form|
= form.inputs do
= form.input :id, as: :hidden
diff --git a/app/views/access_points/show.html.slim b/app/views/access_points/show.html.slim
index 7c87fa16e..1c46e2b5c 100644
--- a/app/views/access_points/show.html.slim
+++ b/app/views/access_points/show.html.slim
@@ -1,8 +1,6 @@
= title_tag t('access_points.show.title', access_point: @access_point.name)
.access_point_show
- = @map.to_html if @access_point.long_lat_type != nil
-
.summary
p
label = "#{@access_point.human_attribute_name('comment')} : "
@@ -92,7 +90,7 @@ div
div.access_link_pairs
table
= render partial: 'access_link_pairs/access_link_pair', collection: access_links_pairs(@detail_access_links)
-
+
- content_for :sidebar do
ul.actions
li
diff --git a/app/views/autocomplete_calendars/autocomplete.rabl b/app/views/autocomplete_calendars/autocomplete.rabl
index 3a7703c53..9a91e1d69 100644
--- a/app/views/autocomplete_calendars/autocomplete.rabl
+++ b/app/views/autocomplete_calendars/autocomplete.rabl
@@ -1,5 +1,5 @@
collection @calendars, :object_root => false
-attribute :id, :name, :short_name, :shared
+attribute :id, :name, :shared
node :text do |cal|
"<strong>" + cal.name + " - " + cal.id.to_s + "</strong>"
diff --git a/app/views/calendars/_filters.html.slim b/app/views/calendars/_filters.html.slim
index 8bfe1974e..4d664c358 100644
--- a/app/views/calendars/_filters.html.slim
+++ b/app/views/calendars/_filters.html.slim
@@ -1,7 +1,7 @@
= search_form_for @q, url: workgroup_calendars_path(@workgroup), builder: SimpleForm::FormBuilder, html: { method: :get, class: 'form form-filter' } do |f|
.ffg-row
- .input-group.search_bar class=filter_item_class(params[:q], :name_or_short_name_cont)
- = f.search_field :name_or_short_name_cont, class: 'form-control', placeholder: 'Indiquez un nom/nom court de calendrier...'
+ .input-group.search_bar class=filter_item_class(params[:q], :name_cont)
+ = f.search_field :name_cont, class: 'form-control', placeholder: 'Indiquez un nom/nom court de calendrier...'
span.input-group-btn
button.btn.btn-default#search_btn type='submit'
span.fa.fa-search
diff --git a/app/views/calendars/_form_simple.html.slim b/app/views/calendars/_form_simple.html.slim
index a0b10271c..a87a3dab5 100644
--- a/app/views/calendars/_form_simple.html.slim
+++ b/app/views/calendars/_form_simple.html.slim
@@ -4,8 +4,7 @@
.row
.col-lg-12
= f.input :name
- = f.input :short_name
-
+
- if policy(@calendar).share?
.form-group.has_switch
= f.label :shared, class: 'col-sm-4 col-xs-5 control-label'
diff --git a/app/views/calendars/index.html.slim b/app/views/calendars/index.html.slim
index 0b58c0c72..d4b84fe82 100644
--- a/app/views/calendars/index.html.slim
+++ b/app/views/calendars/index.html.slim
@@ -20,10 +20,6 @@
end \
), \
TableBuilderHelper::Column.new( \
- key: :short_name, \
- attribute: 'short_name' \
- ), \
- TableBuilderHelper::Column.new( \
key: :organisation, \
attribute: Proc.new { |c| c.organisation.name } \
), \
diff --git a/app/views/calendars/show.html.slim b/app/views/calendars/show.html.slim
index cec4f66a5..fa1ab3b71 100644
--- a/app/views/calendars/show.html.slim
+++ b/app/views/calendars/show.html.slim
@@ -6,8 +6,7 @@
.row
.col-lg-6.col-md-6.col-sm-12.col-xs-12
= definition_list t('metadatas'),
- { 'Nom court' => resource.try(:short_name),
- Calendar.human_attribute_name(:shared) => t("#{resource.shared}"),
+ { Calendar.human_attribute_name(:shared) => t("#{resource.shared}"),
'Organisation' => resource.organisation.name,
Calendar.human_attribute_name(:dates) => resource.dates.collect{|d| l(d, format: :short)}.join(', ').html_safe,
Calendar.human_attribute_name(:date_ranges) => resource.periods.map{|d| t('validity_range', debut: l(d.begin, format: :short), end: l(d.end, format: :short))}.join('<br>').html_safe }
diff --git a/app/views/companies/new.html.slim b/app/views/companies/new.html.slim
index cc085ffe2..1747b8e10 100644
--- a/app/views/companies/new.html.slim
+++ b/app/views/companies/new.html.slim
@@ -1,4 +1,4 @@
-- breadcrumb :lines, @line_referential
+- breadcrumb :companies, @line_referential
.page_content
.container-fluid
.row
diff --git a/app/views/compliance_check_sets/_filters.html.slim b/app/views/compliance_check_sets/_filters.html.slim
index e413a6cdd..c8ef14ecd 100644
--- a/app/views/compliance_check_sets/_filters.html.slim
+++ b/app/views/compliance_check_sets/_filters.html.slim
@@ -11,7 +11,7 @@
= f.label t('activerecord.attributes.compliance_check_set.assigned_to'), required: false, class: 'control-label'
= f.input :parent_type_eq_any, collection: ComplianceCheckSet.order('parent_type'), as: :check_boxes, label: false, label_method: lambda {|w| ("<span>#{w}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'}
.form-group.togglable class=filter_item_class(params[:q], :created_at)
- = f.label Import.human_attribute_name(:created_at), required: false, class: 'control-label'
+ = f.label ComplianceCheckSet.human_attribute_name(:created_at), required: false, class: 'control-label'
.filter_menu
= f.simple_fields_for :created_at do |p|
= p.input :start_date, as: :date, label: false, wrapper_html: {class: 'date smart_date filter_menu-item'}, default: @begin_range, include_blank: @begin_range ? false : true
diff --git a/app/views/compliance_check_sets/show.html.slim b/app/views/compliance_check_sets/show.html.slim
index 4df14ab06..b54bf6c5c 100644
--- a/app/views/compliance_check_sets/show.html.slim
+++ b/app/views/compliance_check_sets/show.html.slim
@@ -1,4 +1,4 @@
-- breadcrumb :compliance_check_sets, @workbench, @compliance_check_set
+- breadcrumb :compliance_check_set, @workbench, @compliance_check_set
- page_header_content_for @compliance_check_set
/ PageContent
diff --git a/app/views/compliance_control_sets/_filters.html.slim b/app/views/compliance_control_sets/_filters.html.slim
index 5cf282559..5f6d9e27b 100644
--- a/app/views/compliance_control_sets/_filters.html.slim
+++ b/app/views/compliance_control_sets/_filters.html.slim
@@ -8,7 +8,7 @@
.ffg-row
.form-group.togglable class=filter_item_class(params[:q], :organisation_name_eq_any)
= f.label t('activerecord.models.organisation.one'), required: false, class: 'control-label'
- = f.input :organisation_name_eq_any, collection: organisations_filters_values, as: :check_boxes, label: false, label_method: lambda {|w| ("<span>#{w.name}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'}
+ = f.input :organisation_name_eq_any, collection: organisations_filters_values, as: :check_boxes, value_method: :name, label: false, label_method: lambda {|w| ("<span>#{w.name}</span>").html_safe}, required: false, wrapper_html: {class: 'checkbox_list'}
.form-group.togglable class=filter_item_class(params[:q], :updated_at)
= f.label Import::Base.human_attribute_name(:updated_at), required: false, class: 'control-label'
diff --git a/app/views/connection_links/show.html.slim b/app/views/connection_links/show.html.slim
index 5d8864bb5..ca6593131 100644
--- a/app/views/connection_links/show.html.slim
+++ b/app/views/connection_links/show.html.slim
@@ -1,8 +1,6 @@
= title_tag t('connection_links.show.title', :connection_link => @connection_link.name)
.connection_link_show
- = @map.to_html
-
.summary
p
label = "#{@connection_link.human_attribute_name(:departure)} : "
diff --git a/app/views/dashboards/_dashboard.html.slim b/app/views/dashboards/_dashboard.html.slim
index 4adf335d2..2f0791f50 100644
--- a/app/views/dashboards/_dashboard.html.slim
+++ b/app/views/dashboards/_dashboard.html.slim
@@ -51,4 +51,4 @@
.list-group
= link_to Chouette::Line.model_name.human.pluralize.capitalize, line_referential_lines_path(referential), class: 'list-group-item'
= link_to Chouette::Company.model_name.human.pluralize.capitalize, line_referential_companies_path(referential), class: 'list-group-item'
- = link_to Chouette::Network.model_name.human.pluralize.capitalize, line_referential_networks_path(referential), class: 'list-group-item'
+ = link_to Chouette::Network.model_name.human.pluralize(I18n.locale).capitalize, line_referential_networks_path(referential), class: 'list-group-item'
diff --git a/app/views/exports/_form.html.slim b/app/views/exports/_form.html.slim
index 7817fdf1a..999e33e34 100644
--- a/app/views/exports/_form.html.slim
+++ b/app/views/exports/_form.html.slim
@@ -4,7 +4,8 @@
.col-lg-12
= form.input :name
.col-lg-12
- = form.input :type, as: :select, collection: Export::Base.user_visible_descendants, label_method: :human_name
+ = form.input :type, as: :select, collection: workgroup_exports(workbench.workgroup), label_method: :human_name
+ = form.input :referential_id, as: :select, collection: workbench.referentials, label_method: :name
- Export::Base.user_visible_descendants.each do |child|
.slave data-master="[name='export[type]']" data-value=child.name
diff --git a/app/views/exports/show.html.slim b/app/views/exports/show.html.slim
index 2a7d7583c..3a4047ae9 100644
--- a/app/views/exports/show.html.slim
+++ b/app/views/exports/show.html.slim
@@ -10,7 +10,16 @@
- metadatas = metadatas.update({I18n.t("activerecord.attributes.export.status") => export_status(@export.status)})
- metadatas = metadatas.update({I18n.t("activerecord.attributes.export.parent") => link_to(@export.parent.name, [@export.parent.workbench, @export.parent])}) if @export.parent.present?
- metadatas = metadatas.update Hash[*@export.visible_options.map{|k, v| [t("activerecord.attributes.export.#{@export.object.class.name.demodulize.underscore}.#{k}"), @export.display_option_value(k, self)]}.flatten]
- - metadatas = metadatas.update({I18n.t("activerecord.attributes.export.file") => (@export.file.present? ? link_to(t("actions.download"), @export.file.url) : "-")})
+ - if @export.children.any?
+ - files = @export.children.map(&:file).select(&:present?)
+ - if files.any?
+ - metadatas = metadatas.update({I18n.t("activerecord.attributes.export.files") => ""})
+ - @export.children.each do |e|
+ - metadatas = metadatas.update({"- #{e.class.human_name}" => e.file.present? ? link_to(e.file.file.filename, e.file.url) : "-"})
+ - else
+ - metadatas = metadatas.update({I18n.t("activerecord.attributes.export.files") => "-"})
+ - else
+ - metadatas = metadatas.update({I18n.t("activerecord.attributes.export.file") => (@export.file.present? ? link_to(t("actions.download"), @export.file.url) : "-")})
= definition_list t('metadatas'), metadatas
.row
diff --git a/app/views/group_of_lines/show.html.slim b/app/views/group_of_lines/show.html.slim
index de215bfa0..a447a345d 100644
--- a/app/views/group_of_lines/show.html.slim
+++ b/app/views/group_of_lines/show.html.slim
@@ -3,8 +3,6 @@
= title_tag t('group_of_lines.show.title', :group_of_line => @group_of_line.name )
.group_of_line_show
- = @map.to_html
-
.summary
p
label = "#{@group_of_line.human_attribute_name('registration_number')} : "
diff --git a/app/views/journey_patterns/show.html.slim b/app/views/journey_patterns/show.html.slim
index a77536130..cff0321ec 100644
--- a/app/views/journey_patterns/show.html.slim
+++ b/app/views/journey_patterns/show.html.slim
@@ -1,8 +1,6 @@
= title_tag t('journey_patterns.show.title', journey_pattern: journey_name( @journey_pattern), route: @route.name )
.journey_pattern_show
- = @map.to_html
-
.summary
p
label = "#{@journey_pattern.human_attribute_name(:name)} : "
diff --git a/app/views/journey_patterns_collections/show.html.slim b/app/views/journey_patterns_collections/show.html.slim
index 8a7b0c47c..b389a1da7 100644
--- a/app/views/journey_patterns_collections/show.html.slim
+++ b/app/views/journey_patterns_collections/show.html.slim
@@ -19,5 +19,6 @@
| window.journeyPatternsPerPage = #{@ppage};
| window.perms = #{raw @perms};
| window.features = #{raw @features};
+ | window.routeCostsUrl = "#{costs_referential_line_route_url(@referential, @route.line, @route, format: :json).html_safe}";
= javascript_pack_tag 'journey_patterns/index.js'
diff --git a/app/views/layouts/navigation/_page_header.html.slim b/app/views/layouts/navigation/_page_header.html.slim
index 49f56544b..bdc4bdfed 100644
--- a/app/views/layouts/navigation/_page_header.html.slim
+++ b/app/views/layouts/navigation/_page_header.html.slim
@@ -12,7 +12,7 @@
h1 = yield :page_header_title
- else
- if defined?(resource_class)
- h1 = t("#{resource_class.model_name.name.underscore.gsub('/', '.').pluralize}.#{params[:action]}.title")
+ h1 = resource_class.t_action(params[:action])
.col-lg-3.col-md-4.col-sm-5.col-xs-5.text-right
.page-action
diff --git a/app/views/lines/_filters.html.slim b/app/views/lines/_filters.html.slim
index 67ba297cf..da0539bd0 100644
--- a/app/views/lines/_filters.html.slim
+++ b/app/views/lines/_filters.html.slim
@@ -23,6 +23,26 @@
= f.label Chouette::Line.human_attribute_name(:transport_submode), required: false, class: 'control-label'
= f.input :transport_submode_eq_any, collection: StifTransportSubmodeEnumerations.sorted_transport_submodes, as: :check_boxes, label: false, label_method: lambda{|l| ("<span>" + t("enumerize.transport_submode.#{l}") + "</span>").html_safe}, required: false, wrapper_html: { class: 'checkbox_list'}
+ .form-group.togglable class=filter_item_class(params[:q], :status)
+ = f.label Chouette::Line.human_attribute_name(:state), required: false, class: 'control-label'
+ .form-group.checkbox_list
+ = f.simple_fields_for :status do |p|
+ = p.input :activated,
+ label: ("<span>#{t('activerecord.attributes.line.activated')}<span class='fa fa-check-circle text-success'></span></span>").html_safe,
+ as: :boolean,
+ wrapper_html: { class: 'checkbox-wrapper' },
+ checked_value: true,
+ unchecked_value: false,
+ input_html: { checked: @status.try(:[], :activated) }
+ = p.input :deactivated,
+ label: ("<span>#{t('activerecord.attributes.line.deactivated')}<span class='fa fa-exclamation-circle text-danger'></span></span>").html_safe,
+ as: :boolean,
+ wrapper_html: { class: 'checkbox-wrapper' },
+ checked_value: true,
+ unchecked_value: false,
+ input_html: { checked: @status.try(:[], :deactivated) }
+
+
.actions
= link_to 'Effacer', @workbench, class: 'btn btn-link'
= f.submit 'Filtrer', class: 'btn btn-default'
diff --git a/app/views/lines/index.html.slim b/app/views/lines/index.html.slim
index 2d64e5f73..9d491ace4 100644
--- a/app/views/lines/index.html.slim
+++ b/app/views/lines/index.html.slim
@@ -29,8 +29,9 @@
end \
), \
TableBuilderHelper::Column.new( \
- key: :deactivated, \
- attribute: Proc.new { |n| line_status(n.deactivated?) } \
+ name: t('activerecord.attributes.line.state'), \
+ class: :state, \
+ attribute: Proc.new { |n| line_status(n.deactivated) } \
), \
TableBuilderHelper::Column.new( \
key: 'networks.name', \
diff --git a/app/views/referential_group_of_lines/show.html.slim b/app/views/referential_group_of_lines/show.html.slim
index 504af0187..61a762350 100644
--- a/app/views/referential_group_of_lines/show.html.slim
+++ b/app/views/referential_group_of_lines/show.html.slim
@@ -2,8 +2,6 @@
= title_tag t('group_of_lines.show.title', :group_of_line => @group_of_line.name )
.group_of_line_show
- = @map.to_html
-
.summary
p
label = "#{@group_of_line.human_attribute_name('registration_number')} : "
diff --git a/app/views/referential_stop_areas/_form.html.slim b/app/views/referential_stop_areas/_form.html.slim
index 8181ec3f3..3921c8bf1 100644
--- a/app/views/referential_stop_areas/_form.html.slim
+++ b/app/views/referential_stop_areas/_form.html.slim
@@ -1,9 +1,6 @@
= semantic_form_for [@referential, @stop_area] do |form|
.row
.container-fluid
- - if !manage_itl && @map
- = @map.to_html
-
= form.inputs do
= form.input :id, as: :hidden
= form.input :name, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.name")}
diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim
index 289e802d7..b2a079ab4 100644
--- a/app/views/referentials/show.html.slim
+++ b/app/views/referentials/show.html.slim
@@ -40,7 +40,7 @@
end \
), \
TableBuilderHelper::Column.new( \
- key: :deactivated, \
+ key: :state, \
attribute: Proc.new { |n| line_status(n.deactivated?) } \
), \
TableBuilderHelper::Column.new( \
diff --git a/app/views/routes/costs.rabl b/app/views/routes/costs.rabl
new file mode 100644
index 000000000..1a1b14898
--- /dev/null
+++ b/app/views/routes/costs.rabl
@@ -0,0 +1,4 @@
+object @route
+node :costs do
+ RouteWayCostUnitConverter.convert(@route.costs)
+end
diff --git a/app/views/shared/_development_toolbar.html.slim b/app/views/shared/_development_toolbar.html.slim
index aafd37885..836066b3d 100644
--- a/app/views/shared/_development_toolbar.html.slim
+++ b/app/views/shared/_development_toolbar.html.slim
@@ -20,6 +20,20 @@
- if Rails.application.config.development_toolbar.features_doc_url
= link_to "#{Rails.application.config.development_toolbar.features_doc_url}##{feature}", target: :blank do
.fa.fa-question-circle
+
+ - if @workbench
+ h4
+ = "Exports"
+ .toggles
+ = link_to 'all', '#', data: {mask: 'export_types', val: true}
+ = link_to 'none', '#', data: {mask: 'export_types', val: false}
+ ul
+ - Export::Base.user_visible_descendants.each do |export|
+ li
+ = hidden_field_tag "export_types[#{@workbench.workgroup_id}][#{export.name}]", false, id: ""
+ = check_box_tag "export_types[#{@workbench.workgroup_id}][#{export.name}]", true, @workbench.workgroup.has_export?(export.name)
+ = label :export_types, export.human_name
+
.col.permissions
h4
= "Permissions"
diff --git a/app/views/shared/controls/_metadatas.html.slim b/app/views/shared/controls/_metadatas.html.slim
index 49df06166..80f3936e6 100644
--- a/app/views/shared/controls/_metadatas.html.slim
+++ b/app/views/shared/controls/_metadatas.html.slim
@@ -7,9 +7,5 @@
I18n.t('activerecord.attributes.compliance_control.predicate') => resource.predicate,
I18n.t('activerecord.attributes.compliance_control.prerequisite') => resource.prerequisite,
}.merge( \
- {}.tap do |hash| \
- resource.class.dynamic_attributes.each do |attribute| \
- hash[ComplianceControl.human_attribute_name(attribute)] = resource.send(attribute) \
- end \
- end \
- )
+ compliance_control_metadatas(resource) \
+ ) \ No newline at end of file
diff --git a/app/views/shared/iev_interfaces/_filters.html.slim b/app/views/shared/iev_interfaces/_filters.html.slim
index 9b114c38d..6414af7a2 100644
--- a/app/views/shared/iev_interfaces/_filters.html.slim
+++ b/app/views/shared/iev_interfaces/_filters.html.slim
@@ -1,4 +1,4 @@
-= search_form_for @q, url: workbench_imports_path(@workbench), html: { method: :get, class: 'form form-filter' } do |f|
+= search_form_for @q, url: request.path, html: { method: :get, class: 'form form-filter' } do |f|
.ffg-row
.input-group.search_bar class=filter_item_class(params[:q], :name_or_creator_cont)
= f.search_field :name_or_creator_cont, class: 'form-control', placeholder: t('imports.filters.name_or_creator_cont')
diff --git a/app/views/shared/iev_interfaces/_messages.html.slim b/app/views/shared/iev_interfaces/_messages.html.slim
index 82f1add57..022f4ee01 100644
--- a/app/views/shared/iev_interfaces/_messages.html.slim
+++ b/app/views/shared/iev_interfaces/_messages.html.slim
@@ -3,7 +3,7 @@
- messages.order(:created_at).each do | message |
li
.row class=bootstrap_class_for_message_criticity(message.criticity)
- - if message.message_attributes["line"]
+ - if message.message_attributes && message.message_attributes["line"]
.col-md-1= "L. #{message.message_attributes["line"]}"
.col-md-5= export_message_content message
- else
diff --git a/app/views/stop_areas/_form.html.slim b/app/views/stop_areas/_form.html.slim
index d6682ef70..1cba88f94 100644
--- a/app/views/stop_areas/_form.html.slim
+++ b/app/views/stop_areas/_form.html.slim
@@ -1,9 +1,7 @@
= simple_form_for [@stop_area_referential, @stop_area], html: {class: 'form-horizontal', id: 'stop_area_form'}, wrapper: :horizontal_form do |f|
.row
.col-lg-12
- /- if !manage_itl && @map
- if !manage_itl
- /= @map.to_html
= f.input :id, as: :hidden
= f.input :name, :input_html => {:title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.stop_area.name")}
- if has_feature?(:stop_area_localized_names)
diff --git a/app/views/vehicle_journey_imports/new.html.slim b/app/views/vehicle_journey_imports/new.html.slim
index 6220de273..923fd8b7f 100644
--- a/app/views/vehicle_journey_imports/new.html.slim
+++ b/app/views/vehicle_journey_imports/new.html.slim
@@ -1,11 +1,9 @@
-= title_tag t('vehicle_journey_imports.new.title')
-
.main_actions
= semantic_form_for [@referential, @line, @route, @vehicle_journey_import] do |form|
= form.inputs do
= form.input :file, as: :file, input_html: { title: "#{t('.tooltip.file')}", 'data-placement': "right", 'data-toggle': "tooltip", 'data-trigger': "hover" }
-
+
= form.actions do
= form.action :submit, as: :button , label: t('formtastic.import')
- = form.action :cancel, as: :link \ No newline at end of file
+ = form.action :cancel, as: :link
diff --git a/app/views/vehicle_journeys/_form.html.slim b/app/views/vehicle_journeys/_form.html.slim
index ca200a5f7..a412743aa 100644
--- a/app/views/vehicle_journeys/_form.html.slim
+++ b/app/views/vehicle_journeys/_form.html.slim
@@ -10,7 +10,6 @@
= form.input :transport_mode, include_blank: false
= form.input :mobility_restricted_suitability, as: :select, :collection => [[vehicle_journey.human_attribute_name("accessible"), true], [vehicle_journey.human_attribute_name("not_accessible"), false]], :include_blank => true
= form.input :flexible_service, as: :select, :collection => [[vehicle_journey.human_attribute_name("on_demand_fs"), true], [vehicle_journey.human_attribute_name("regular_fs"), false]], :include_blank => true
- = form.input :status_value
= form.input :facility
= form.input :vehicle_type_identifier
= form.input :objectid, :required => !vehicle_journey.new_record?, :input_html => { :title => t("formtastic.titles#{format_restriction_for_locales(@referential)}.vehicle_journey.objectid")}
diff --git a/app/views/vehicle_journeys/_show_details.html.slim b/app/views/vehicle_journeys/_show_details.html.slim
index d9e4110c9..e46775975 100644
--- a/app/views/vehicle_journeys/_show_details.html.slim
+++ b/app/views/vehicle_journeys/_show_details.html.slim
@@ -54,10 +54,6 @@
= vehicle_journey.comment
p
- label = "#{vehicle_journey.human_attribute_name('status_value')} : "
- = vehicle_journey.status_value
-
- p
label = "#{vehicle_journey.human_attribute_name('facility')} : "
= vehicle_journey.facility
diff --git a/app/views/workbenches/show.html.slim b/app/views/workbenches/show.html.slim
index 5c2468296..8312338d0 100644
--- a/app/views/workbenches/show.html.slim
+++ b/app/views/workbenches/show.html.slim
@@ -7,6 +7,7 @@
= link_to t('workbenches.actions.configure'), edit_workbench_path(@workbench), class: 'btn btn-primary'
- if policy(Referential).create?
= link_to t('actions.import'), workbench_imports_path(@workbench), class: 'btn btn-primary'
+ = link_to t('actions.export'), workbench_exports_path(@workbench), class: 'btn btn-primary'
= link_to t('actions.add'), new_workbench_referential_path(@workbench), class: 'btn btn-primary'
= link_to t('workbenches.actions.show_output'), workbench_output_path(@workbench), class: 'btn btn-primary'