reduce number of pre filled text fields, show more prescription info in therapy

svn path=/trunk/; revision=122

diff --git a/static/therapy.css b/static/therapy.css
index 5a169d8b520187fdfb40b25442916a6a2cf53b11..f7dc3beae7f45e1d85a52f4c50e5091cd01d40c5 100644 (file)
--- 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 70d9c3fe704139cf2c19388e0a205364a634dacf..6e61ccd9e74235cdad1e38a752bd77cc0c777f0d 100755 (executable)
--- a/templates/therapy.html.sh
+++ b/templates/therapy.html.sh
@@ -77,7 +77,7 @@ cat <<EOF
   </label>
   <div class=tab>
     <img class="dotmark ov" src="/therapies/${id%.tpy}_${sid}.png" alt="">
-    $( 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 )
 
     <button class=delete type=submit name=delete_session value=${session_n}>$(l10n delete_session)</button>
   </div>
@@ -154,9 +154,13 @@ cat <<EOF
                                       || printf %s "$(l10n addcontrib)" )
   </label>
   }
+
+  <input class="tab" type="checkbox" id="indicator_reading">
+  <label class="tab" for="indicator_reading">$(l10n indicator_reading)</label>
+  <div class="tab">${mpx[indicator_reading]}</div>
 </div>
 
-<form method="POST" action="?action=update_therapy">
+<form id="report" method="POST" action="?action=update_therapy">
   <input type="hidden" name="id" value="${id}">
 
   <input class="stickynote" type="checkbox" name="c_stickynote" id="show_stickynote">
@@ -166,6 +170,10 @@ cat <<EOF
     <button type=submit>$(l10n save)</button>
   </fieldset>
 
+  <!--input class="tab" type="checkbox" id="lookout">
+  <label class="tab" for="lookout">$(l10n indicator_reading)</label>
+  <div class="tab"><textarea name="lookout">${mpx[lookout]}</textarea -->
+
   <label class="tab heading">
     <span class=no>$(l10n number)</span><!--
  --><span class=date>$(l10n date)</span><!--