From 1bea3d2fcc71fcffe6a9159df24c80d8368061f5 Mon Sep 17 00:00:00 2001 From: Midgard Date: Mon, 17 Aug 2020 10:57:10 +0200 Subject: [PATCH] Show stop date if needed, change to "add from favourites" --- app/templates/order.html | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/templates/order.html b/app/templates/order.html index 108373a..0faeb15 100644 --- a/app/templates/order.html +++ b/app/templates/order.html @@ -53,15 +53,17 @@ {% endif %} -
-
Opens
-
{{ order.starttime.strftime("%d/%m/%Y %H:%M") }}
+
{{ order.starttime.strftime("%Y-%m-%d, %H:%M") }}
Closes
{% if order.stoptime %} - {{ order.stoptime.strftime("%H:%M") }} ({{ order.stoptime|countdown }}) + {% set stoptimefmt = ( + "%H:%M" if order.stoptime.date() == order.starttime.date() + else "%Y-%m-%d, %H:%M" + ) %} + {{ order.stoptime.strftime(stoptimefmt) }} ({{ order.stoptime|countdown }}) {% else %} Never {% endif %} @@ -140,8 +142,8 @@
-

Add from history

+ -->
+

Add from favourites

  • Todo
@@ -339,7 +341,7 @@ h3 { column-width: 150px; } -#from_history ul, #my_items ul, #per_person ul { +#from_favourites ul, #my_items ul, #per_person ul { list-style-type: none; padding: 0; }