X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=inline;f=lib%2Fcontact.php;h=2dd65ab101cb9bf36d8ffbbab856e08f1704cdd7;hb=5707529d8056238ba42e16f55b23b15a5e8c4d9b;hp=c56102389c997839848861a5af966faf192320b6;hpb=4cd13bda037940724f018b8bfc62413156c52b75;p=readifood.git diff --git a/lib/contact.php b/lib/contact.php index c561023..2dd65ab 100644 --- a/lib/contact.php +++ b/lib/contact.php @@ -129,7 +129,6 @@ return; } - echo "
\n"; } function show_contact_cities_form($city_id = null) { @@ -149,7 +147,6 @@ return; } - echo "\n"; } function show_contact_search_form() { - echo "\n"; } function show_contact_forms($city_id) { + form("noprint standout"); show_contact_areas_form($city_id); show_contact_cities_form($city_id); show_contact_search_form(); + end_form(); } function show_contact_role_form($role) { @@ -325,7 +321,7 @@ return; } - echo "\n"; + end_form(); } function show_add_new_contact_form() { @@ -348,7 +344,7 @@ return; } - echo "\n"; + end_form(); } function update_contact(&$contact, $area_id, $new = false) { @@ -496,7 +492,7 @@ else $contact = get_contact_by_name($name); if (! $contact) return; - echo "\n"; + end_form(); } /* /contact/in/area/Cambridge/1 */ @@ -538,8 +534,6 @@ show_city_contacts(0, 10, $parameters[2], $city_id); break; } - - show_add_new_contact_form($city_id); } else if ($parameters[0] == "search") { search_contacts(0, 10, $parameters[1]); @@ -555,14 +549,8 @@ } } else if (isset($name)) show_contact($name, $id); - else { - /* XXX: Shown after adding. */ - show_contact_forms($city_id); - show_add_new_contact_form($city_id); - } - if (count($parameters)) { - show_contact_forms($city_id); - } + show_contact_forms($city_id); + show_add_new_contact_form($city_id); ?>