From ab347d565685cd6beeba59cc33bdb0ec4cd390f9 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Mon, 11 Nov 2024 23:57:20 +0100 Subject: [PATCH] =?UTF-8?q?Int=C3=A9gration=20smartphone?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/static/style.scss | 5 ++ .../agenda_culturel/batch-imports-inc.html | 2 + .../agenda_culturel/recent-activity-inc.html | 64 ++++++++++--------- .../templatetags/event_extra.py | 4 +- 4 files changed, 42 insertions(+), 33 deletions(-) diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 14c91e5..fd68e07 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -1026,6 +1026,11 @@ article form p .recurrence-widget { } +.large-table { + overflow-x: scroll; + width: 100%; +} + .container-fluid article form .hidden { display: none; } diff --git a/src/agenda_culturel/templates/agenda_culturel/batch-imports-inc.html b/src/agenda_culturel/templates/agenda_culturel/batch-imports-inc.html index 98473fc..ddbd57a 100644 --- a/src/agenda_culturel/templates/agenda_culturel/batch-imports-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/batch-imports-inc.html @@ -1,3 +1,4 @@ +
@@ -54,3 +55,4 @@ {% endif %}
+
\ No newline at end of file diff --git a/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html b/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html index d346d81..33d5e03 100644 --- a/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/recent-activity-inc.html @@ -1,35 +1,37 @@ {% if modifications|length == 0 %} Aucune activité dans la période choisie {% else %} - - - - - - - - - - - - {% for m in modifications %} - - - - - - - - {% endfor %} - {% if next %} - - - - - - - - {% endif %} - -
{% if modifications.0.when.0 == modifications.0.when.1 %}Date{% else %}Semaine{% endif %}Créations manuellesImports manuelsImports automatiquesCréations de copies locales
{{ m.when.0|date:'D j b' }}{% if modifications.0.when.0 != modifications.0.when.1 %} - {{ m.when.1|date:'D j b' }}{% endif %}{{ m.nb_manual_creation }}{{ m.nb_manual_import }}{{ m.nb_first_import }}{{ m.nb_local_copies }}
...............
+
+ + + + + + + + + + + + {% for m in modifications %} + + + + + + + + {% endfor %} + {% if next %} + + + + + + + + {% endif %} + +
{% if modifications.0.when.0 == modifications.0.when.1 %}Date{% else %}Semaine{% endif %}Créations manuellesImports manuelsImports automatiquesCréations de copies locales
{{ m.when.0|date:'D j b' }}{% if modifications.0.when.0 != modifications.0.when.1 %} - {{ m.when.1|date:'D j b' }}{% endif %}{{ m.nb_manual_creation }}{{ m.nb_manual_import }}{{ m.nb_first_import }}{{ m.nb_local_copies }}
...............
+
{% endif %} \ No newline at end of file diff --git a/src/agenda_culturel/templatetags/event_extra.py b/src/agenda_culturel/templatetags/event_extra.py index 97e43b6..c4fa932 100644 --- a/src/agenda_culturel/templatetags/event_extra.py +++ b/src/agenda_culturel/templatetags/event_extra.py @@ -57,9 +57,9 @@ def picto_visibility(event, visible=True): if not visible: return "" if event.is_representative(): - return picto_from_name("award", "version mise en avant") + return picto_from_name("award") elif event.masked(): - return picto_from_name("archive", "version non mise en avant") + return picto_from_name("archive") else: return ""