diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 65ca6cb..9940483 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -24,6 +24,9 @@ $primary-700: #008080; --typography-spacing-vertical: 0.6rem; --font-size: 1.3rem; } + p { + --typography-spacing-vertical: 0.6rem; + } } @@ -84,4 +87,12 @@ body>nav { @extend .outline; font-size: 90%; padding: 0.15em 0.4em 0.3em 0.4em; +} + +ul { + margin-left: 0.5em; +} + +span.small-cat { + cursor: default; } \ No newline at end of file diff --git a/src/agenda_culturel/templates/agenda_culturel/event-inc.html b/src/agenda_culturel/templates/agenda_culturel/event-inc.html new file mode 100644 index 0000000..bb1aeaa --- /dev/null +++ b/src/agenda_culturel/templates/agenda_culturel/event-inc.html @@ -0,0 +1,67 @@ +{% load cat_extra %} + + +
+ {% comment %} + Le début contient les informations principales: titre, date + {% endcomment %} + {% if display in "in list by day" %} + {% if display == "in list" %}

{% else %}

{% endif %} + {% if not event.end_day and event.start_time %}{{ event.start_time }}{% endif %} + {{ event.title }} + {% if display == "in list" %}

{% else %}{% endif %} + {% if event.end_day %}

Cet événement dure du {{ event.start_day |date:"l j F" }} au {{ event.end_day |date:"l j F" }}

{% endif %} + {% else %} +
+

{{ event.title }}

+ +
+ {% endif %} + + + + + {% comment %} + On affiche le corps du message avec plus ou moins de longueur + {% endcomment %} + {% if display in "in list by day" %} +

{{ event.description |truncatewords:20 }}

+ {% else %} +

{{ event.description }}

+ {% endif %} + + + + + {% comment %} + On affiche le pied qui contient les informations de tags, catégories, etc + {% endcomment %} + +
+ diff --git a/src/agenda_culturel/templates/agenda_culturel/event.html b/src/agenda_culturel/templates/agenda_culturel/event.html deleted file mode 100644 index 9f4b747..0000000 --- a/src/agenda_culturel/templates/agenda_culturel/event.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "agenda_culturel/page.html" %} - -{% block title %}{{ object.title }}{% endblock %} - -{% load cat_extra %} - - -{% block content %} - -
-
-

{{ object.title }}

- -
- -

{{ event.description }}

- - -
- -{% endblock %} \ No newline at end of file diff --git a/src/agenda_culturel/templates/agenda_culturel/page-event.html b/src/agenda_culturel/templates/agenda_culturel/page-event.html new file mode 100644 index 0000000..7f89991 --- /dev/null +++ b/src/agenda_culturel/templates/agenda_culturel/page-event.html @@ -0,0 +1,10 @@ +{% extends "agenda_culturel/page.html" %} + +{% block title %}{{ object.title }}{% endblock %} + + +{% block content %} + +{% include "agenda_culturel/event-inc.html" with event=event %} + +{% endblock %} \ No newline at end of file diff --git a/src/agenda_culturel/templates/agenda_culturel/page-events.html b/src/agenda_culturel/templates/agenda_culturel/page-events.html index 24eccfe..2ab499f 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-events.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-events.html @@ -80,27 +80,7 @@ {% if events_date %}

{{ date |date:"l j F"| capfirst }}

{% for event in events_date %} -
-

- {% if not event.end_day and event.start_time %}{{ event.start_time }}{% endif %} - {{ event.title }}

- {% if event.end_day %}

Cet événement dure du {{ event.start_day |date:"l j F" }} au {{ event.end_day |date:"l j F" }}

{% endif %} -

{{ event.description |truncatewords:20 }}

- - -
+ {% include "agenda_culturel/event-inc.html" with event=event display="in list by day" mode=selected_mode category=category %} {% endfor %} {% endif %} {% endwith %} diff --git a/src/agenda_culturel/templates/agenda_culturel/tag.html b/src/agenda_culturel/templates/agenda_culturel/tag.html index 672f5c1..d70dda7 100644 --- a/src/agenda_culturel/templates/agenda_culturel/tag.html +++ b/src/agenda_culturel/templates/agenda_culturel/tag.html @@ -10,32 +10,7 @@

Étiquette {{ tag }}

{% for event in events %} -
-

- {% if not event.end_day and event.start_time %}{{ event.start_time }}{% endif %} - {{ event.title }}

- - -

{{ event.description |truncatewords:20 }}

- - -
+{% include "agenda_culturel/event-inc.html" with event=event display="in list" %} {% endfor %} {% endblock %} \ No newline at end of file diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index 0740a11..c516667 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -102,7 +102,7 @@ def tag_list(request): class EventDetailView(DetailView): model = Event - template_name = "agenda_culturel/event.html" + template_name = "agenda_culturel/page-event.html" def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs)