prevent double escaping of & in htmlsafe

[confetti] / templates / therapy.html.sh

diff --git a/templates/therapy.html.sh b/templates/therapy.html.sh
index 7d42aff111e893f384e3b8effb3f5ebcb1b81c67..f1c42ac7f98ebe1b7e16d6527b5ab100d71b68c2 100755 (executable)
--- a/templates/therapy.html.sh
+++ b/templates/therapy.html.sh
@@ -125,7 +125,7 @@ case "$tpy[color]" in
 esac
 
 cat <<EOF
-  <h1>Behandlungen</h1>
+  <h1>$(l10n therapy)</h1>
 
   <div class="patient">
     <h2>$client_name</h2>
@@ -135,16 +135,26 @@ cat <<EOF
   <div class="prescription">
     <h2>$(l10n therapy_prescription)</h2>
     <span class="insurance">${mpx[insurance]}</span>
-    <span class="date">${mpx[date]}</span>
+    <span class="date"><label>$(l10n date):</label>${mpx[date]}</span>
+
     <label class="checkbox ${mpx[prescreviewed]:+checked}" for="prescreviewed">
       $([ -n "${mpx[prescreviewed]}" ] && printf %s "$(l10n prescreviewed)" \
                                        || printf %s "$(l10n prescreview)" )
     </label>
+
+         ${mpx[prescno]:+<span class="prescno">$(l10n presc${mpx[prescno]})</span>}
+    ${mpx[grouptherapy]:+<span class="catalogue">$(l10n grouptherapy)</span>}
+       ${mpx[housecall]:+<span class="catalogue">$(l10n housecall)</span>}
+          ${mpx[report]:+<span class="catalogue">$(l10n report)</span>}
+
     <ul>
-      ${mpx[remidy]:+ <li>${mpx[quantity]}  ${mpx[remidy]}</li>}
-      ${mpx[remidy1]:+<li>${mpx[quantity1]} ${mpx[remidy1]}</li>}
+      ${mpx[remidy]:+ <li>${mpx[quantity]}  ${mpx[remidy]}  ${mpx[quantity_weekly]:+($mpx[quantity_weekly] $(l10n weekly))}</li>}
+      ${mpx[remidy1]:+<li>${mpx[quantity1]} ${mpx[remidy1]} ${mpx[quantity_weekly1]:+($mpx[quantity_weekly1] $(l10n weekly))}</li>}
     </ul>
 
+    ${mpx[indicator]:+<span class="indicator"><label>$(l10n indicator):</label>${mpx[indicator]}</span>}
+        ${mpx[icd10]:+<span class="icd10">    <label>$(l10n icd10):</label>${mpx[icd10]}</span>}
+
     ${mpx[addcontrib]:+
     <label class='checkbox ${mpx[contribconfirm]:+checked}' for="addcontrib">
       $([ -n "${mpx[contribconfirm]}" ] && printf %s "$(l10n contribconfirm)" ${mpx[contribconfirm]} \