aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/around.html4
-rw-r--r--www/details.html2
-rw-r--r--www/frontpage-form.html4
-rw-r--r--www/index.html2
-rw-r--r--www/js/mobile.js18
-rw-r--r--www/js/mobile_config.js1
-rw-r--r--www/photo.html2
-rw-r--r--www/settings.html6
8 files changed, 24 insertions, 15 deletions
diff --git a/www/around.html b/www/around.html
index 665cca5..fc33a05 100644
--- a/www/around.html
+++ b/www/around.html
@@ -1,8 +1,8 @@
<div id="around-page" class="wrapper" data-role="page">
<div data-id="locate" id="around-header" data-role="header" data-position="fixed">
- <a href="frontpage-form.html" class="ui-btn-left">Search</a>
+ <a href="frontpage-form.html" class="ui-btn-left" data-transition="slideup">Search</a>
<h1>Locate</h1>
- <a href="settings.html" class="ui-btn-right" data-icon="gear" data-iconpos="notext"></a>
+ <a href="settings.html" class="ui-btn-right" data-transition="slideup" data-icon="gear" data-iconpos="notext"></a>
</div>
<div class="table-cell">
diff --git a/www/details.html b/www/details.html
index 760744c..db3f8a7 100644
--- a/www/details.html
+++ b/www/details.html
@@ -1,5 +1,5 @@
<div id="details-page" class="wrapper" data-role="page" data-add-back-btn="true">
- <div data-role="header" data-position="fixed" data-id="locate">
+ <div data-role="header" data-position="fixed" >
<h1>Details</h1>
<a href="submit.html" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Next</a>
</div>
diff --git a/www/frontpage-form.html b/www/frontpage-form.html
index 613b56d..b43e592 100644
--- a/www/frontpage-form.html
+++ b/www/frontpage-form.html
@@ -1,8 +1,8 @@
<div class="wrapper" id="locate-page" data-role="page">
<div data-id="locate" id="search-header" data-role="header" data-position="fixed">
- <a href="index.html" class="ui-btn-left">Locate</a>
+ <a href="index.html" data-transition="slidedown" class="ui-btn-left">Locate</a>
<h1>Locate</h1>
- <a href="settings.html" class="ui-btn-right" data-icon="gear" data-iconpos="notext"></a>
+ <a href="settings.html" data-transition="slideup" class="ui-btn-right" data-icon="gear" data-iconpos="notext"></a>
</div>
<div class="table-cell">
<div class="container">
diff --git a/www/index.html b/www/index.html
index 1ac5272..a3ea950 100644
--- a/www/index.html
+++ b/www/index.html
@@ -51,7 +51,7 @@
<body id="container" class="frontpage fullwidthpage">
<div class="wrapper" id="front-page" data-role="page">
<div data-id="locate" id="index-header" data-role="header" data-position="fixed">
- <a href="frontpage-form.html" class="ui-btn-left">Search</a>
+ <a href="frontpage-form.html" data-transition="slideup" class="ui-btn-left">Search</a>
<h1>Locate</h1>
</div>
<div class="table-cell">
diff --git a/www/js/mobile.js b/www/js/mobile.js
index e87cecd..29ea0d7 100644
--- a/www/js/mobile.js
+++ b/www/js/mobile.js
@@ -21,12 +21,18 @@ function touchmove(e) {
}
/* location code */
-function show_around( lat, long ) {
+function show_around( lat, long, use_transition ) {
+
+ var options = { transition: 'slide' };
+ if ( use_transition ) {
+ options = { transition: use_transition, reverse: true };
+ }
+
pc = $('#pc').val();
localStorage.latitude = lat;
localStorage.longitude = long;
localStorage.pc = pc || '';
- $.mobile.changePage('around.html');
+ $.mobile.changePage('around.html', options );
return false;
}
@@ -92,7 +98,7 @@ function lookup_string(q) {
}
if ( valid_locations == 1 ) {
- show_around( latitude, longitude );
+ show_around( latitude, longitude, 'slideup' );
} else if ( valid_locations === 0 ) {
location_error('Location not found');
$('#pc').select();
@@ -101,7 +107,7 @@ function lookup_string(q) {
$('#multiple').remove();
var multiple_html = '<ul id="multiple"><li>Multiple locations found, please select one:';
for ( i = 0; i < multiple.length; i++ ) {
- multiple_html += '<li><a href="#" onclick="show_around( ' + multiple[i].latitude + ',' + multiple[i].longitude +')">' + multiple[i].address + '</a></li>';
+ multiple_html += '<li><a href="#" onclick="show_around( ' + multiple[i].latitude + ',' + multiple[i].longitude +', \'slideup\')">' + multiple[i].address + '</a></li>';
}
multiple_html += '</ul>';
$('#front-howto').hide();
@@ -116,6 +122,8 @@ function lookup_string(q) {
function locate() {
$("#multiple").remove();
+ delete localStorage.currentReport;
+
var pc = $('#pc').val();
if (!pc) {
@@ -126,7 +134,7 @@ function locate() {
if ( valid_postcode( pc ) ) {
jQuery.get( CONFIG.MAPIT_URL + 'postcode/' + pc + '.json', function(data, status) {
if ( status == 'success' ) {
- show_around( data.wgs84_lat, data.wgs84_lon );
+ show_around( data.wgs84_lat, data.wgs84_lon, 'slideup' );
} else {
alert('Could not locate postcode');
}
diff --git a/www/js/mobile_config.js b/www/js/mobile_config.js
index ef96235..d208fd9 100644
--- a/www/js/mobile_config.js
+++ b/www/js/mobile_config.js
@@ -1,3 +1,4 @@
$(document).bind("mobileinit", function(){
$.mobile.ignoreContentEnabled = true;
+ $.mobile.defaultPageTransition = 'slide';
});
diff --git a/www/photo.html b/www/photo.html
index dfa61b9..ed5d9b6 100644
--- a/www/photo.html
+++ b/www/photo.html
@@ -1,5 +1,5 @@
<div id="photo-page" class="wrapper" data-role="page" data-add-back-btn="true">
- <div data-role="header" data-position="fixed" data-id="locate">
+ <div data-role="header" data-position="fixed" >
<h1>Add Photo</h1>
<a href="details.html" id="photo-next-btn" data-icon="arrow-r" data-iconpos="right" class="ui-btn-right">Skip</a>
</div>
diff --git a/www/settings.html b/www/settings.html
index 30cf8b3..317969a 100644
--- a/www/settings.html
+++ b/www/settings.html
@@ -1,7 +1,7 @@
- <div class="wrapper" id="locate-page" data-role="page">
- <div data-id="locate" id="settings-header" data-role="header" data-position="fixed">
- <a href="index.html" class="ui-btn-left">Locate</a>
+ <div class="wrapper" id="settings-page" data-role="page">
+ <div id="settings-header" data-role="header" data-position="fixed">
<h1>Settings</h1>
+ <a href="index.html" data-rel="back" class="ui-btn-right">Done</a>
</div>
<div class="table-cell">
<div class="container">
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 21:49:28 +0000