--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -25,7 +25,7 @@ } function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { - global $labsPath; + global $labsPath,$serviceAlertsEnabled; echo ' <!DOCTYPE html> <html lang="en"> @@ -34,17 +34,18 @@ <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> '; +<link rel="dns-prefetch" href="//code.jquery.com"> +<link rel="dns-prefetch" href="//ajax.googleapis.com"> + <link rel="stylesheet" href="' . $labsPath . 'css/jquery-ui-1.8.12.custom.css" />'; if (isDebugServer()) { - $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'; + $jqmcss = $labsPath . 'css/jquery.mobile-1.0b2.css'; + $jqjs = $labsPath . 'js/jquery-1.6.2.min.js'; + $jqmjs = $labsPath . 'js/jquery.mobile-1.0b2.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"; + $jqmcss = "//code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.css"; + $jqjs = "//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"; + $jqmjs = "//code.jquery.com/mobile/1.0b2/jquery.mobile-1.0b2.min.js"; } echo '<link rel="stylesheet" href="' . $jqmcss . '" /> <script src="'.$jqjs.'"></script> @@ -53,16 +54,12 @@ }); </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() { + +<script src="' . $labsPath . 'js/jquery.ui.core.min.js"></script> +<script src="' . $labsPath . 'js/jquery.ui.position.min.js"></script> +<script src="' . $labsPath . 'js/jquery.ui.widget.min.js"></script> + <script src="' . $labsPath . 'js/jquery.ui.autocomplete.min.js"></script> + <script> $(function() { $( "#geolocate" ).autocomplete({ source: "lib/autocomplete.php", @@ -77,7 +74,6 @@ minLength: 2 }); }); -}); </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, @@ -102,8 +98,11 @@ function success(position) { $('#error').val('Location now detected. Please wait for data to load.'); $('#geolocate').val(position.coords.latitude+','+position.coords.longitude); -$.ajax({ url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude }); -location.reload(true); +$.ajax({ async: false, +success: function(){ + location.reload(true); + }, +url: \"include/common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+position.coords.longitude }); } function error(msg) { $('#error').val('Error: '+msg); @@ -160,6 +159,13 @@ 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 ($serviceAlertsEnabled) { + $serviceAlerts = getServiceAlerts("network","network"); + foreach ($serviceAlerts['entities'] as $entity) { + echo "<div id='servicewarning'>".date("F j, g:i a",strtotime($entity['alert']['active_period']['start']))." to ". date("F j, g:i a", strtotime($entity['alert']['active_period']['end']))."<br>Warning: {$entity['alert']['description']['translation']} + <br><a href='{$entity['alert']['url']['translation']}'>Source</a> </div>"; + } + } } } function include_footer()