--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -23,10 +23,9 @@ $url.= "&guid=ON"; return str_replace("&", "&", $url); } - function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { -global $labsPath; + global $labsPath,$serviceAlertsEnabled; echo ' <!DOCTYPE html> <html lang="en"> @@ -34,33 +33,32 @@ <meta charset="UTF-8"> <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" />'; + <meta name="google-site-verification" content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" /> +<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()) { - echo '<link rel="stylesheet" href="'.$labsPath.'css/jquery.mobile-1.0b1.css" /> - - <script type="text/javascript" src="'.$labsPath.'js/jquery-1.6.1.min.js"></script> - <script>$(document).bind("mobileinit", function(){ + $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 = "//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> + <script>$(document).bind("mobileinit", function(){ $.mobile.ajaxEnabled = false; }); -</script> - <script type="text/javascript" src="'.$labsPath.'js/jquery.mobile-1.0b1.js"></script>'; - } - else { - echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.css" /> - <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script> - <script>$(document).bind("mobileinit", function(){ - $.mobile.ajaxEnabled = false; -}); -</script> - <script type="text/javascript" src="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js"></script>'; - } - echo ' - <script src="'.$labsPath.'js/jquery.ui.autocomplete.min.js"></script> -<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> + <script src="'.$jqmjs.'"></script> + +<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({ @@ -76,11 +74,9 @@ minLength: 2 }); }); - </script> - '; + </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, + 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 { @@ -88,11 +84,8 @@ box-shadow: none; -webkit-box-shadow: none; }'; -echo '</style>'; - -echo '<link rel="stylesheet" href="'.$labsPath.'css/local.css.php?labsPath='.$labsPath.'" />'; - - + 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" /> @@ -149,28 +142,33 @@ <div data-role="header" data-position="inline"> <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="'.$labsPath.'/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 + 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>'; - } + } + 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>'; } } - + 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']))."{$entity['alert']['header_text']['translation']['text']}<br>Warning: {$entity['alert']['description_text']['translation']['text']} + <br><a href='{$entity['alert']['url']['translation']['text']}'>Source</a> </div>"; + } + } + } } function include_footer() { - -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>'; + 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() { @@ -183,17 +181,15 @@ })();</script>"; $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl(); echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>'; - - } - echo "\n</div></div></body></html>"; -} -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 'Sorry, but your location could not currently be detected. @@ -202,27 +198,13 @@ } echo '</div>'; echo '<div id="settings" data-role="collapsible" data-collapsed="' . !$geoerror . '"> - <h3>Change Time/Place (' . (isset($_SESSION['time']) ? $_SESSION['time'] : "Current Time,") . ' ' . ucwords(service_period()) . ')...</h3> + <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"/> </div></form>