diff options
| author | jpl | 2017-07-03 16:23:25 +0200 |
|---|---|---|
| committer | jpl | 2017-07-03 16:23:25 +0200 |
| commit | 38df58eb13f8a36f6be73c1624744a0d03e1e1a3 (patch) | |
| tree | ede91b40611688ea3fceaaca72f458f8a202c4da | |
| parent | 9ada6224335862b51c460dc78d7487596323fef8 (diff) | |
| download | chouette-core-38df58eb13f8a36f6be73c1624744a0d03e1e1a3.tar.bz2 | |
Refs #3953: Fix wrong DOM on ITL
| -rw-r--r-- | app/views/routing_constraint_zones/_stop_points.html.slim | 11 | ||||
| -rw-r--r-- | app/views/routing_constraint_zones/edit.html.slim | 53 | ||||
| -rw-r--r-- | app/views/routing_constraint_zones/new.html.slim | 2 |
3 files changed, 35 insertions, 31 deletions
diff --git a/app/views/routing_constraint_zones/_stop_points.html.slim b/app/views/routing_constraint_zones/_stop_points.html.slim index e6ea62ee2..10c1d4900 100644 --- a/app/views/routing_constraint_zones/_stop_points.html.slim +++ b/app/views/routing_constraint_zones/_stop_points.html.slim @@ -1,10 +1,13 @@ - stop_points.each do |stop_point| - .wrapper + .wrapper div - = link_to stop_point.stop_area.name, referential_stop_area_path(@referential, stop_point.stop_area.id) + = link_to referential_stop_area_path(@referential, stop_point.stop_area.id), class: 'navlink', title: "Voir l'arrêt" do + span = stop_point.stop_area.name + + div + span + = "#{stop_point.stop_area.city_name} (#{stop_point.stop_area.zip_code})" div - = "#{stop_point.stop_area.city_name} ( #{stop_point.stop_area.zip_code} )" - div span.has_radio = check_box_tag( "routing_constraint_zone[stop_point_ids][]", "#{stop_point.id}", @routing_constraint_zone.stop_point_ids && @routing_constraint_zone.stop_point_ids.include?(stop_point.id) ) span.radio-label diff --git a/app/views/routing_constraint_zones/edit.html.slim b/app/views/routing_constraint_zones/edit.html.slim index e14cc48b3..4fe2786a3 100644 --- a/app/views/routing_constraint_zones/edit.html.slim +++ b/app/views/routing_constraint_zones/edit.html.slim @@ -6,33 +6,34 @@ / 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 - = simple_form_for [@referential, @line, @routing_constraint_zone], html: {class: 'form-horizontal', id: 'itl_form'}, wrapper: :horizontal_form do |form| + .container-fluid + .row + .col-lg-8.col-lg-offset-2.col-md-8.col-md-offset-2.col-sm-10.col-sm-offset-1 + = simple_form_for [@referential, @line, @routing_constraint_zone], html: {class: 'form-horizontal', id: 'itl_form'}, wrapper: :horizontal_form do |form| - .row - .col-lg-12 - = form.input :name - = form.association :route, collection: @line.routes, disabled: true + .row + .col-lg-12 + = form.input :name + = form.association :route, collection: @line.routes, disabled: true - .separator + .separator - - @routing_constraint_zone.errors[:stop_point_ids].each do |error_message| - = error_message + - @routing_constraint_zone.errors[:stop_point_ids].each do |error_message| + .alert.alert-danger = error_message - #ITL_stoppoints - .subform - .nested-head - .wrapper - div - .form-group - label.control-label Arrêt - div - .form-group - label.control-label Commune - div - .nested-fields - = render( partial: 'routing_constraint_zones/stop_points', object: @routing_constraint_zone.route.stop_points) - - = form.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'itl_form' + #ITL_stoppoints + .subform + .nested-head + .wrapper + div + .form-group + label.control-label Arrêt + div + .form-group + label.control-label Commune + div + + .nested-fields + = render( partial: 'routing_constraint_zones/stop_points', object: @routing_constraint_zone.route.stop_points) + + = form.button :submit, t('actions.submit'), class: 'btn btn-default formSubmitr', form: 'itl_form' diff --git a/app/views/routing_constraint_zones/new.html.slim b/app/views/routing_constraint_zones/new.html.slim index 0b527467d..ab7143a76 100644 --- a/app/views/routing_constraint_zones/new.html.slim +++ b/app/views/routing_constraint_zones/new.html.slim @@ -17,7 +17,7 @@ .separator - @routing_constraint_zone.errors[:stop_point_ids].each do |error_message| - = error_message + .alert.alert-danger = error_message #ITL_stoppoints .subform |
