--- 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,112 +25,68 @@ } function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { + global $labsPath; echo ' - ' . $pageTitle . ' - '; - if ($datepicker) echo ''; + +' . $pageTitle . ' + + + + '; if (isDebugServer()) { - echo ' - - - + - '; - } - else { - echo ' - - - '; - } - if ($datepicker) { - echo ' - '; - } - echo ''; - if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod')) { + + + + + + + + '; + echo ''; + echo ''; + if (strstr($_SERVER['HTTP_USER_AGENT'], 'iPhone') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPod') || strstr($_SERVER['HTTP_USER_AGENT'], 'iPad')) { echo ' @@ -160,7 +117,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();"; @@ -172,6 +129,7 @@ var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-22173039-1']); _gaq.push(['_trackPageview']); + _gaq.push(['_trackPageLoadTime']); "; echo ' @@ -182,26 +140,28 @@ 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 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.

'; + } + 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 '