--- 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; @@ -22,8 +23,10 @@ $url.= "&guid=ON"; return str_replace("&", "&", $url); } + function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { +global $labsPath; echo ' @@ -31,37 +34,61 @@ ' . $pageTitle . ' '; - if ($datepicker) echo ''; +content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" /> + '; if (isDebugServer()) { - echo ' + echo ' - + - '; + '; } else { - echo ' - + echo ' + - '; - } - if ($datepicker) { - echo ' - '; - } + '; + } + echo ' + + + + + + '; echo ''; - if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod')) { + if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) { echo ' @@ -152,7 +321,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 +333,7 @@ var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-22173039-1']); _gaq.push(['_trackPageview']); + _gaq.push(['_trackPageLoadTime']); "; echo ' @@ -174,17 +344,30 @@ if ($opendiv) { echo '

- Back + Back

' . $pageTitle . '

- Home + Home

'; - } + $overrides = getServiceOverride(); + if ($overrides['service_id']) { + if ($overrides['service_id'] == "noservice") { + echo '

Buses are not running today due to industrial action/public holiday. See http://www.action.act.gov.au for details.

'; + } + else { + echo '

Buses are running on an altered timetable today due to industrial action/public holiday. See http://www.action.act.gov.au for details.

'; + } + } + } + } function include_footer() { - echo '

"; } function timePlaceSettings($geolocate = false) { @@ -206,12 +391,14 @@ if ($geolocate == true) { $geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == ""; } + echo '

'; if ($geoerror) { - echo '

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.

'; - } - echo '

+ or enter an address/co-ordinates in the box below.'; + } + echo '

'; + echo '

Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...

'; +

+

'; } function trackEvent($category, $action, $label = "", $value = - 1) {