From b27bd0e1f0125d4e3f971c168475bc9ff4a30362 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Mon, 21 Feb 2022 23:05:14 +0100
Subject: [PATCH] Beautify event full page
---
aleksis/apps/paweljong/forms.py | 3 +-
.../templates/paweljong/event/full.html | 119 +++++++++---------
2 files changed, 59 insertions(+), 63 deletions(-)
diff --git a/aleksis/apps/paweljong/forms.py b/aleksis/apps/paweljong/forms.py
index dff9529..06cc921 100644
--- a/aleksis/apps/paweljong/forms.py
+++ b/aleksis/apps/paweljong/forms.py
@@ -1,5 +1,6 @@
from django import forms
from django.forms import fields
+from django.utils import dateformat, formats
from django.utils.translation import ugettext_lazy as _
from allauth.account.views import SignupForm
@@ -381,7 +382,7 @@ class RegisterEventConsent(ExtensibleForm):
label=_(
"I confirm that the retraction of the registration is not possible anymore "
"after {}"
- ).format(event.date_retraction),
+ ).format(dateformat.format(event.date_retraction, formats.get_format('DATE_FORMAT'))),
)
self.fields["retraction_deadline"] = field_instance
node = Row("retraction_deadline")
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/full.html b/aleksis/apps/paweljong/templates/paweljong/event/full.html
index a50e0c3..5e07852 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event/full.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event/full.html
@@ -1,5 +1,5 @@
{% extends "core/base.html" %}
-{% load material_form i18n any_js coerce static %}
+{% load material_form i18n any_js coerce static html_helpers %}
{% block browser_title %}{% blocktrans %}Event{% endblocktrans %} {{ event.display_name }}{% endblock %}
@@ -9,67 +9,62 @@
{% block content %}
- <div class="card">
- <div class="card-content">
- <span class="card-title">
- {{ event.display_name }}
- </span>
- <div class="row">
- <div class="col s1">
- <time datetime="{{ event.date_event|date:'Y-m-d' }}" class="icon">
- <em>{{ event.date_event|date:'l' }}</em>
- <strong>{{ event.date_event|date:'F' }}</strong>
- <span>{{ event.date_event|date:'d' }}</span>
- </time>
- </div>
- <div class="col s11">
- <p>{{ event.description }}</p>
+<div class="row">
+ <div class="container">
+ <div class="card">
+ <div class="card-content">
+ <span class="card-title">
+ {{ event.display_name }}
+ </span>
+ <div class="row">
+ <div class="col s12">
+ <p>{{ event.description }}</p>
+ <table>
+ <tr>
+ <td><i class="material-icons small">event</i></td>
+ <td>{{ event.date_event }}</td>
+ <td><i class="material-icons small">location_on</i></td>
+ <td>{{ event.place }}</td>
+ </tr>
+ <tr>
+ <td><i class="material-icons small">edit_calendar</i></td>
+ <td colspan="2">{% trans "Registration open until" %}:</td>
+ <td>{{ event.date_registration }}</td>
+ </tr>
+ <tr>
+ <td><i class="material-icons small">money</i></td>
+ <td colspan="2">{% trans "Participation fee (all inclusive)" %}</td>
+ <td>{{ event.cost }}</td>
+ </tr>
+ <tr>
+ <td><i class="material-icons small">group</i></td>
+ <td>{{ event.linked_group.members.count }}</td>
+ <td colspan="2">{% trans "of" %} {{ event.max_participants }}</td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <div class="progress">
+ <div class="determinate" style="min-width: 2em;width:{{ event.booked_percentage|coerce_max:100|floatformat:0 }}%">
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+ <div class="card-action">
+ {% if can_register and not is_authenticated %}
+ <a href="{% url "register_event_by_slug_start" event.slug %}">{% trans "Register now" %}</a>
+ {% elif can_register and is_authenticated %}
+ <a href="{% url "register_event_by_slug" event.slug %}">{% trans "Register now" %}</a>
+ {% else %}
+ <a href="#">{% trans "Not available" %}</a>
+ {% endif %}
+ </div>
+ </div>
- <table>
- <tr>
- <td><i class="material-icons small">event</i></td>
- <td>{{ event.date_event }}</td>
- <td><i class="material-icons small">location_on</i></td>
- <td>{{ event.place }}</td>
- </tr>
- <tr>
- <td><i class="material-icons small">edit_calendar</i></td>
- <td colspan="2">{% trans "Registration open until" %}:</td>
- <td>{{ event.date_registration }}</td>
- </tr>
- <tr>
- <td><i class="material-icons small">money</i></td>
- <td colspan="2">{% trans "Participation fee (all inclusive)" %}</td>
- <td>{{ event.cost }}</td>
- </tr>
- <tr>
- <td><i class="material-icons small">group</i></td>
- <td>{{ event.linked_group.members.count }}</td>
- <td colspan="2">{% trans "of" %} {{ event.max_participants }}</td>
- </tr>
- <tr>
- <td colspan="4">
- <div class="progress">
- <div class="determinate" style="min-width: 2em;width:{{ event.booked_percentage|coerce_max:100|floatformat:0 }}%">
- </div>
- </div>
- </td>
- </tr>
- </table>
- </div>
- </div>
- </div>
- <div class="card-action">
- {% if can_register and not is_authenticated %}
- <a href="{% url "register_event_by_slug_start" event.slug %}">{% trans "Register now" %}</a>
- {% elif can_register and is_authenticated %}
- <a href="{% url "register_event_by_slug" event.slug %}">{% trans "Register now" %}</a>
- {% else %}
- <a href="#">{% trans "Not available" %}</a>
- {% endif %}
- </div>
+ {{ event.information|add_class_to_el:"ul, browser-default"|safe }}
</div>
-
- {{ event.information | safe }}
-
+</div>
{% endblock %}
--
GitLab