From 20538ce59d26309138874d7572ae49bcb7d0a559 Mon Sep 17 00:00:00 2001 From: Ohad Lutzky Date: Tue, 3 Aug 2021 20:52:39 +0100 Subject: [PATCH] Unify "wet" and "solid" columns Note that change is always at least either wet or solid. Fixes #235 --- core/templates/core/diaperchange_list.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/templates/core/diaperchange_list.html b/core/templates/core/diaperchange_list.html index 8406fdf6..664ca139 100644 --- a/core/templates/core/diaperchange_list.html +++ b/core/templates/core/diaperchange_list.html @@ -23,8 +23,7 @@ {% trans "Time" %} {% trans "Child" %} - {% trans "Wet" %} - {% trans "Solid" %} + {% trans "Contents" %} {% trans "Color" %} {% trans "Amount" %} {% trans "Actions" %} @@ -36,8 +35,10 @@ {{ change.time|datetime_short }} {{ change.child }} - {{ change.wet|bool_icon }} - {{ change.solid|bool_icon }} + + {% if change.wet %}💦{% endif %} + {% if change.solid %}💩{% endif %} + {{ change.get_color_display }} {{ change.amount|default_if_none:"" }}