Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Améliorations de la modale localisation #1125

Merged
merged 8 commits into from
Jan 7, 2025
Merged

Améliorations de la modale localisation #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
218c4ed
section voie
Lealefoulon Dec 18, 2024
d1dfc28
modification messages
Lealefoulon Dec 18, 2024
9bbc654
input size
Lealefoulon Dec 18, 2024
e3b39d7
Merge branch 'main' into fix/improve-modal-location
Lealefoulon Jan 2, 2025
e4f9e23
translation
Lealefoulon Jan 2, 2025
1d64190
Merge branch 'main' into fix/improve-modal-location
Lealefoulon Jan 6, 2025
6a5d8bb
font-weight bold
Lealefoulon Jan 6, 2025
1e8ee2a
Merge branch 'main' into fix/improve-modal-location
Lealefoulon Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions templates/regulation/fragments/_measure_form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
<li role="status" data-autocomplete-target="status"></li>
</ul>
</div>

<hr class="fr-mt-3w" />
<fieldset
aria-labelledby="regulation-location-{{ locationIndex }}-{{ roadType }}-reference-point"
data-reset-target="element"
Expand All @@ -233,7 +233,7 @@
class="fr-mt-2w"
aria-labelledby="regulation-location-{{ locationIndex }}-{{ roadType }}-reference-point-start-legend"
>
<legend id="regulation-location-{{ locationIndex }}-{{ roadType }}-reference-point-start-legend">
<legend id="regulation-location-{{ locationIndex }}-{{ roadType }}-reference-point-start-legend" class="fr-fieldset__legend">
{{ 'regulation.location.referencePoint.from'|trans }}
</legend>
<div class="fr-grid-row fr-grid-row--gutters">
Expand All @@ -246,7 +246,7 @@
class="fr-mt-2w fr-mb-2w"
aria-labelledby="regulation-location-{{ locationIndex }}-{{ roadType }}-reference-point-end-legend"
>
<legend id="regulation-location-{{ locationIndex }}-{{ roadType }}-reference-point-end-legend">
<legend id="regulation-location-{{ locationIndex }}-{{ roadType }}-reference-point-end-legend" class="fr-fieldset__legend">
{{ 'regulation.location.referencePoint.to'|trans }}
</legend>
<div class="fr-grid-row fr-grid-row--gutters">
Expand Down Expand Up @@ -402,15 +402,18 @@
'data-action': 'change->condition#dispatchFromCheckboxChange condition:yes->form-reveal#close condition:no->form-reveal#open'
}
}) }}

<hr class="fr-mt-3w" />
Lealefoulon marked this conversation as resolved.
Show resolved Hide resolved
<fieldset
aria-labelledby="{{ form.namedStreet.vars.id }}-points-legend"
data-form-reveal-target="section formControl"
{% if form.namedStreet.isEntireStreet.vars.checked %}hidden disabled{% endif %}
>
<legend id="{{ form.namedStreet.vars.id }}-points-legend" class="app-sr-only">
<legend id="{{ form.namedStreet.vars.id }}-points-legend">
{{ 'regulation.location.named_street.points'|trans }}
</legend>
<div class="fr-hint-text help-text">
{{ 'regulation.location.named_street.points.description'|trans }}
</div>
{% include 'location/named_street/points_form.html.twig' with { form } only %}
</fieldset>
</div>
Expand Down
18 changes: 11 additions & 7 deletions translations/messages.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,11 +547,11 @@
</trans-unit>
<trans-unit id="regulation.location.referencePoint.from">
<source>regulation.location.referencePoint.from</source>
<target>Point de début</target>
<target>Point A</target>
</trans-unit>
<trans-unit id="regulation.location.referencePoint.to">
<source>regulation.location.referencePoint.to</source>
<target>Point de fin</target>
<target>Point B</target>
</trans-unit>
<trans-unit id="regulation.location.road.side">
<source>regulation.location.road.side</source>
Expand Down Expand Up @@ -587,7 +587,7 @@
</trans-unit>
<trans-unit id="regulation.location.referencePoint.pointNumber.help">
<source>regulation.location.referencePoint.pointNumber.help</source>
<target>Indiquez le numéro du point</target>
<target>Numéro du point de repère</target>
</trans-unit>
<trans-unit id="regulation.location.referencePoint.abscissa">
<source>regulation.location.referencePoint.abscissa</source>
Expand All @@ -611,7 +611,7 @@
</trans-unit>
<trans-unit id="regulation.location.road.type.lane">
<source>regulation.location.road.type.lane</source>
<target>Voie</target>
<target>Voie (rue, avenue, boulevard)</target>
</trans-unit>
<trans-unit id="regulation.location.road.type.rawGeoJSON">
<source>regulation.location.road.type.rawGeoJSON</source>
Expand Down Expand Up @@ -703,19 +703,23 @@
</trans-unit>
<trans-unit id="regulation.location.named_street.points">
<source>regulation.location.named_street.points</source>
<target>Points de la section concernée</target>
<target>Section concernée</target>
</trans-unit>
<trans-unit id="regulation.location.named_street.points.description">
<source>regulation.location.named_street.points.description</source>
<target>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.</target>
</trans-unit>
<trans-unit id="regulation.location.named_street.point_type">
<source>regulation.location.named_street.point_type</source>
<target>Type de point</target>
<target>Type</target>
</trans-unit>
<trans-unit id="regulation.location.named_street.point_type.placeholder">
<source>regulation.location.named_street.point_type.placeholder</source>
<target>Sélectionner une option...</target>
</trans-unit>
<trans-unit id="regulation.location.named_street.point_type.houseNumber">
<source>regulation.location.named_street.point_type.houseNumber</source>
<target>Numéro d'adresse</target>
<target>Numéro de rue</target>
</trans-unit>
<trans-unit id="regulation.location.named_street.point_type.intersection">
<source>regulation.location.named_street.point_type.intersection</source>
Expand Down
Loading