selectable strokewidth in therapy

[confetti] / templates / therapy.html.sh

diff --git a/templates/therapy.html.sh b/templates/therapy.html.sh
index 84f9cbe81595654dbee001f38898a5649841b737..e8af01505d69162934a44936732e8d177f7b0253 100755 (executable)
--- a/templates/therapy.html.sh
+++ b/templates/therapy.html.sh
@@ -22,35 +22,26 @@ t_session_note(){
   color=session${session_n}_note${note_n}_color
   unset c0 c1 c2 c3 c4 c5 c6 c7
   
-  case "$tpy[$color]" in
-    \#888) c0=checked;;
-    \#00A) c1=checked;;
-    \#0A0) c2=checked;;
-    \#0AA) c3=checked;;
-    \#A00) c4=checked;;
-    \#A0A) c5=checked;;
-    \#AA0) c6=checked;;
-    *)    c7=checked;;
-  esac
-
-if [ "$note_n" -eq 1 -o -n "${tpy[session${session_n}_note${note_n}]}" ]; then
-  printf '<input class="trailbtn" type="checkbox" checked="checked">'
-else
-  printf '<input class="trailbtn" type="checkbox">'
-fi
-cat <<EOF
-  <fieldset class="note trailbox">
-    <input class=color type=radio name="$color" value="#888" id=${color}_000 $c0><label for=${color}_000></label>
-    <input class=color type=radio name="$color" value="#00A" id=${color}_001 $c1><label for=${color}_001></label>
-    <input class=color type=radio name="$color" value="#0A0" id=${color}_010 $c2><label for=${color}_010></label>
-    <input class=color type=radio name="$color" value="#0AA" id=${color}_011 $c3><label for=${color}_011></label>
-    <input class=color type=radio name="$color" value="#A00" id=${color}_100 $c4><label for=${color}_100></label>
-    <input class=color type=radio name="$color" value="#A0A" id=${color}_101 $c5><label for=${color}_101></label>
-    <input class=color type=radio name="$color" value="#AA0" id=${color}_110 $c6><label for=${color}_110></label>
-    <input class=color type=radio name="$color" value="#FFF" id=${color}_111 $c7><label for=${color}_111></label>
-    <textarea name="session${session_n}_note${note_n}">${tpy[session${session_n}_note${note_n}]}</textarea>
-  </fieldset>
-EOF
+  if [ "$note_n" -eq 1 -o -n "${tpy[session${session_n}_note${note_n}]}" ]; then
+    printf '<input class="trailbtn" type="checkbox" checked="checked">'
+  else
+    printf '<input class="trailbtn" type="checkbox">'
+  fi
+
+  _checked="$(validate "$tpy[$color]" '#(888|00A|0A0|0AA|A00|A0A|AA0)' '#FFF')"
+       cat <<-EOF
+         <fieldset class="note trailbox">
+           <input class=color type=radio name="$color" value="#888" id=${color}_000 $(checked \#888)><label for=${color}_000></label>
+           <input class=color type=radio name="$color" value="#00A" id=${color}_001 $(checked \#00A)><label for=${color}_001></label>
+           <input class=color type=radio name="$color" value="#0A0" id=${color}_010 $(checked \#0A0)><label for=${color}_010></label>
+           <input class=color type=radio name="$color" value="#0AA" id=${color}_011 $(checked \#0AA)><label for=${color}_011></label>
+           <input class=color type=radio name="$color" value="#A00" id=${color}_100 $(checked \#A00)><label for=${color}_100></label>
+           <input class=color type=radio name="$color" value="#A0A" id=${color}_101 $(checked \#A0A)><label for=${color}_101></label>
+           <input class=color type=radio name="$color" value="#AA0" id=${color}_110 $(checked \#AA0)><label for=${color}_110></label>
+           <input class=color type=radio name="$color" value="#FFF" id=${color}_111 $(checked \#FFF)><label for=${color}_111></label>
+           <textarea name="session${session_n}_note${note_n}">${tpy[session${session_n}_note${note_n}]}</textarea>
+         </fieldset>
+       EOF
 }
 
 t_session(){
@@ -111,18 +102,6 @@ therapy_sessions(){
        EOF
 }
 
-unset c0 c1 c2 c3 c4 c5 c6 c7
-case "$tpy[color]" in
-  \#00A) c1="checked";;
-  \#0A0) c2="checked";;
-  \#0AA) c3="checked";;
-  \#A00) c4="checked";;
-  \#A0A) c5="checked";;
-  \#AA0) c6="checked";;
-  \#FFF) c7="checked";;
-      *) c0="checked";;
-esac
-
 cat <<EOF
 <h1>$(l10n therapy)</h1>
 
@@ -192,16 +171,26 @@ EOF
 
 therapy_sessions
 
+_checked="$(validate "$tpy[penwidth]" '(4|12|36)' '4')"
+cat <<EOF
+  <fieldset class="penwidth">
+    <input type="radio" name="penwidth" value="4"  id="pw1" $(checked  4)><label for="pw2"></label>
+    <input type="radio" name="penwidth" value="12" id="pw2" $(checked 12)><label for="pw3"></label>
+    <input type="radio" name="penwidth" value="36" id="pw3" $(checked 36)><label for="pw1"></label>
+  </fieldset>
+EOF
+
+_checked="$(validate "$tpy[color]" '#(0[0A]{2}|A00|A0A|AA0|FFF)' '#000')"
 cat <<EOF
-  <fieldset class=color>
-    <input class="color" type="radio" name="color" value="#000" id="c000" $c0><label for="c000"></label>
-    <input class="color" type="radio" name="color" value="#00A" id="c001" $c1><label for="c001"></label>
-    <input class="color" type="radio" name="color" value="#0A0" id="c010" $c2><label for="c010"></label>
-    <input class="color" type="radio" name="color" value="#0AA" id="c011" $c3><label for="c011"></label>
-    <input class="color" type="radio" name="color" value="#A00" id="c100" $c4><label for="c100"></label>
-    <input class="color" type="radio" name="color" value="#A0A" id="c101" $c5><label for="c101"></label>
-    <input class="color" type="radio" name="color" value="#AA0" id="c110" $c6><label for="c110"></label>
-    <input class="color" type="radio" name="color" value="#FFF" id="c111" $c7><label for="c111"></label>
+  <fieldset class="color">
+    <input class="color" type="radio" name="color" value="#000" id="c000" $(checked \#000)><label for="c000"></label>
+    <input class="color" type="radio" name="color" value="#00A" id="c001" $(checked \#00A)><label for="c001"></label>
+    <input class="color" type="radio" name="color" value="#0A0" id="c010" $(checked \#0A0)><label for="c010"></label>
+    <input class="color" type="radio" name="color" value="#0AA" id="c011" $(checked \#0AA)><label for="c011"></label>
+    <input class="color" type="radio" name="color" value="#A00" id="c100" $(checked \#A00)><label for="c100"></label>
+    <input class="color" type="radio" name="color" value="#A0A" id="c101" $(checked \#A0A)><label for="c101"></label>
+    <input class="color" type="radio" name="color" value="#AA0" id="c110" $(checked \#AA0)><label for="c110"></label>
+    <input class="color" type="radio" name="color" value="#FFF" id="c111" $(checked \#FFF)><label for="c111"></label>
   </fieldset>
   <img class="dotmark bg" src="?static=therapy_background.png" alt="WARNING: Background Image not available!">
   <canvas id="canvas" class="dotmark ov" width="${bg_dim%x*}" height="${bg_dim#*x}"></canvas>