diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 7c03ce3..34535d9 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -830,6 +830,10 @@ form .buttons [role="button"] { grid-template-columns: 30% auto; align-items: center; } + .grid.two-columns.grid-reverse { + grid-template-columns: 25% auto; + } + } aside nav a.selected { @@ -841,6 +845,10 @@ aside nav a.badge { float: right; } +aside nav.paragraph li a { + display: inline-block; +} + .body-fixed { max-height: 50vh; overflow-y: scroll; diff --git a/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html b/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html index 7f51fab..c307b19 100644 --- a/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/event-location-inc.html @@ -1,9 +1,9 @@ {% if event.exact_location %} {% if nolink %} - {{ event.exact_location.name }}, {{ event.exact_location.city }} + {{ event.exact_location.name }}{% if not nocity %}, {{ event.exact_location.city }}{% endif %} {% else %} - {{ event.exact_location.name }}, {{ event.exact_location.city }} + {{ event.exact_location.name }}{% if not nocity %}, {{ event.exact_location.city }}{% endif %} {% endif %} {% else %} {% if perms.agenda_culturel.change_event and perms.agenda_culturel.change_place %} diff --git a/src/agenda_culturel/templates/agenda_culturel/page-day.html b/src/agenda_culturel/templates/agenda_culturel/page-day.html index 23c2dfc..e5569c7 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-day.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-day.html @@ -33,7 +33,38 @@ -
+
+ +
@@ -66,7 +97,7 @@ {% if events %} {% for event in events %} - {% include "agenda_culturel/single-event/event-in-list-by-day-inc.html" with event=event filter=filter day=day %} + {% include "agenda_culturel/single-event/event-in-list-by-day-inc.html" with event=event filter=filter day=day indexlink=1 %} {% endfor %} {% else %}
@@ -80,37 +111,7 @@
-
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html index e0c2dfd..4bb627b 100644 --- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html +++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-list-by-day-inc.html @@ -4,7 +4,7 @@ {% load event_extra %} {% load tag_extra %} -
+
{% if event|can_show_start_time:day %} {% if event.start_time %}