From: maxious Date: Fri, 15 Jul 2011 00:14:05 +0000 Subject: Adaptive layout upgrade X-Git-Url: http://maxious.lambdacomplex.org/git/?p=busui.git&a=commitdiff&h=6bc059876de3526ef7995b1bef02f5fbfcde6eaa --- Adaptive layout upgrade --- --- a/include/common-geo.inc.php +++ b/include/common-geo.inc.php @@ -3,6 +3,7 @@ $suburbs = explode(",", "Acton,Ainslie,Amaroo,Aranda,Banks,Barton,Belconnen,Bonner,Bonython,Braddon,Bruce,Calwell,Campbell,Chapman,Charnwood,Chifley,Chisholm,City,Conder,Cook,Curtin,Deakin,Dickson,Downer,Duffy,Dunlop,Evatt,Fadden,Farrer,Fisher,Florey,Flynn,Forrest,Franklin,Fraser,Fyshwick,Garran,Gilmore,Giralang,Gordon,Gowrie,Greenway,Griffith,Gungahlin,Hackett,Hall,Harrison,Hawker,Higgins,Holder,Holt,Hughes,Hume,Isaacs,Isabella Plains,Kaleen,Kambah,Kingston,Latham,Lawson,Lyneham,Lyons,Macarthur,Macgregor,Macquarie,Mawson,McKellar,Melba,Mitchell,Monash,Narrabundah,Ngunnawal,Nicholls,Oaks Estate,O'Connor,O'Malley,Oxley,Page,Palmerston,Parkes,Pearce,Phillip,Pialligo,Red Hill,Reid,Richardson,Rivett,Russell,Scullin,Spence,Stirling,Symonston,Tharwa,Theodore,Torrens,Turner,Wanniassa,Waramanga,Watson,Weetangera,Weston,Yarralumla"); function staticmap($mapPoints, $zoom = 0, $markerImage = "iconb", $collapsible = true) { + global $labsPath; $width = 300; $height = 300; $metersperpixel[9] = 305.492 * $width; @@ -47,7 +48,7 @@ } $output = ""; if ($collapsible) $output.= '

Open Map...

'; - $output.= ''; if ($collapsible) $output.= '
'; return $output; --- a/include/common-request.inc.php +++ b/include/common-request.inc.php @@ -15,7 +15,7 @@ $nearby = true; } if (isset($_REQUEST['suburb'])) { - $suburb = filter_var($_REQUEST['suburb'], FILTER_SANITIZE_STRING); + $suburb = $_REQUEST['suburb']; } $pageKey = filter_var($_REQUEST['pageKey'], FILTER_SANITIZE_NUMBER_INT); $lat = filter_var($_REQUEST['lat'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); --- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -23,8 +23,10 @@ $url.= "&guid=ON"; return str_replace("&", "&", $url); } + function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { +global $labsPath; echo ' @@ -33,16 +35,16 @@ ' . $pageTitle . ' - '; + '; if (isDebugServer()) { - echo ' + echo ' - + - '; + '; } else { echo ' @@ -54,10 +56,10 @@ '; } echo ' - - - - + + + +