From 218c4edbc871e17bb63550f192b7318522a9798a Mon Sep 17 00:00:00 2001 From: Lealefoulon Date: Wed, 18 Dec 2024 12:39:00 +0100 Subject: [PATCH 1/5] section voie --- .../regulation/fragments/_measure_form.html.twig | 7 +++++-- translations/messages.fr.xlf | 12 ++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/templates/regulation/fragments/_measure_form.html.twig b/templates/regulation/fragments/_measure_form.html.twig index 394ef6d06..ec8078ccd 100644 --- a/templates/regulation/fragments/_measure_form.html.twig +++ b/templates/regulation/fragments/_measure_form.html.twig @@ -402,15 +402,18 @@ 'data-action': 'change->condition#dispatchFromCheckboxChange condition:yes->form-reveal#close condition:no->form-reveal#open' } }) }} - +
- + {{ 'regulation.location.named_street.points'|trans }} +
+ {{ 'regulation.location.named_street.points.description'|trans }} +
{% include 'location/named_street/points_form.html.twig' with { form } only %}
diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf index 868e7be03..4f42bf66d 100644 --- a/translations/messages.fr.xlf +++ b/translations/messages.fr.xlf @@ -611,7 +611,7 @@ regulation.location.road.type.lane - Voie + Voie (rue, avenue, boulevard) regulation.location.road.type.rawGeoJSON @@ -703,11 +703,15 @@ regulation.location.named_street.points - Points de la section concernée + Section concernée + + + regulation.location.named_street.points.description + Indiquez les points de début et fin sur la voie concernée. Un point peut être un numéro de rue ou une intersection. regulation.location.named_street.point_type - Type de point + Type regulation.location.named_street.point_type.placeholder @@ -715,7 +719,7 @@ regulation.location.named_street.point_type.houseNumber - Numéro d'adresse + Numéro de rue regulation.location.named_street.point_type.intersection From d1dfc28b07f7043d50eb75a89fb0b45bee56ff65 Mon Sep 17 00:00:00 2001 From: Lealefoulon Date: Wed, 18 Dec 2024 15:55:09 +0100 Subject: [PATCH 2/5] modification messages --- translations/messages.fr.xlf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf index 4f42bf66d..e2b83c6ce 100644 --- a/translations/messages.fr.xlf +++ b/translations/messages.fr.xlf @@ -727,11 +727,11 @@ regulation.location.named_street.from_point - Point A + Point de début > Point A regulation.location.named_street.to_point - Point B + Point de fin > Point B regulation.location.named_street.house_number From 9bbc654b0240f75015e627c409f9c364dc024848 Mon Sep 17 00:00:00 2001 From: Lealefoulon Date: Wed, 18 Dec 2024 16:35:35 +0100 Subject: [PATCH 3/5] input size --- .../regulation/fragments/_measure_form.html.twig | 12 ++++++------ translations/messages.fr.xlf | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/regulation/fragments/_measure_form.html.twig b/templates/regulation/fragments/_measure_form.html.twig index ec8078ccd..d4849de08 100644 --- a/templates/regulation/fragments/_measure_form.html.twig +++ b/templates/regulation/fragments/_measure_form.html.twig @@ -237,9 +237,9 @@ {{ 'regulation.location.referencePoint.from'|trans }}
- {{ form_row(form[roadType].fromPointNumber, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-input'}}) }} - {{ form_row(form[roadType].fromSide, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-select'}}) }} - {{ form_row(form[roadType].fromAbscissa, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-input'}}) }} + {{ form_row(form[roadType].fromPointNumber, { row_attr: {class:'fr-col-12 fr-col-md-3'}, attr: {class: 'fr-input'}}) }} + {{ form_row(form[roadType].fromSide, { row_attr: {class:'fr-col-12 fr-col-md-6'}, attr: {class: 'fr-select'}}) }} + {{ form_row(form[roadType].fromAbscissa, { row_attr: {class:'fr-col-12 fr-col-md-3'}, attr: {class: 'fr-input'}}) }}
- {{ form_row(form[roadType].toPointNumber, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-input'}}) }} - {{ form_row(form[roadType].toSide, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-select'}}) }} - {{ form_row(form[roadType].toAbscissa, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-input'}}) }} + {{ form_row(form[roadType].toPointNumber, { row_attr: {class:'fr-col-12 fr-col-md-3'}, attr: {class: 'fr-input'}}) }} + {{ form_row(form[roadType].toSide, { row_attr: {class:'fr-col-12 fr-col-md-6'}, attr: {class: 'fr-select'}}) }} + {{ form_row(form[roadType].toAbscissa, { row_attr: {class:'fr-col-12 fr-col-md-3'}, attr: {class: 'fr-input'}}) }}
{{ form_row(form[roadType].direction, { group_class: 'fr-select-group', widget_class: 'fr-select' }) }} diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf index e2b83c6ce..81189f885 100644 --- a/translations/messages.fr.xlf +++ b/translations/messages.fr.xlf @@ -547,11 +547,11 @@
regulation.location.referencePoint.from - Point de début + Point A regulation.location.referencePoint.to - Point de fin + Point B regulation.location.road.side @@ -587,7 +587,7 @@ regulation.location.referencePoint.pointNumber.help - Indiquez le numéro du point + Numéro du point de repère regulation.location.referencePoint.abscissa From e4f9e23bcb48845711b44b753bdae9eafacfb803 Mon Sep 17 00:00:00 2001 From: Lealefoulon Date: Thu, 2 Jan 2025 14:45:12 +0100 Subject: [PATCH 4/5] translation --- .../regulation/fragments/_measure_form.html.twig | 12 ++++++------ translations/messages.fr.xlf | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/regulation/fragments/_measure_form.html.twig b/templates/regulation/fragments/_measure_form.html.twig index d4849de08..ec8078ccd 100644 --- a/templates/regulation/fragments/_measure_form.html.twig +++ b/templates/regulation/fragments/_measure_form.html.twig @@ -237,9 +237,9 @@ {{ 'regulation.location.referencePoint.from'|trans }}
- {{ form_row(form[roadType].fromPointNumber, { row_attr: {class:'fr-col-12 fr-col-md-3'}, attr: {class: 'fr-input'}}) }} - {{ form_row(form[roadType].fromSide, { row_attr: {class:'fr-col-12 fr-col-md-6'}, attr: {class: 'fr-select'}}) }} - {{ form_row(form[roadType].fromAbscissa, { row_attr: {class:'fr-col-12 fr-col-md-3'}, attr: {class: 'fr-input'}}) }} + {{ form_row(form[roadType].fromPointNumber, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-input'}}) }} + {{ form_row(form[roadType].fromSide, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-select'}}) }} + {{ form_row(form[roadType].fromAbscissa, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-input'}}) }}
- {{ form_row(form[roadType].toPointNumber, { row_attr: {class:'fr-col-12 fr-col-md-3'}, attr: {class: 'fr-input'}}) }} - {{ form_row(form[roadType].toSide, { row_attr: {class:'fr-col-12 fr-col-md-6'}, attr: {class: 'fr-select'}}) }} - {{ form_row(form[roadType].toAbscissa, { row_attr: {class:'fr-col-12 fr-col-md-3'}, attr: {class: 'fr-input'}}) }} + {{ form_row(form[roadType].toPointNumber, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-input'}}) }} + {{ form_row(form[roadType].toSide, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-select'}}) }} + {{ form_row(form[roadType].toAbscissa, { row_attr: {class:'fr-col-12 fr-col-md-4'}, attr: {class: 'fr-input'}}) }}
{{ form_row(form[roadType].direction, { group_class: 'fr-select-group', widget_class: 'fr-select' }) }} diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf index 3a17c2fdc..d5bbc0edf 100644 --- a/translations/messages.fr.xlf +++ b/translations/messages.fr.xlf @@ -727,11 +727,11 @@
regulation.location.named_street.from_point - Point de début > Point A + Point A regulation.location.named_street.to_point - Point de fin > Point B + Point B regulation.location.named_street.house_number From 6a5d8bb8b492d8bd5360704efd699a474ef37ab3 Mon Sep 17 00:00:00 2001 From: Lealefoulon Date: Mon, 6 Jan 2025 15:30:24 +0100 Subject: [PATCH 5/5] font-weight bold --- templates/regulation/fragments/_measure_form.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/regulation/fragments/_measure_form.html.twig b/templates/regulation/fragments/_measure_form.html.twig index ec8078ccd..98291a740 100644 --- a/templates/regulation/fragments/_measure_form.html.twig +++ b/templates/regulation/fragments/_measure_form.html.twig @@ -216,7 +216,7 @@
  • - +
    - + {{ 'regulation.location.referencePoint.from'|trans }}
    @@ -246,7 +246,7 @@ class="fr-mt-2w fr-mb-2w" aria-labelledby="regulation-location-{{ locationIndex }}-{{ roadType }}-reference-point-end-legend" > - + {{ 'regulation.location.referencePoint.to'|trans }}