prevent faulty calendar wrapping

svn path=/trunk/; revision=65

diff --git a/templates/courses.css.sh b/templates/courses.css.sh
index 5321300bf11dd8773917491e9f161944a8e1c197..2c34facdb252da24e784d43c505fb8fcd9442f58 100644 (file)
--- a/templates/courses.css.sh
+++ b/templates/courses.css.sh
@@ -58,7 +58,7 @@ cat <<EOF
   float:left;
   width: 25ex;
   margin: .125em .5ex .5ex .5ex;
-  padding: 0 .2em .2em .2em;
+  padding: 0 .5ex .5ex .5ex;
   background: #EEE;
 }
 
@@ -100,17 +100,18 @@ cat <<EOF
 .courselist .course .dtstart .DTSCALHEAD{
   display: inline-block;
   font-weight: bold;
-  width: 4ex;
+  width: 4.5ex;
   margin: .25ex;
+  overflow: hidden;
 }
 .courselist .course .dtstart .DTSCAL{
   display: inline-block;
-  width: 4ex;
+  width: 4.5ex;
   margin: .25ex;
 }
-.courselist .course .dtstart .selected {
-  font-weight: bold;
-}
+.courselist .course .dtstart input[name=DTSDAY] { display: none; }
+.courselist .course .dtstart input[name=DTSDAY]:checked + label.DTSCAL { font-weight: bold; }
+
 .courselist .course .dtstart .DTSTIME{
   display: inline-block;
   width: 10ex;

diff --git a/templates/edit_course.sh b/templates/edit_course.sh
index 67e051173189afd5856258a9811ac36c27fb2911..6da1579c3bc2ca826a2b94d1abd21ae7164c2737 100755 (executable)
--- a/templates/edit_course.sh
+++ b/templates/edit_course.sh
@@ -83,18 +83,24 @@ done
 echo '    </select>'
 echo '    <button class="DTS" type="submit" name="DTS" value="update">'$(l10n edit_dtscal)'</button>'
 for wd in mon tue wed thu fri sat sun; do
-  echo '    <span class="DTSCALHEAD">'$(date -d $wd +%a)'</span>'
+  echo -n '<span class="DTSCALHEAD">'$(date -d $wd +%a)'</span>'
 done
 fdom=$(date -d ${dts_year}-${dts_month}-1 +%u)
 while [ "$fdom" -gt 1 ]; do
-  echo '    <span class="DTSCAL"></span>'
+  echo -n '<span class="DTSCAL"></span>'
   fdom=$(($fdom - 1))
 done
-echo '<input type="hidden" name="DTSDAY" value="'$dts_dom'">'
+#echo -n '<input type="hidden" name="DTSDAY" value="'$dts_dom'">'
+#cnt=$(date -d ${dts_year}-${dts_month}-1 +%s)
+#while [ "$(date -d @$cnt +%m)" = "$dts_month" ]; do
+#  dn=$(date -d @$cnt +%d)
+#  echo -n '<button class="DTSCAL '$( [ $dn = $dts_dom ] && echo selected)'" type="submit" name="DTSDAY" value="'$dn'">'$dn'</button>'
+#  cnt=$(($cnt + 86400))
+#done
 cnt=$(date -d ${dts_year}-${dts_month}-1 +%s)
 while [ "$(date -d @$cnt +%m)" = "$dts_month" ]; do
   dn=$(date -d @$cnt +%d)
-  echo '    <button class="DTSCAL '$( [ $dn = $dts_dom ] && echo selected)'" type="submit" name="DTSDAY" value="'$dn'">'$dn'</button>'
+  echo -n '<input type="radio" class="DTSCAL" name="DTSDAY" value="'$dn'" id="DTSCAL_'$dn'" '$([ $dn = $dts_dom ] && echo checked)'><label for="DTSCAL_'$dn'" class="DTSCAL">'$dn'</label>'
   cnt=$(($cnt + 86400))
 done
 echo '    <br />'