X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=6a39ddd3383a804040a36b55d26d8f51811f0ba9;hb=7e79094af6491632cec5287d4a0471ab4d227726;hp=0f2e0e782662a9881b523a5763382524d697c45a;hpb=adaa23b9f9bbfb55f5c1cd85d6e84c49b950887d;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index 0f2e0e7..6a39ddd 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -320,7 +320,32 @@
   function get_address_map_link($address) {
     $postcode = trim($address->getPostcode());
     if ($postcode) {
-      return " " . get_small_link("Map", "http://maps.google.co.uk/maps?q=" . urlencode($postcode));
+      # mrt=loc specifies a location search.
+      $map = "maps.google.co.uk/maps?q=" . urlencode($postcode) . "&mrt=loc";
+      $url = "http://$map";
+      # output=embed allows display in an iframe.
+      # iwloc=near hides the popup window for the embedded view.
+      $embed = $GLOBALS['http'] . "://$map&output=embed&iwloc=near";
+      $html = " ";
+      $html .= get_small_link_with_id("map", "Map", $url);
+      $html .= "<script>\n  $(function() {\n";
+      $html .= "    var x = 0;\n";
+      $html .= "    var y = 0;\n";
+      $html .= "    var loaded = false;\n";
+      $html .= "    $(\"#map\").hover(function(e) {\n";
+      $html .= "      x = $(this).outerWidth();\n";
+      $html .= "      y = $(this).outerHeight() / 2;\n";
+      $html .= "      $(\"#popup\").css(\"left\", e.pageX + x).css(\"top\", e.pageY + y);;\n";
+      $html .= "      $(\"#popup\").show();\n";
+      $html .= "      if (! loaded) {\n";
+      $html .= "        $(\"#popup\").html(\"<iframe width='100%' height='100%' src='$embed'></iframe>\");\n";
+      $html .= "        loaded = true;\n";
+      $html .= "      }\n";
+      $html .= "    },function() {\n";
+      $html .= "      $(\"#popup\").hide();\n";
+      $html .= "    })\n";
+      $html .= "  });</script>";
+      return $html;
     }
   }
 
@@ -428,9 +453,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 +511,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
@@ -560,19 +561,28 @@
     }
   }
 
-  function get_small_link() {
-    /* Args are <alt text>, <format>, [<stuff> ...] */
+  function get_small_link_with_id() {
+    /* Args are <id>, <alt text>, <format>, [<stuff> ...] */
     $args = func_get_args();
+    $id = array_shift($args);
+    if (isset($id)) $id = " id=\"$id\"";
     $html = htmlspecialchars(array_shift($args));
     $url = array_shift($args);
-    return vsprintf("<a class=\"small noprint\" href=\"$url\">$html</a>\n", $args);
+    return vsprintf("<a$id class=\"small noprint\" href=\"$url\">$html</a>\n", $args);
+  }
+
+  function get_small_link() {
+    /* Args are <alt text>, <format>, [<stuff> ...] */
+    $args = func_get_args();
+    array_unshift($args, null);
+    return call_user_func_array("get_small_link_with_id", $args);
   }
 
   function small_link() {
     echo call_user_func_array("get_small_link", func_get_args());
   }
 
-  include_once("$lib_root/admin.php");
-  include_once("$lib_root/forms.php");
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "admin.php")));
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "forms.php")));
 
 ?>