--- a/include/common-template.inc.php +++ b/include/common-template.inc.php @@ -121,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: \"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 } @@ -168,7 +169,8 @@ 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">Back</a> <h1>' . $pageTitle . '</h1> </div><!-- /header --> <a name="maincontent" id="maincontent"></a> @@ -200,7 +202,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>'; } @@ -215,7 +217,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>