Skip to content

Commit 2d07cff

Browse files
committed
WIP
1 parent 7ea1873 commit 2d07cff

File tree

6 files changed

+30
-9
lines changed

6 files changed

+30
-9
lines changed

core/templatetags/carte_tags.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ def render_acteur(acteur, context):
204204
def acteurs_table(context, acteurs):
205205
return {
206206
"table": {
207-
"caption": "Tableau basique",
207+
# "caption": "Tableau basique",
208208
"header": ["Nom", "Actions", "Caractéristiques", "Distance"],
209209
"content": [render_acteur(acteur, context) for acteur in acteurs],
210-
"extra_classes": "fr-table--multiline qf-w-full",
210+
"extra_classes": "fr-table--multiline fr-table--mode-liste qf-w-full",
211211
}
212212
}

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ default-groups = [
110110
]
111111

112112
[tool.uv.sources]
113-
django-dsfr = { git = "https://github.com/fabienheureux/django-dsfr", branch = "support-custom-attrs-in-components" }
113+
django-dsfr = { git = "https://github.com/fabienheureux/django-dsfr", rev = "6c3f91f282bd24f7e1a0135095138d0ed05ceed3" } # pragma: allowlist secret
114114

115115
[tool.ruff]
116116
# Exclude a variety of commonly ignored directories.

static/to_compile/styles/dsfr-overrides.css

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,20 @@ DSFR customization for tabs
195195
.fr-header__service {
196196
@apply qf-hidden;
197197
}
198+
199+
.fr-table--mode-liste {
200+
thead {
201+
@apply max-md:qf-hidden;
202+
}
203+
tbody {
204+
@apply max-md:qf-flex qf-flex-col qf-gap-1w;
205+
}
206+
207+
tr {
208+
@apply max-md:qf-flex qf-flex-col;
209+
}
210+
211+
.fr-table__content table tbody td {
212+
background: transparent !important;
213+
}
214+
}

templates/ui/components/carte/header.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
{% load dsfr_tags %}
12
<header
23
{# The z-index below can impact the shadow over #}
34
class="{% block header_classes %}qf-z-20{% endblock %} qf-bg-white qf-shadow-lg"
45
>
56
<div
67
class="
7-
qf-flex qf-flex-row sm:qf-items-center"
8+
qf-flex qf-flex-col md:qf-flex-row sm:qf-items-center"
89
>
910

1011
{% if not carte_config or not carte_config.supprimer_branding %}
@@ -61,8 +62,11 @@
6162
{% endif %}
6263
</div>
6364

64-
<div class="-qf-mt-3w qf-pr-2w">
65+
<div class="md:-qf-mt-3w md:qf-pr-2w max-md:qf-px-2w max-md:qf-pb-2w max-md:qf-flex qf-justify-between qf-items-center">
6566
{{ forms.view_mode }}
67+
<div>
68+
{% dsfr_button label="Filtres" extra_classes="fr-btn--sm fr-btn--secondary fr-ml-1w fr-btn--icon-left fr-icon-equalizer-line" data_action="search-solution-form#toggleAdvancedFilters" data_testid="advanced-filters" %}
69+
</div>
6670
</div>
6771
</div>
6872
</header>

templates/ui/components/carte/mode_liste.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{% load carte_tags dsfr_tags %}
22
<div class="qf-flex qf-flex-col qf-gap-1w qf-px-2w">
33
<header class="qf-flex qf-justify-end qf-gap-1w qf-py-2w">
4-
{% dsfr_button label="Filtres" extra_classes="fr-btn--icon-left fr-icon-equalizer-fill fr-btn--secondary" data_action="search-solution-form#toggleAPropos:prevent" %}
4+
{% dsfr_button label="Filtres" extra_classes="fr-btn--icon-left fr-icon-equalizer-fill fr-btn--secondary" data_action="search-solution-form#toggleAdvancedFilters:prevent" data_testid="advanced-filters:prevent" %}
55
{% dsfr_button label="Proposer un nouveau lieu" extra_classes="fr-btn--icon-left fr-icon-add-line" %}
6-
{% dsfr_button label="Infos" extra_classes="fr-btn--icon-left fr-icon-info-line fr-btn--secondary" %}
6+
{% dsfr_button label="Infos" extra_classes="fr-btn--icon-left fr-icon-info-line fr-btn--secondary" data_action="search-solution-form#toggleAPropos:prevent" %}
77
</header>
88
<main>
99
{% acteurs_table paginated_acteurs_obj %}

uv.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)