--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -5,6 +5,7 @@ function googleAnalyticsGetImageUrl() { global $GA_ACCOUNT, $GA_PIXEL; + //if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') return ""; $url = ""; $url.= $GA_PIXEL . "?"; $url.= "utmac=" . $GA_ACCOUNT; @@ -24,104 +25,72 @@ } function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { + global $labsPath; echo ' <!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> - <title>' . $pageTitle . '</title> - <meta name="google-site-verification" -content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />'; - if ($datepicker) echo '<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />'; +<meta name="viewport" content="width=device-width, initial-scale=1"> +<title>' . $pageTitle . '</title> + <meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" /> + <link rel="stylesheet" href="' . $labsPath . 'css/jquery-ui-1.8.12.custom.css" /> + <script src="' . $labsPath . 'js/LAB.min.js"></script> '; if (isDebugServer()) { - echo '<link rel="stylesheet" href="css/jquery.mobile-1.0a4.css" /> - - <script type="text/javascript" src="js/jquery-1.5.js"></script> - <script>$(document).bind("mobileinit", function(){ + $jqmcss = $labsPath . 'css/jquery.mobile-1.0b1.css'; + $jqjs = $labsPath . 'js/jquery-1.6.1.min.js'; + $jqmjs = $labsPath . 'js/jquery.mobile-1.0b1.js'; + } + else { + $jqmcss = "http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.css"; + $jqjs = "http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"; + $jqmjs = "http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js"; + } + echo '<link rel="stylesheet" href="' . $jqmcss . '" /> + <script src="'.$jqjs.'"></script> + <script>$(document).bind("mobileinit", function(){ $.mobile.ajaxEnabled = false; }); -</script> - <script type="text/javascript" src="js/jquery.mobile-1.0a4.js"></script>'; - } - else { - echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a4.1/jquery.mobile-1.0a4.1.min.css" /> - <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script> - <script>$(document).bind("mobileinit", function(){ - $.mobile.ajaxEnabled = false; +</script> + <script src="'.$jqmjs.'"></script> + + <script> + $LAB.setOptions({AlwaysPreserveOrder:true}) + .script("' . $jqjs . '").wait() + +.script("' . $labsPath . 'js/jquery.ui.core.min.js") +.script("' . $labsPath . 'js/jquery.ui.position.min.js") +.script("' . $labsPath . 'js/jquery.ui.widget.min.js").wait() + .script("' . $labsPath . 'js/jquery.ui.autocomplete.min.js") + .wait(function() { + $(function() { + $( "#geolocate" ).autocomplete({ + source: "lib/autocomplete.php", + minLength: 2 + }); + $( "#from" ).autocomplete({ + source: "lib/autocomplete.php", + minLength: 2 + }); + $( "#to" ).autocomplete({ + source: "lib/autocomplete.php", + minLength: 2 + }); + }); }); -</script> - <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a4.1/jquery.mobile-1.0a4.1.min.js"></script>'; - } - if ($datepicker) { - echo '<script> - //reset type=date inputs to text - $( document ).bind( "mobileinit", function(){ - $.mobile.page.prototype.options.degradeInputs.date = true; - }); - </script> - <script src="js/jQuery.ui.datepicker.js"></script>'; - } - echo '<style type="text/css"> - .ui-navbar { - width: 100%; - } - .ui-btn-inner { - white-space: normal !important; - } - .ui-li-heading { - white-space: normal !important; - } - .ui-listview-filter { - margin: 0 !important; - } - .ui-icon-navigation { - background-image: url(css/images/113-navigation.png); - background-position: 1px 0; - } - .ui-icon-beaker { - background-image: url(css/images/91-beaker-2.png); - background-position: 1px 0; - } - #footer { - text-size: 0.75em; - text-align: center; - } - body { - background-color: #F0F0F0; - } - #jqm-homeheader { - text-align: center; - } - .viaPoints { - display: none; - text-size: 0.2em; - } - .min-width-480px .viaPoints { - display: inline; - } - #extrainfo { - visibility: hidden; - display: none; - } - // source http://webaim.org/techniques/skipnav/ - #skip a, #skip a:hover, #skip a:visited -{ -position:absolute; -left:0px; -top:-500px; -width:1px; -height:1px; -overflow:hidden; -} - -#skip a:active, #skip a:focus -{ -position:static; -width:auto; -height:auto; -} -</style>'; - if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod')) { + </script>'; + echo '<style type="text/css">'; + if (strstr($_SERVER['HTTP_USER_AGENT'], 'Android')) echo '.ui-shadow,.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a,.ui-body-b,.ui-btn-up-b,.ui-btn-hover-b, +.ui-btn-down-b,.ui-bar-c,.ui-body-c,.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c,.ui-bar-c,.ui-body-d, +.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d,.ui-bar-d,.ui-body-e,.ui-btn-up-e,.ui-btn-hover-e, +.ui-btn-down-e,.ui-bar-e,.ui-overlay-shadow,.ui-shadow,.ui-btn-active,.ui-body-a,.ui-bar-a { + text-shadow: none; + box-shadow: none; + -webkit-box-shadow: none; +}'; + echo '</style>'; + echo '<link rel="stylesheet" href="' . $labsPath . 'css/local.css.php" />'; + if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) { echo '<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" /> <link rel="apple-touch-startup-image" href="startup.png" /> @@ -152,7 +121,7 @@ } $(document).ready(function() { $('#here').click(function(event) { $('#geolocate').val(geolocate()); return false;}); -$('#here').show(); + $('#here').show(); }); "; if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();"; @@ -164,6 +133,7 @@ var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-22173039-1']); _gaq.push(['_trackPageview']); + _gaq.push(['_trackPageLoadTime']); </script>"; echo '</head> <body> @@ -174,17 +144,28 @@ if ($opendiv) { echo '<div data-role="page"> <div data-role="header" data-position="inline"> - <a href="' . $_SERVER["HTTP_REFERER"] . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a> + <a href="' . (isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : "javascript:history.go(-1)") . '" data-icon="arrow-l" data-rel="back" class="ui-btn-left">Back</a> <h1>' . $pageTitle . '</h1> - <a href="/index.php" data-icon="home" class="ui-btn-right">Home</a> + <a href="' . $labsPath . '/index.php" data-icon="home" class="ui-btn-right">Home</a> </div><!-- /header --> <a name="maincontent" id="maincontent"></a> <div data-role="content"> '; + $overrides = getServiceOverride(); + if ($overrides['service_id']) { + if ($overrides['service_id'] == "noservice") { + echo '<div id="servicewarning">Buses are <strong>not running today</strong> due to industrial action/public holiday. See <a +href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>'; + } + else { + echo '<div id="servicewarning">Buses are running on an altered timetable today due to industrial action/public holiday. See <a href="http://www.action.act.gov.au">http://www.action.act.gov.au</a> for details.</div>'; + } + } } } function include_footer() { - echo '<div id="footer"><a href="about.php">About/Contact Us</a> <a href="feedback.php">Feedback/Bug Report</a></a>'; + global $labsPath; + echo '<div id="footer"><a href="' . $labsPath . 'about.php">About/Contact Us</a> <a href="' . $labsPath . 'feedback.php">Feedback/Bug Report</a> <a href="' . $labsPath . 'privacy.php">Privacy Policy</a>'; echo '</div>'; if (isAnalyticsOn()) { echo "<script> (function() { @@ -198,45 +179,33 @@ $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl(); echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>'; } -} -function timePlaceSettings($geolocate = false) + echo "\n</div></div></body></html>"; +} +function placeSettings() { global $service_periods; $geoerror = false; - if ($geolocate == true) { $geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == ""; - } + + echo '<div id="error">'; if ($geoerror) { - echo '<div id="error">Sorry, but your location could not currently be detected. + echo 'Sorry, but your location could not currently be detected. Please allow location permission, wait for your location to be detected, - or enter an address/co-ordinates in the box below.</div>'; - } - echo '<div data-role="collapsible" data-collapsed="' . !$geoerror . '"> - <h3>Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3> + or enter an address/co-ordinates in the box below.'; + } + echo '</div>'; + echo '<div id="settings" data-role="collapsible" data-collapsed="' . !$geoerror . '"> + <h3>Change Location...</h3> <form action="' . basename($_SERVER['PHP_SELF']) . "?" . $_SERVER['QUERY_STRING'] . '" method="post"> <div class="ui-body"> <div data-role="fieldcontain"> <label for="geolocate"> Current Location: </label> <input type="text" id="geolocate" name="geolocate" value="' . (isset($_SESSION['lat']) && isset($_SESSION['lon']) ? $_SESSION['lat'] . "," . $_SESSION['lon'] : "Enter co-ordinates or address here") . '"/> <a href="#" style="display:none" name="here" id="here">Here?</a> </div> - <div data-role="fieldcontain"> - <label for="time"> Time: </label> - <input type="time" name="time" id="time" value="' . (isset($_SESSION['time']) ? $_SESSION['time'] : date("H:i")) . '"/> - <a href="#" name="currentTime" id="currentTime" onClick="var d = new Date();' . "$('#time').val(d.getHours() +':'+ (d.getMinutes().toString().length == 1 ? '0'+ d.getMinutes(): d.getMinutes()));" . '">Current Time?</a> - </div> - <div data-role="fieldcontain"> - <label for="service_period"> Service Period: </label> - <select name="service_period" id="service_period">'; - foreach ($service_periods as $service_period) { - echo "<option value=\"$service_period\"" . (service_period() === $service_period ? " SELECTED" : "") . '>' . ucwords($service_period) . '</option>'; - } - echo '</select> - <a href="#" style="display:none" name="currentPeriod" id="currentPeriod"/>Current Period?</a> - </div> <input type="submit" value="Update"/> - </form> - </div></div>'; + </div></form> + </div>'; } function trackEvent($category, $action, $label = "", $value = - 1) {