Merge branch 'master' into uat

diff --git a/lib/area.php b/lib/area.php
index 8872a43..9b0d5e1 100644 (file)
--- a/lib/area.php
+++ b/lib/area.php
@@ -131,9 +131,9 @@
     echo "Delivery days:";
     if (check_admin(1)) {
       for ($i = 0; $i < count($week); $i++) {
-        echo " <input type=\"checkbox\" name=\"day_$i\"";
+        echo " <input type=\"checkbox\" id=\"day_$i\" name=\"day_$i\"";
         if ($days & (1 << $i)) echo " checked";
-        echo ">$week[$i]\n";
+        echo "><label for=\"day_$i\">$week[$i]</label>\n";
       }
     }
     else {

diff --git a/lib/contact.php b/lib/contact.php
index 051f291..f376406 100644 (file)
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -335,9 +335,9 @@
     echo "  <td>";
     for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
       if (1 << $i == $GLOBALS['PARCEL_TOILETRY']) continue;
-      echo "  <input type=\"checkbox\" name=\"parcel_$i\"";
+      echo "  <input type=\"checkbox\" id=\"parcel_$i\" name=\"parcel_$i\"";
       if ($contact->getParcel() & (1 << $i)) echo " checked";
-      echo ">$parcel_contents[$i]\n";
+      echo "><label for=\"parcel_$i\">$parcel_contents[$i]</label>\n";
     }
     echo "</td>\n";
     echo "</tr>\n";
@@ -503,6 +503,7 @@
 
     $contact = new Contact;
     if (! update_contact($contact, $area_id, true)) return false;
+    $name = $contact->getDisplayname();
     return $contact->getId();
   }
 

diff --git a/lib/functions.php b/lib/functions.php
index 2fcbe0e..eb48c4b 100644 (file)
--- 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";
     }
   }
 

diff --git a/lib/order.php b/lib/order.php
index 7c68455..6c75211 100644 (file)
--- a/lib/order.php
+++ b/lib/order.php
@@ -111,9 +111,9 @@
 
     echo "<p>Restrict to order states:\n";
     for ($i = 0; $i < count($states); $i++) {
-      echo " <input type=\"checkbox\" name=\"state_$i\"";
+      echo " <input type=\"checkbox\" id=\"state_$i\" name=\"state_$i\"";
       if ($state_mask & (1 << $i)) echo " checked";
-      echo ">$states[$i]\n";
+      echo "><label for=\"state_$i\">$states[$i]</label>\n";
     }
     echo "</p>\n";
   }
@@ -309,9 +309,9 @@
     echo "  <td>Parcel contents</td>\n";
     echo "  <td>";
     for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
-      echo "  <input type=\"checkbox\" name=\"parcel_$i\"";
+      echo "  <input type=\"checkbox\" id=\"parcel_$i\" name=\"parcel_$i\"";
       if ($order->getParcel() & (1 << $i)) echo " checked";
-      echo ">$parcel_contents[$i]\n";
+      echo "><label for=\"parcel_$i\">$parcel_contents[$i]</label>\n";
     }
     echo "</td>\n";
     echo "</tr>\n";