diff --git a/beesgospel/static/css/main.css b/beesgospel/static/css/main.css index ff9d1be..da712cf 100644 --- a/beesgospel/static/css/main.css +++ b/beesgospel/static/css/main.css @@ -73,6 +73,10 @@ nav { .left-red { border-left: 2px solid red; } +.left-red-forcepad { + margin-left: -12px; + padding-left: 12px; +} .agenda_line { margin-right: 7em !important; } .agenda_container > div:first-of-type { margin-top: 7em !important; } diff --git a/beesgospel/static/img/abeille.png b/beesgospel/static/img/abeille.png deleted file mode 100644 index 480ce4f..0000000 Binary files a/beesgospel/static/img/abeille.png and /dev/null differ diff --git a/beesgospel/static/img/abeille.webp b/beesgospel/static/img/abeille.webp new file mode 100644 index 0000000..f89fd38 Binary files /dev/null and b/beesgospel/static/img/abeille.webp differ diff --git a/beesgospel/static/img/twint.jpg b/beesgospel/static/img/twint.jpg new file mode 100644 index 0000000..d0859c2 Binary files /dev/null and b/beesgospel/static/img/twint.jpg differ diff --git a/beesgospel/static/songs/WeShallOvercome-Extrait.mp3 b/beesgospel/static/songs/WeShallOvercome-Extrait.mp3 new file mode 100644 index 0000000..1d341de Binary files /dev/null and b/beesgospel/static/songs/WeShallOvercome-Extrait.mp3 differ diff --git a/beesgospel/views.py b/beesgospel/views.py index f556d3c..5d6c2e4 100644 --- a/beesgospel/views.py +++ b/beesgospel/views.py @@ -17,6 +17,18 @@ class HomeView(TemplateView): } +class PresentationView(TemplateView): + template_name="presentation.html" + + def get_context_data(self, **kwargs): + return { + **super().get_context_data(**kwargs), + "next_event": Agenda.objects.filter( + date_heure__date__gte=date.today(), prive=False, + ).order_by("date_heure").first(), + } + + class AgendaView(ListView): model = Agenda template_name = "agenda.html" @@ -35,7 +47,7 @@ class MediaView(ListView): template_name = "media.html" def get_queryset(self): - qs = Document.objects.all().order_by("-quand") + qs = Document.objects.all().order_by("-quand", "titre") if not self.request.user.is_authenticated: qs = qs.filter(prive=False) return qs diff --git a/common/urls.py b/common/urls.py index ff3fb51..e98c37f 100644 --- a/common/urls.py +++ b/common/urls.py @@ -9,7 +9,7 @@ urlpatterns = [ path("accounts/", include("django.contrib.auth.urls")), path("", views.HomeView.as_view(), name="home"), path("v2", TemplateView.as_view(template_name="index2.html"), name="home"), - path("presentation/", TemplateView.as_view(template_name="presentation.html"), name="presentation"), + path("presentation/", views.PresentationView.as_view(), name="presentation"), path("contact/", TemplateView.as_view(template_name="contact.html"), name="contact"), path("membres/", views.EspaceMembresView.as_view(), name="membres"), path("membres/liste/", views.ListeMembresView.as_view(), name="liste-membres"), diff --git a/templates/base.html b/templates/base.html index 6034617..c2ab07a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -13,7 +13,7 @@