--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -54,14 +54,15 @@ <link rel="dns-prefetch" href="//code.jquery.com"> <link rel="dns-prefetch" href="//ajax.googleapis.com"> <link rel="stylesheet" href="' . $basePath . 'css/jquery-ui-1.8.12.custom.css" />'; + $jqmVersion = "1.0rc1"; if (isDebugServer()) { - $jqmcss = $basePath . 'css/jquery.mobile-1.0b3.css'; - $jqjs = $basePath . 'js/jquery-1.6.2.min.js'; - $jqmjs = $basePath . 'js/jquery.mobile-1.0b3.js'; + $jqmcss = $basePath . "css/jquery.mobile-$jqmVersion.css"; + $jqjs = $basePath . "js/jquery-1.6.2.min.js"; + $jqmjs = $basePath . "js/jquery.mobile-$jqmVersion.js"; } else { - $jqmcss = "//code.jquery.com/mobile/1.0b3/jquery.mobile-1.0b3.min.css"; + $jqmcss = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.css"; $jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"; - $jqmjs = "//code.jquery.com/mobile/1.0b3/jquery.mobile-1.0b3.min.js"; + $jqmjs = "//code.jquery.com/mobile/$jqmVersion/jquery.mobile-$jqmVersion.min.js"; } echo '<link rel="stylesheet" href="' . $jqmcss . '" /> <script src="' . $jqjs . '"></script> @@ -168,6 +169,7 @@ </div><!-- /header --> <a name="maincontent" id="maincontent"></a> <div data-role="content"> '; + if ($GTFSREnabled) { $overrides = getServiceOverride(); if ($overrides['service_id']) { if ($overrides['service_id'] == "noservice") { @@ -177,7 +179,6 @@ 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>'; } } - if ($GTFSREnabled) { $serviceAlerts = getServiceAlertsAsArray("agency", "0"); if (isset($serviceAlerts['entity']) && sizeof($serviceAlerts['entity']) > 0) { foreach ($serviceAlerts['entity'] as $entity) {