diff --git a/hackspace_storage/main/views.py b/hackspace_storage/main/views.py index 777182b..c1e3afc 100644 --- a/hackspace_storage/main/views.py +++ b/hackspace_storage/main/views.py @@ -83,7 +83,7 @@ def validate_expiry_date(self, field: DateField): booking.reminder_sent = True db.session.commit() else: - reminder_date=reminder_date.strftime("%d-%b-%Y") + reminder_date=reminder_date.strftime("%d %b %Y") send_email( g.user, diff --git a/hackspace_storage/static/css/style.css b/hackspace_storage/static/css/style.css index 0eb3fd2..12ffde6 100644 --- a/hackspace_storage/static/css/style.css +++ b/hackspace_storage/static/css/style.css @@ -11,6 +11,7 @@ "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; --header-font: "ocr-a-extended", sans-serif; --grid-maxWidth: 100rem; + --grid-storageWidth: 140rem; --grid-gutter: 2rem; --col-gap: 0.8rem; --row-gap: 1.0rem; @@ -114,6 +115,10 @@ dd { padding: 0 calc(var(--grid-gutter) / 2); } +.container.storage { + max-width: var(--grid-storageWidth); +} + .navbar { display: flex; flex-wrap: wrap; diff --git a/hackspace_storage/templates/email/slot_booked.txt.j2 b/hackspace_storage/templates/email/slot_booked.txt.j2 index 366c09a..a5c977f 100644 --- a/hackspace_storage/templates/email/slot_booked.txt.j2 +++ b/hackspace_storage/templates/email/slot_booked.txt.j2 @@ -1,9 +1,9 @@ Hello {{user.name}}, {% if reminder_date %} -This is an email to confirm you have booked slot {{slot.area.name}} {{slot.name}}. This slot will expire on {{booking.expiry.strftime("%d-%b-%Y")}} and we will send an expiry reminder on {{reminder_date}}. You will be able to extend the booking in-person on this date. +This is an email to confirm you have booked slot {{slot.area.name}} {{slot.name}}. This slot will expire on {{booking.expiry.strftime("%d %b %Y")}} and we will send an expiry reminder on {{reminder_date}}. You will be able to extend the booking in-person on this date. {% else %} -This is an email to confirm you have booked slot {{slot.area.name}} {{slot.name}}. This slot will expire on {{booking.expiry.strftime("%d-%b-%Y")}}. You can extend this booking in-person if required. +This is an email to confirm you have booked slot {{slot.area.name}} {{slot.name}}. This slot will expire on {{booking.expiry.strftime("%d %b %Y")}}. You can extend this booking in-person if required. {% endif %} If you want to cancel this booking you can do so at the Hackspace, or remotely using this link: {{ url_for('main.free_booking_email', booking_id=booking.id, token=booking.secret, _external=True) }}. \ No newline at end of file diff --git a/hackspace_storage/templates/main/index.html b/hackspace_storage/templates/main/index.html index 2591389..526acc0 100644 --- a/hackspace_storage/templates/main/index.html +++ b/hackspace_storage/templates/main/index.html @@ -3,7 +3,7 @@ {% block title %}Home{% endblock %} {% block contents %} -
+
{% if g.user %}

Hi, {{ g.user.name }}.

@@ -22,7 +22,7 @@

{{ booking.slot.name }}

{{ booking.description }}

-

Expires: {{ booking.expiry.strftime("%d-%b-%Y") }}

+

Expires: {{ booking.expiry.strftime("%d %b %Y") }}

{% else %}