From: paul Date: Fri, 26 Feb 2016 02:47:34 +0000 (+0000) Subject: improved styling for prescription sheets X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=547778804d2beb3394ae47218d7490e6095b778c;p=confetti improved styling for prescription sheets svn path=/trunk/; revision=85 --- diff --git a/templates/edit_prescription.sh b/templates/edit_prescription.sh index cfd2b5b..85eeb20 100755 --- a/templates/edit_prescription.sh +++ b/templates/edit_prescription.sh @@ -21,27 +21,31 @@ cat < -

$(l10n therapy_prescription)

- +

- -
+
+
+
+ +
+

$(l10n therapy_prescription)

-
+
+

$(l10n prescription_by_catalogue)

@@ -52,11 +56,11 @@ cat <
- - -
+
+ +
@@ -67,25 +71,21 @@ cat < +
-
- - -
+
- -
+ + + -
- - -
- -
+ + +
@@ -94,15 +94,16 @@ cat < +
-
-
+
+
END_HTML diff --git a/templates/prescriptions.css.sh b/templates/prescriptions.css.sh index 67b2c89..f25cc38 100755 --- a/templates/prescriptions.css.sh +++ b/templates/prescriptions.css.sh @@ -23,11 +23,10 @@ cat <$(l10n prescriptions_current) -${edit:+$(edit_prescription "$edit")}
@@ -33,9 +32,13 @@ ${edit:+$(edit_prescription "$edit")}
+$(list_prescriptions "$client" |grep -q "$edit" || edit_prescription "$edit") + $(list_prescriptions "$client" \ |while read pre; do - [ "$pre" = "$edit" ] || view_prescription "$pre" + [ "$pre" = "$edit" ] \ + && edit_prescription "$pre" \ + || view_prescription "$pre" done ) diff --git a/templates/text_prescriptions.sh b/templates/text_prescriptions.sh index 83acef4..77c0421 100755 --- a/templates/text_prescriptions.sh +++ b/templates/text_prescriptions.sh @@ -46,3 +46,4 @@ item_name[quantity_weekly]="An­zahl pro Wo­che" item_name[save]="Speichern" item_name[cancel]="Abbrechen" item_name[delete]="Löschen" +item_name[therapy]="Zur Therapie" diff --git a/templates/view_prescription.sh b/templates/view_prescription.sh index d31acca..c11bd9d 100755 --- a/templates/view_prescription.sh +++ b/templates/view_prescription.sh @@ -19,37 +19,39 @@ check(){ [ "$1" = "$2" ] && printf checked} cat < -

$(l10n therapy_prescription)

- +
${mpx[insurance]}
-${mpx[name]} -
+${mpx[name]} ${mpx[bday]}
${mpx[date]} +
+
+

$(l10n therapy_prescription)


${mpx[addcontrib]} +
+

$(l10n prescription_by_catalogue)


-

- -
+
+
@@ -57,25 +59,22 @@ cat <$(l10n housecall)
+
+ +
-
- -${mpx[remidy]} -
-${mpx[quantity]} -
+ +${mpx[quantity]} +${mpx[remidy]} ${mpx[quantity_weekly]} -
- -${mpx[remidy1]} -
-${mpx[quantity1]} -
+ +${mpx[quantity1]} +${mpx[remidy1]} ${mpx[quantity_weekly1]}
@@ -84,12 +83,14 @@ cat < ${mpx[icd10]} +
-
-
+
$(l10n edit) +$(l10n therapy) +
END_HTML