X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fhub.php;h=51aec9a6682c3c4b373e9939714686249deceef6;hb=0925aeead950582ca1136feeb597730086bec498;hp=a3a1121e810f637ebb1a113cb9cea0972f999149;hpb=8549c1776033e924ea50328bd2434529d85b5669;p=readifood.git
diff --git a/lib/hub.php b/lib/hub.php
index a3a1121..51aec9a 100644
--- a/lib/hub.php
+++ b/lib/hub.php
@@ -108,15 +108,20 @@
return;
}
- echo "
\n";
}
function show_hub_cities_form($city_id = null) {
@@ -128,20 +133,27 @@
return;
}
- echo "\n";
}
function show_hub_forms($city_id) {
+ form("noprint standout");
show_hub_areas_form($city_id);
show_hub_cities_form($city_id);
+ end_form();
}
function show_hub_role_form($role) {
@@ -174,7 +186,7 @@
/* Postcode. */
echo "\n";
echo " Postcode | \n";
- echo " "; input("postcode", $address->getPostcode()); echo " | \n";
+ echo " "; input("postcode", $address->getPostcode()); echo get_address_map_link($address); echo " | \n";
echo "
\n";
/* Telephone. */
@@ -215,7 +227,7 @@
return;
}
- echo "\n";
+ end_form();
}
function show_add_new_hub_form() {
@@ -238,7 +250,7 @@
return;
}
- echo "\n";
+ end_form();
}
function update_hub(&$hub, $area_id, $new = false) {
@@ -357,7 +369,7 @@
else $hub = get_hub_by_name($name);
if (! $hub) return;
- echo "\n";
+ end_form();
}
/* /hub/in/area/Cambridge/1 */
@@ -399,8 +411,6 @@
show_city_hubs(0, 10, $parameters[2], $city_id);
break;
}
-
- show_new_hub_form($city_id);
}
}
list($name, $id, $args) = parse_parameters($parameters);
@@ -413,14 +423,8 @@
}
}
else if (isset($name)) show_hub($name, $id);
- else {
- /* XXX: Shown after adding. */
- show_hub_forms($city_id);
- show_add_new_hub_form($city_id);
- }
- if (count($parameters)) {
- show_hub_forms($city_id);
- }
+ show_hub_forms($city_id);
+ show_add_new_hub_form($city_id);
?>