--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -1,28 +1,28 @@ <?php - // Copyright 2009 Google Inc. All Rights Reserved. - $GA_ACCOUNT = "MO-22173039-1"; - $GA_PIXEL = "/lib/ga.php"; - - function googleAnalyticsGetImageUrl() { - global $GA_ACCOUNT, $GA_PIXEL; - $url = ""; - $url .= $GA_PIXEL . "?"; - $url .= "utmac=" . $GA_ACCOUNT; - $url .= "&utmn=" . rand(0, 0x7fffffff); - $referer = $_SERVER["HTTP_REFERER"]; - $query = $_SERVER["QUERY_STRING"]; - $path = $_SERVER["REQUEST_URI"]; - if (empty($referer)) { - $referer = "-"; - } - $url .= "&utmr=" . urlencode($referer); - if (!empty($path)) { - $url .= "&utmp=" . urlencode($path); - } - $url .= "&guid=ON"; - return str_replace("&", "&", $url); - } - +// Copyright 2009 Google Inc. All Rights Reserved. +$GA_ACCOUNT = "MO-22173039-1"; +$GA_PIXEL = "/lib/ga.php"; +function googleAnalyticsGetImageUrl() +{ + global $GA_ACCOUNT, $GA_PIXEL; + //if (stristr($_SERVER['HTTP_USER_AGENT'], 'Googlebot') return ""; + $url = ""; + $url.= $GA_PIXEL . "?"; + $url.= "utmac=" . $GA_ACCOUNT; + $url.= "&utmn=" . rand(0, 0x7fffffff); + $referer = $_SERVER["HTTP_REFERER"]; + $query = $_SERVER["QUERY_STRING"]; + $path = $_SERVER["REQUEST_URI"]; + if (empty($referer)) { + $referer = "-"; + } + $url.= "&utmr=" . urlencode($referer); + if (!empty($path)) { + $url.= "&utmp=" . urlencode($path); + } + $url.= "&guid=ON"; + return str_replace("&", "&", $url); +} function include_header($pageTitle, $pageType, $opendiv = true, $geolocate = false, $datepicker = false) { echo ' @@ -32,30 +32,51 @@ <meta charset="UTF-8"> <title>' . $pageTitle . '</title> <meta name="google-site-verification" -content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" />'; - if ($datepicker) echo '<link rel="stylesheet" href="css/jquery.ui.datepicker.mobile.css" />'; - if (isDebugServer()) echo '<link rel="stylesheet" href="css/jquery-mobile-1.0a3.css" /> - <script type="text/javascript" src="js/jquery-1.5.js"></script> +content="-53T5Qn4TB_de1NyfR_ZZkEVdUNcNFSaYKSFkWKx-sY" /> + <link rel="stylesheet" href="css/jquery-ui-1.8.12.custom.css" />'; + if (isDebugServer()) { + echo '<link rel="stylesheet" href="css/jquery.mobile-1.0b1.css" /> + + <script type="text/javascript" src="js/jquery-1.6.1.min.js"></script> <script>$(document).bind("mobileinit", function(){ $.mobile.ajaxEnabled = false; }); </script> - <script type="text/javascript" src="js/jquery-mobile-1.0a3.js"></script>'; - else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.css" /> - <script type="text/javascript" src="http://code.jquery.com/jquery-1.5.1.min.js"></script> + <script type="text/javascript" src="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.0a3/jquery.mobile-1.0a3.min.js"></script>'; - if ($datepicker) echo '<script> - //reset type=date inputs to text - $( document ).bind( "mobileinit", function(){ - $.mobile.page.prototype.options.degradeInputs.date = true; - }); - </script> - <script src="js/jQuery.ui.datepicker.js"></script>'; + <script type="text/javascript" src="http://code.jquery.com/mobile/1.0b1/jquery.mobile-1.0b1.min.js"></script>'; + } + echo ' + <script src="js/jquery.ui.autocomplete.min.js"></script> +<script src="js/jquery.ui.core.min.js"></script> +<script src="js/jquery.ui.position.min.js"></script> +<script src="js/jquery.ui.widget.min.js"></script> + <script> + $(function() { + $( "#geolocate" ).autocomplete({ + source: "lib/autocomplete.php", + minLength: 2 + }); + $( "#from" ).autocomplete({ + source: "lib/autocomplete.php", + minLength: 2 + }); + $( "#to" ).autocomplete({ + source: "lib/autocomplete.php", + minLength: 2 + }); + }); + </script> + '; echo '<style type="text/css"> +.ui-li-thumb, .ui-li-icon { position: relative; } .ui-navbar { width: 100%; } @@ -68,10 +89,14 @@ .ui-listview-filter { margin: 0 !important; } - .ui-icon-navigation { + .ui-icon-navigation { background-image: url(css/images/113-navigation.png); background-position: 1px 0; } + .ui-icon-beaker { + background-image: url(css/images/91-beaker-2.png); + background-position: 1px 0; + } #footer { text-size: 0.75em; text-align: center; @@ -87,12 +112,40 @@ text-size: 0.2em; } .min-width-480px .viaPoints { - display: block; + display: inline; } #extrainfo { visibility: hidden; display: none; } + #servicewarning { + padding: 1em; + margin-bottom: 0.5em; + text-size: 0.2em; + background-color: #FF9; + -moz-border-radius: 15px; +border-radius: 15px; + } + +/*#leftcolumn { + float: none; +} +.min-width-768px #leftcolumn { + float: left; + width: 30%; +} +#rightcolumn { + float: none; +} +.min-width-768px #rightcolumn { + float: right; + width: 68%; +}*/ + +#footer { +clear:both; +text-align:center; +} // source http://webaim.org/techniques/skipnav/ #skip a, #skip a:hover, #skip a:visited { @@ -111,7 +164,7 @@ height:auto; } </style>'; - 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 '<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" /> <link rel="apple-touch-startup-image" href="startup.png" /> @@ -121,18 +174,19 @@ echo "<script> 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); } function error(msg) { - console.log(msg); +$('#error').val('Error: '+msg); } function geolocate() { if (navigator.geolocation) { var options = { - enableHighAccuracy: false, + enableHighAccuracy: true, timeout: 60000, maximumAge: 10000 } @@ -141,20 +195,25 @@ } $(document).ready(function() { $('#here').click(function(event) { $('#geolocate').val(geolocate()); return false;}); -$('#here').show(); + $('#here').show(); + /*if ($.mobile.media('screen and (min-width: 768px)')) { + $('map a:first').click(); + $('#settings a:first').click(); + }*/ }); "; -if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();"; -echo "</script> "; + if (!isset($_SESSION['lat']) || $_SESSION['lat'] == "") echo "geolocate();"; + echo "</script> "; } if (isAnalyticsOn()) echo ' -<script type="text/javascript">'." +<script type="text/javascript">' . " var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-22173039-1']); _gaq.push(['_trackPageview']); + _gaq.push(['_trackPageLoadTime']); </script>"; -echo '</head> + echo '</head> <body> <div id="skip"> <a href="#maincontent">Skip to content</a> @@ -162,25 +221,32 @@ '; if ($opendiv) { echo '<div data-role="page"> - <script> -$(document).ready(function () -{ - document.title = "' . $pageTitle . '"; -}); -</script> - <div data-role="header"> + <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="/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 +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>'; + } + } + } + } function include_footer() { - echo '<div id="footer"><a href="about.php">About/Contact Us</a> <a href="feedback.php">Feedback/Bug Report</a></a>'; + echo '<div id="footer"><a href="about.php">About/Contact Us</a> <a href="feedback.php">Feedback/Bug Report</a> <a href="privacy.php">Privacy Policy</a>'; echo '</div>'; - if (isAnalyticsOn()) { - echo "<script> (function() { + if (isAnalyticsOn()) { + echo "<script> (function() { var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; ga.src = ('https:' == document.location.protocol ? @@ -188,9 +254,11 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })();</script>"; - $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl(); - echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>'; - } + $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl(); + echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>'; + + } + echo "\n</div></div></body></html>"; } function timePlaceSettings($geolocate = false) { @@ -199,14 +267,16 @@ if ($geolocate == true) { $geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == ""; } + echo '<div id="error">'; if ($geoerror) { - echo '<div class="error">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.</div>'; - } - echo '<div data-role="collapsible" data-collapsed="' . !$geoerror . '"> + or enter an address/co-ordinates in the box below.'; + } + 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> - <form action="'.basename($_SERVER['PHP_SELF'])."?".$_SERVER['QUERY_STRING'].'" method="post"> + <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> @@ -215,7 +285,7 @@ <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> + <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> @@ -224,17 +294,18 @@ 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> + <a href="#" style="display:none" name="currentPeriod" id="currentPeriod">Current Period?</a> </div> <input type="submit" value="Update"/> - </form> - </div></div>'; -} -function trackEvent($category, $action, $label = "", $value = -1) { - if (isAnalyticsOn()) { - echo "<script> _gaq.push(['_trackEvent', $category, $action".($label != "" ? ", $label" : "").($value != -1 ? ", $value" : "")."]);</script>"; - } + </div></form> + </div>'; +} +function trackEvent($category, $action, $label = "", $value = - 1) +{ + if (isAnalyticsOn()) { + echo "\n<script> _gaq.push(['_trackEvent', '$category', '$action'" . ($label != "" ? ", '$label'" : "") . ($value != - 1 ? ", $value" : "") . "]);</script>"; + } } ?>