X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=eb48c4b75ada85a3ee21d79a75cb3653185627b2;hb=refs%2Ftags%2Fuat-2013-10-31;hp=0f2e0e782662a9881b523a5763382524d697c45a;hpb=446bce55325fc63d0583b838111d387764be498f;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index 0f2e0e7..eb48c4b 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -428,9 +428,9 @@
 
   function show_role_form($role, $roles) {
     for ($i = 0; $i < count($roles); $i++) {
-      echo " <input type=\"checkbox\" name=\"role_$i\"";
+      echo " <input type=\"checkbox\" id=\"role_$i\" name=\"role_$i\"";
       if ($role & (1 << $i)) echo " checked";
-      echo ">$roles[$i]\n";
+      echo "><label for=\"role_$i\">$roles[$i]</label>\n";
     }
   }
 
@@ -486,37 +486,13 @@
   }
 
   function show_date_form($name, $date = null) {
-    $past = 60;
-    $future = 60;
-    echo "<select name=\"$name\">\n";
-    $now = date('Y-m-d', time());
-    list($y, $m, $d) = explode('-', $now);
-    $today = mktime(0, 0, 0, $m, $d, $y);
-    if (isset($date)) {
-      list($y, $m, $d) = explode('-', $date);
-      $then = mktime(0, 0, 0, $m, $d, $y);
-      if ($then < $today - 86400 * $past || $then > $today + 86400 * $future) {
-        option($name, $date, date('l j F Y', $then), $date);
-      }
-    }
-    else $date = $now;
-    for ($i = -$past; $i < $future; $i++) {
-      $then = $today + 86400 * $i;
-      option($name, date('Y-m-d', $then), date('l j F Y', $then), $date);
-    }
-    echo "</select>\n";
-    return;
-    if (! isset($date)) $date = date('Y-m-d');
-    list($y, $m, $d) = iso8601_to_ymd($date);
-
-    echo "Year: <input name=\"$name" . "_y\" value=\"$y\" size=4 maxlen=4> ";
-    echo "Month: <input name=\"$name" . "_m\" value=\"$m\" size=2 maxlen=2> ";
-    echo "Day: <input name=\"$name" . "_d\" value=\"$d\" size=2 maxlen=2> ";
+    if (! isset($date)) $date = date('Y-m-d', time());
+    datepicker($name, $date);
   }
 
   function validate_postcode($postcode, &$outward = null, &$inward = null) {
     /*
-      Valid postcode formats (BS766):
+      Valid postcode formats (BS7666):
 
         AN NLL
         ABN NLL