From 069a829a781c2799836843fe037dc44d1af5c9db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20H=C3=A4nsch?= Date: Tue, 9 Oct 2018 13:45:26 +0200 Subject: [PATCH 1/1] Lobster: time sheet on therapy note --- static/therapy.css | 14 +++++++++----- templates/therapy.html.sh | 24 ++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/static/therapy.css b/static/therapy.css index 9aa971e..b17497c 100644 --- a/static/therapy.css +++ b/static/therapy.css @@ -132,10 +132,15 @@ input.stickynote + .stickynote { max-height: 90%; z-index: 2; } +input.stickynote + .stickynote:nth-of-type(2n) { + background-color: #8FF; + top: 8em; +} + input.stickynote + .stickynote > * { display: none; } input.stickynote + .stickynote > label { position: absolute; - top: 0; bottom: 0; + top: 0; bottom: 0; right: .5ex; display: block; text-align: right; font-weight: bold; @@ -144,10 +149,9 @@ input.stickynote + .stickynote:hover { left: -1ex; } input.stickynote:checked + .stickynote { - width: auto; - left: 1em; - right: 1em; + width: auto; left: 1em; right: 1em; } +input.stickynote:checked + .stickynote > * { display: block; } input.stickynote:checked + .stickynote > textarea { display: block; position: absolute; @@ -156,7 +160,7 @@ input.stickynote:checked + .stickynote > textarea { background-color: #FF8; padding: 2em 1em; } -input.stickynote:checked + .stickynote > button { +input.stickynote:checked + .stickynote > button[type="submit"] { display: block; position: absolute; right: .5ex; bottom: .5ex; diff --git a/templates/therapy.html.sh b/templates/therapy.html.sh index e8af015..1821c24 100755 --- a/templates/therapy.html.sh +++ b/templates/therapy.html.sh @@ -1,4 +1,4 @@ -# Copyright 2016 Paul Hänsch +# Copyright 2016, 2017 Paul Hänsch # # This file is part of Confetti. # @@ -153,8 +153,27 @@ cat <
+

$(l10n notes)

- + +
+ + +
+ +

$(l10n timesheet)

+ + + + $(for n in '' {0..10}; do + printf ' + + + \n' \ + "$mpx[tsgoal${n}]" "$mpx[tsactual${n}]" "$((${mpx[tsgoal${n}]:-0} - ${mpx[tsactual${n}]:-0}))" + done) +
$(l10n time_goal)$(l10n time_actual)$(l10n time_difference)
%s
+