semantic and visual improvements

svn path=/trunk/; revision=68

diff --git a/templates/attendees.css.sh b/templates/attendees.css.sh
index 2aa7b4022342ec5c9ed2589030466e90e1efe3f0..e4038f040258fd5fc19d23173bd3e206a4319fc4 100755 (executable)
--- a/templates/attendees.css.sh
+++ b/templates/attendees.css.sh
@@ -18,11 +18,11 @@
 cat <<EOF
 
 input[type="checkbox"] { display: none; }
-input[type="checkbox"] + label::before {content: '\2610'; padding: 0 .5ex .25ex 0;}
+input[type="checkbox"] + label::before {content: '\2610'; padding-right: .5ex;}
 input[type="checkbox"]:checked + label { text-decoration: underline; }
 input[type="checkbox"]:checked + label::before {content: '\2611';}
 input[type="radio"] { display: none; }
-input[type="radio"] + label::before {content: '\25cb'; padding: 0 .5ex .25ex 0;}
+input[type="radio"] + label::before {content: '\25cb'; margin-right: .75ex; font-size: .75em;}
 input[type="radio"]:checked + label { text-decoration: underline; }
 input[type="radio"]:checked + label::before {content: '\29bf';}
 
@@ -140,11 +140,15 @@ input[type="radio"]:checked + label::before {content: '\29bf';}
   border-width: 1px 1px 1px 1px;
 }
 
-.card .section .sectitle {
+.card .section h2, .card .section h3 {
+  font-size: 1em;
   display: block;
   font-weight: bold;
   margin: .2em .2em .2em .2em;
 }
+.card .section .FN {
+  font-size: 1.2em;
+}
 
 .card .section .item {
   display: block;
@@ -164,10 +168,6 @@ input[type="radio"]:checked + label::before {content: '\29bf';}
   max-heigth: 30ex;
 }
 
-.card .section .FN {
-  font-weight: bold;
-  font-size: 1.2em;
-}
 
 EOF
 

diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh
index bf504551aaaf50fa75ef9184128623aa9be1bec7..b8b4000b108471d364e4446dfe3ee6f2064f39d6 100755 (executable)
--- a/templates/edit_attendee.sh
+++ b/templates/edit_attendee.sh
@@ -36,7 +36,7 @@ echo '<div id="'${id}'" class="card">'
 echo '<form action="?action=update_attendee" method="POST">'
 echo '<input type="hidden" name="card" value="'${id}'"/>'
 echo '  <div class="section basic">'
-echo '    <span class="sectitle">'$(l10n N)'</span>'
+echo '    <h3>'$(l10n N)'</h3>'
 echo '    <input class="item N" name="3N" placeholder="'$(l10n n_pre)'" value="'$n_pre'" />'
 echo '    <input class="item N" name="1N" placeholder="'$(l10n n_first)'" value="'$n_first'" />'
 echo '    <input class="item N" name="2N" placeholder="'$(l10n n_middle)'" value="'$n_middle'" />'
@@ -55,13 +55,13 @@ for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <input class="item NICKNAME" name="NICKNAME" placeholder="'$(l10n NICKNAME)'" value="'$values[$n]'" />'
 done
 
-echo '    <span class="sectitle">'$(l10n BDAY)'</span>'
+echo '    <h3>'$(l10n BDAY)'</h3>'
 echo '    <input class="item BDAY" name="BDAY" value="'$values[BDAY]'" />'
 
-echo '    <span class="sectitle">'$(l10n X-ZACK-JOINDATE)'</span>'
+echo '    <h3>'$(l10n X-ZACK-JOINDATE)'</h3>'
 echo '    <input class="item X-ZACK-LEAVEDATE" name="X-ZACK-JOINDATE" value="'$values[X-ZACK-JOINDATE]'" />'
 if [ -n "$values[X-ZACK-LEAVEDATE]" ]; then
-  echo '    <span class="sectitle">'$(l10n X-ZACK-LEAVEDATE)'</span>'
+  echo '    <h3>'$(l10n X-ZACK-LEAVEDATE)'</h3>'
   echo '    <input class="item X-ZACK-LEAVEDATE" name="X-ZACK-LEAVEDATE" value="'$values[X-ZACK-LEAVEDATE]'" />'
 fi
 
@@ -77,7 +77,7 @@ fi
 echo '  </div>'
 echo ''
 echo '  <div class="section phone">'
-echo '    <span class="sectitle">'$(l10n TEL)'</span>'
+echo '    <h3>'$(l10n TEL)'</h3>'
   echo '    <input class="item TEL" name="TEL" value="'$values[TEL]'" />'
 for n in TEL{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <input class="item TEL" name="TEL" value="'$values[$n]'" />'
@@ -85,33 +85,33 @@ done
 echo '  </div>'
 echo ''
 echo '  <div class="section message">'
-echo '    <span class="sectitle">'$(l10n EMAIL)'</span>'
+echo '    <h3>'$(l10n EMAIL)'</h3>'
   echo '    <input class="item EMAIL" name="EMAIL" value="'$values[EMAIL]'" />'
 for n in EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <input class="item EMAIL" name="EMAIL" value="'$values[$n]'" />'
 done
 [ -n "$values[IMPP]" ] && \
-  echo '    <span class="sectitle">'$(l10n IMPP)'</span>'
+  echo '    <h3>'$(l10n IMPP)'</h3>'
 for n in IMPP IMPP{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <input class="item IMPP" name="IMPP" value="'$values[$n]'" />'
 done
 echo '  </div>'
 echo ''
 echo '  <div class="section address">'
-echo '    <span class="sectitle">'$(l10n ADR)'</span>'
+echo '    <h3>'$(l10n ADR)'</h3>'
 echo '    <textarea class="item ADR" name="ADR">'$values[ADR]'</textarea>'
 for n in ADR{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <textarea class="item ADR" name="ADR">'$values[$n]'</textarea>'
 done
 [ -n "$values[URL]" ] && \
-  echo '    <span class="sectitle">'$(l10n URL)'</span>'
+  echo '    <h3>'$(l10n URL)'</h3>'
 for n in URL URL{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <input class="item URL" name="URL" value="'$values[$n]'" />'
 done
 echo '  </div>'
 echo ''
 echo '  <div class="section note">'
-echo '    <span class="sectitle">'$(l10n NOTE)'</span>'
+echo '    <h3>'$(l10n NOTE)'</h3>'
 echo '    <textarea class="item NOTE" name="NOTE">'$values[NOTE]'</textarea>'
 for n in NOTE{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <textarea class="item NOTE" name="NOTE">'$values[$n]'</textarea>'
@@ -119,7 +119,7 @@ done
 echo '  </div>'
 echo ''
 echo '  <div class="section attendance">'
-echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
+echo '    <h3>'$(l10n course_attendance)'</h3>'
 listcourses |while read each; do
   cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
   echo '    <input type="checkbox" name="attendance" value="'$each'" id="cbatt_'$each'" '$(check_a "$each")'/><label for="cbatt_'$each'"class="check attendance">'$cname'</label>'

diff --git a/templates/frame.html.sh b/templates/frame.html.sh
index fafd0b215319bef787c782c3a2db17c1e0a14060..8a754bab0afdd9de2432a064db89cdcdd07c47e9 100755 (executable)
--- a/templates/frame.html.sh
+++ b/templates/frame.html.sh
@@ -42,7 +42,7 @@ body {
   border-width: 0 1px 1px 1px;
   border-radius: 0 0 4px 4px;
   margin: 0 auto auto 3%;
-  padding: .5em 1ex .25em 1ex;
+  padding: .5em 1ex .5em 1ex;
   background: #FFF;
 }
 .NAVIGATION a {

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index 0265a807e2d44ac4c69996303d4046711b178e04..d54c11f28b6af16c5627e42f8d71859b658dace5 100755 (executable)
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -17,7 +17,7 @@
 
 echo '<div id="'${id}'" class="card">'
 echo '  <div class="section basic">'
-echo '    <span class="item FN">'$values[FN]'</span>'
+echo '    <h2 class="item FN">'$values[FN]'</h2>'
 [ -n "$values[GENDER]" ] && \
   echo '    <span class="item GENDER">'$(l10n $values[GENDER])'</span>'
 for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
@@ -43,7 +43,7 @@ fi
 echo '  </div>'
 echo ''
 echo '  <div class="section phone">'
-echo '    <span class="sectitle">'$(l10n TEL)'</span>'
+echo '    <h3>'$(l10n TEL)'</h3>'
 for n in TEL TEL{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <span class="item TEL">'$tags[${n}_TYPE]' '$values[$n]'</span>'
 done
@@ -51,38 +51,38 @@ echo '  </div>'
 echo ''
 echo '  <div class="section message">'
 [ -n "$values[EMAIL]" ] && \
-  echo '    <span class="sectitle">'$(l10n EMAIL)'</span>'
+  echo '    <h3>'$(l10n EMAIL)'</h3>'
 for n in EMAIL EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <span class="item EMAIL"><a href="mailto:'$values[$n]'">'$values[$n]'</a></span>'
 done
 [ -n "$values[IMPP]" ] && \
-  echo '    <span class="sectitle">'$(l10n IMPP)'</span>'
+  echo '    <h3>'$(l10n IMPP)'</h3>'
 for n in IMPP IMPP{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <span class="item IMPP">'$tags[${n}_TYPE]' <a href="'$values[$n]'">'$values[$n]'</a></span>'
 done
 echo '  </div>'
 echo ''
 echo '  <div class="section address">'
-echo '    <span class="sectitle">'$(l10n ADR)'</span>'
+echo '    <h3>'$(l10n ADR)'</h3>'
 for n in ADR ADR{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <span class="item ADR">'$values[$n]'</span>'
 done
 [ -n "$values[URL]" ] && \
-  echo '    <span class="sectitle">'$(l10n URL)'</span>'
+  echo '    <h3>'$(l10n URL)'</h3>'
 for n in URL URL{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <span class="item URL"><a href="'$values[$n]'">'$values[$n]'</a></span>'
 done
 echo '  </div>'
 echo ''
 echo '  <div class="section note">'
-echo '    <span class="sectitle">'$(l10n NOTE)'</span>'
+echo '    <h3>'$(l10n NOTE)'</h3>'
 for n in NOTE NOTE{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <span class="item NOTE">'$values[$n]'</span>'
 done
 echo '  </div>'
 echo ''
 echo '  <div class="section">'
-echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
+echo '    <h3>'$(l10n course_attendance)'</h3>'
 sed -rn 's:(.*)\t'$id'$:\1:p' "$_DATA/mappings/attendance" |while read each; do
   cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
   echo '    <a class="item attendance" href="?p=courses#'$each'">'$cname'</a>'