From: paul Date: Fri, 15 Apr 2016 11:06:52 +0000 (+0000) Subject: prevent double escaping of & in htmlsafe X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=c0ba368bbf5b8e1468b58f7970ec8af5beb531bb;p=confetti prevent double escaping of & in htmlsafe svn path=/trunk/; revision=101 --- diff --git a/pages/prescriptions.sh b/pages/prescriptions.sh index 2786ee3..20b2bc0 100755 --- a/pages/prescriptions.sh +++ b/pages/prescriptions.sh @@ -56,7 +56,7 @@ view_prescription(){ mpx=() cat "$prescfile" |while read -r line; do val="${line#*:}" - mpx[${line%%:*}]="${val//\\n/$BR}" + mpx[${line%%:*}]="$(htmlsafe "${val//\\n/$BR}")" done . "$_EXEC/templates/view_prescription.sh" diff --git a/templates/text_therapy.sh b/templates/text_therapy.sh index ad05943..fff9150 100755 --- a/templates/text_therapy.sh +++ b/templates/text_therapy.sh @@ -22,3 +22,4 @@ item_name[delete_session]="Therapiesitzung entfernen" item_name[therapist]="Therapeut" item_name[number]="Nr." item_name[signature]="Un­ter­schrift" +item_name[weekly]="p. Woche" diff --git a/templates/therapy.css.sh b/templates/therapy.css.sh index e3184a5..b14c457 100755 --- a/templates/therapy.css.sh +++ b/templates/therapy.css.sh @@ -41,9 +41,26 @@ div.patient, div.prescription { margin: 0 2%; } -div.prescription .insurance{ display: block; margin: .5ex 0 1ex 0; } +div.prescription span { + display: inline-block; + width: 50%; + margin-right: -.75ex; +} +div.prescription span label { font-weight: bold; margin-right: 1ex;} +div.prescription span.prescno, +div.prescription span.catalogue { + width: 33%; + font-weight: bold; + margin-bottom: .5em; +} + div.prescription label.checkbox, -div.prescription label.radio { padding-left: 1.25em; font-size: 1em;} +div.prescription label.radio { + display: block; + padding-left: 1.25em; + font-size: 1em; + margin: .5em 0; +} div.prescription label.checkbox:before, div.prescription label.radio:before { diff --git a/templates/therapy.html.sh b/templates/therapy.html.sh index 7d42aff..f1c42ac 100755 --- a/templates/therapy.html.sh +++ b/templates/therapy.html.sh @@ -125,7 +125,7 @@ case "$tpy[color]" in esac cat <Behandlungen +

$(l10n therapy)

$client_name

@@ -135,16 +135,26 @@ cat <

$(l10n therapy_prescription)

${mpx[insurance]} - ${mpx[date]} + ${mpx[date]} + + + ${mpx[prescno]:+$(l10n presc${mpx[prescno]})} + ${mpx[grouptherapy]:+$(l10n grouptherapy)} + ${mpx[housecall]:+$(l10n housecall)} + ${mpx[report]:+$(l10n report)} +
    - ${mpx[remidy]:+
  • ${mpx[quantity]} ${mpx[remidy]}
  • } - ${mpx[remidy1]:+
  • ${mpx[quantity1]} ${mpx[remidy1]}
  • } + ${mpx[remidy]:+
  • ${mpx[quantity]} ${mpx[remidy]} ${mpx[quantity_weekly]:+($mpx[quantity_weekly] $(l10n weekly))}
  • } + ${mpx[remidy1]:+
  • ${mpx[quantity1]} ${mpx[remidy1]} ${mpx[quantity_weekly1]:+($mpx[quantity_weekly1] $(l10n weekly))}
  • }
+ ${mpx[indicator]:+${mpx[indicator]}} + ${mpx[icd10]:+ ${mpx[icd10]}} + ${mpx[addcontrib]:+