--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -34,16 +34,20 @@ <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" /> + if (isDebugServer()) echo '<link rel="stylesheet" href="css/jquery.mobile-1.0a4.css" /> <script type="text/javascript" src="js/jquery-1.5.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="http://code.jquery.com/mobile/1.0a3/jquery.mobile-1.0a3.min.js"></script>'; + <script type="text/javascript" src="js/jquery.mobile-1.0a4.js"></script>'; + else echo '<link rel="stylesheet" href="http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a4.min.css" /> + <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script> + <script>$(document).bind("mobileinit", function(){ + $.mobile.ajaxEnabled = false; +}); +</script> + <script type="text/javascript" src="http://code.jquery.com/mobile/1.0a4/jquery.mobile-1.0a4.min.js"></script>'; if ($datepicker) echo '<script> //reset type=date inputs to text $( document ).bind( "mobileinit", function(){ @@ -83,7 +87,7 @@ text-size: 0.2em; } .min-width-480px .viaPoints { - display: block; + display: inline; } #extrainfo { visibility: hidden; @@ -117,18 +121,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: \"common.inc.php?geolocate=yes&lat=\"+position.coords.latitude+\"&lon=\"+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 } @@ -164,8 +169,10 @@ document.title = "' . $pageTitle . '"; }); </script> - <div data-role="header"> + <div data-role="header" data-position="inline"> + <a href="'.$_SERVER["HTTP_REFERER"].'" 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"> '; @@ -183,7 +190,7 @@ 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })();"; + })();</script>"; $googleAnalyticsImageUrl = googleAnalyticsGetImageUrl(); echo '<noscript><img src="' . $googleAnalyticsImageUrl . '" /></noscript>'; } @@ -196,7 +203,7 @@ $geoerror = !isset($_SESSION['lat']) || !isset($_SESSION['lat']) || $_SESSION['lat'] == "" || $_SESSION['lon'] == ""; } if ($geoerror) { - echo '<div class="error">Sorry, but your location could not currently be detected. + echo '<div id="error">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>'; } @@ -211,7 +218,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());".'">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> @@ -229,7 +236,7 @@ } function trackEvent($category, $action, $label = "", $value = -1) { if (isAnalyticsOn()) { - echo "<script> _gaq.push(['_trackEvent', $category, $action".($label != "" ? ", $label" : "").($value != -1 ? ", $value" : "")."]);"; + echo "<script> _gaq.push(['_trackEvent', $category, $action".($label != "" ? ", $label" : "").($value != -1 ? ", $value" : "")."]);</script>"; } } ?>