From f8508ad87627fbe0ed5252eff5e73e540c815e98 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Sun, 17 Dec 2023 12:43:29 +0000 Subject: [PATCH] Updates to all three layouts --- PyRIGS/settings.py | 2 + RIGS/templates/partials/event_table.html | 61 +++++++++++++++--------- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py index 54a3d228..20d1ac1f 100644 --- a/PyRIGS/settings.py +++ b/PyRIGS/settings.py @@ -35,6 +35,8 @@ if DEBUG: ALLOWED_HOSTS.append('localhost') ALLOWED_HOSTS.append('example.com') ALLOWED_HOSTS.append('127.0.0.1') + ALLOWED_HOSTS.append('.app.github.dev') + CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') if not DEBUG: diff --git a/RIGS/templates/partials/event_table.html b/RIGS/templates/partials/event_table.html index 76b50d61..ab7c941a 100644 --- a/RIGS/templates/partials/event_table.html +++ b/RIGS/templates/partials/event_table.html @@ -3,7 +3,7 @@
@@ -91,43 +105,46 @@ table-warning {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row"> -
{{ event.display_id }}
+
{{ event.display_id }}
-
- {% if not event.cancelled %} +
+
+ {% if not event.cancelled %} {% if event.meet_at %} - Meet: {{ event.meet_at|date:"D d/m/Y H:i" }} +
Meet:
+
{{ event.meet_at|date:"D d/m/Y H:i" }}
{% endif %} {% if event.access_at %} -
Access: {{ event.access_at|date:"D d/m/Y H:i" }} +
Access:
+
{{ event.access_at|date:"D d/m/Y H:i" }}
{% endif %} - {% endif %} - - Start: {{ event.start_date|date:"D d/m/Y" }} + {% endif %} +
Start:
+
{{ event.start_date|date:"D d/m/Y" }} {% if event.has_start_time %} - {{ event.start_time|date:"H:i" }} - {% endif %} - - {% if event.end_date %} -
- - End: {% if event.end_date != event.start_date %}{{ event.end_date|date:"D d/m/Y" }}{% endif %} + {{ event.start_time|date:"H:i" }} + {% endif %} +
+ {% if event.end_date %} +
End:
+
{{ event.end_date|date:"D d/m/Y" }} {% if event.has_end_time %} {{ event.end_time|date:"H:i" }} - {% endif %} - - {% endif %} + {% endif %} +
+ {% endif %} +

- {{ event }}{{ event.name }} + {{ event }}{{ event.name }} {% if event.dry_hire %} Dry Hire {% endif %} -
+
{% if event.venue %} at {{ event.venue|namewithnotes:'venue_detail' }} {% endif %}