From 73e1291b6d0d15ba93d78e7eb167a1eb30347db3 Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 8 Jul 2016 10:45:38 +0000 Subject: [PATCH] reduce number of pre filled text fields, show more prescription info in therapy svn path=/trunk/; revision=122 --- static/therapy.css | 57 +++++++++++++++++++++------------------ templates/therapy.html.sh | 12 +++++++-- 2 files changed, 41 insertions(+), 28 deletions(-) diff --git a/static/therapy.css b/static/therapy.css index 5a169d8..f7dc3be 100644 --- a/static/therapy.css +++ b/static/therapy.css @@ -70,6 +70,8 @@ div.prescription span.catalogue { padding: .5ex 1ex; } +div.prescription ul {margin-top: 0;} + div.prescription label.checkbox, div.prescription label.radio { display: block; @@ -106,6 +108,9 @@ div.prescription label[for=prescreviewed].checked { background-color: transparent; } +div.prescription label.tab {width: 96%; border: none; border-bottom: 1px dotted;} +div.prescription div.tab { width: 96%; background-color: #DDD;} + input.stickynote { display:none; } input.stickynote + .stickynote { position: fixed; @@ -221,8 +226,8 @@ div:nth-child(n+2) > a:first-of-type { text-decoration: none; } -fieldset.tab, -label.tab { +#report fieldset.tab, +#report label.tab { font-size: 1.25em; font-weight: bold; padding: .125em 1ex .25em 1ex; @@ -232,24 +237,24 @@ label.tab { text-align: right; border: none; } -label.heading { +#report label.heading { background-color: #FFF; margin-top: 1em; border: 2px solid black; border-bottom-width: 1px; color: black; } -label.heading > span { +#report label.heading > span { text-decoration: underline; } -fieldset.tab > *, -label > input, -label > span { +#report fieldset.tab > *, +#report label > input, +#report label > span { display: inline-block; text-align: right; } -.tab > .no { +#report .tab > .no { width: 10%; float: left; border: solid 1px #FFF; background-color: #555; @@ -257,55 +262,55 @@ label > span { padding: 0; text-align: center; } -label.heading > span.no { +#report label.heading > span.no { background-color: inherit; border: none; } -.tab > .date { width: 30%; } -.tab > .therapist { width: 30%; } -.tab > .signature { width: 20%; } -label.tab > .signature { font-size: .75em; } +#report .tab > .date { width: 30%; } +#report .tab > .therapist { width: 30%; } +#report .tab > .signature { width: 20%; } +#report label.tab > .signature { font-size: .75em; } -.signature > input[type=checkbox] { +#report .signature > input[type=checkbox] { display: inline; font-weight: bold; font-size: 1.25em; } -.signature > input[type=checkbox]:before { +#report .signature > input[type=checkbox]:before { display: block; width: 1.25em; margin: -.125em 0 0 -.5ex; background-color: #FFF; text-align: center; content: "\00a0 \00a0 \00a0"; } -.signature > input[type=checkbox]:checked::before { +#report .signature > input[type=checkbox]:checked::before { content: "\2713"; } -input.tab + label.tab > input.date, -input.tab + label.tab > input.therapist { +#report input.tab + label.tab > input.date, +#report input.tab + label.tab > input.therapist { display: none; } -input.tab:checked + label.tab > input.date, -input.tab:checked + label.tab > input.therapist { +#report input.tab:checked + label.tab > input.date, +#report input.tab:checked + label.tab > input.therapist { display: inline; } -input.tab:checked + label.tab > span.date, -input.tab:checked + label.tab > span.therapist { +#report input.tab:checked + label.tab > span.date, +#report input.tab:checked + label.tab > span.therapist { display: none; } -div.tab { +#report div.tab { border: 2px solid #333; border-top-width: 1px; margin-top: -1px; padding: .25em .5ex 1em .5ex; } -div.tab > fieldset.note { +#report div.tab > fieldset.note { border: none; margin: 0; padding: 0; } -div.tab > fieldset.note > textarea { +#report div.tab > fieldset.note > textarea { display: block; width: 93%; height: 8em; margin: -8em 0 .5em 2em; @@ -321,4 +326,4 @@ div.tab > fieldset.note > input.color[value="#A0A"]:checked ~ textarea { backgro div.tab > fieldset.note > input.color[value="#AA0"]:checked ~ textarea { background-color: #FF8; } div.tab > fieldset.note > input.color[value="#FFF"]:checked ~ textarea { background-color: #FFF; } -div.tab > button.delete {float: right; display: inline-block; margin-top: -1em;} +div.tab > button.delete {float: right; display: inline-block; margin-top: -1em; display: none;} diff --git a/templates/therapy.html.sh b/templates/therapy.html.sh index 70d9c3f..6e61ccd 100755 --- a/templates/therapy.html.sh +++ b/templates/therapy.html.sh @@ -77,7 +77,7 @@ cat <
- $( for n in {1..50}; do t_session_note $session_n $n; done ) + $( for n in {1..10}; do t_session_note $session_n $n; done )
@@ -154,9 +154,13 @@ cat < } + + + +
${mpx[indicator_reading]}
-
+ @@ -166,6 +170,10 @@ cat <$(l10n save) + +