diff options
| -rw-r--r-- | www/js/views/around.js | 1 | ||||
| -rw-r--r-- | www/js/views/details.js | 1 | ||||
| -rw-r--r-- | www/js/views/existing.js | 1 | ||||
| -rw-r--r-- | www/js/views/fms.js | 13 | ||||
| -rw-r--r-- | www/js/views/login.js | 1 | ||||
| -rw-r--r-- | www/js/views/photo.js | 1 | ||||
| -rw-r--r-- | www/js/views/reports.js | 1 | ||||
| -rw-r--r-- | www/js/views/search.js | 1 | ||||
| -rw-r--r-- | www/js/views/sent.js | 1 | ||||
| -rw-r--r-- | www/js/views/submit.js | 5 | ||||
| -rw-r--r-- | www/templates/en/around.html | 2 |
11 files changed, 27 insertions, 1 deletions
diff --git a/www/js/views/around.js b/www/js/views/around.js index a7bce6b..995c6e3 100644 --- a/www/js/views/around.js +++ b/www/js/views/around.js @@ -35,6 +35,7 @@ beforeDisplay: function() { $('#cancel').hide(); + this.fixPageHeight(); }, afterDisplay: function() { diff --git a/www/js/views/details.js b/www/js/views/details.js index b1f889f..d67cbfb 100644 --- a/www/js/views/details.js +++ b/www/js/views/details.js @@ -8,6 +8,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click .ui-btn-right': 'onClickButtonNext', diff --git a/www/js/views/existing.js b/www/js/views/existing.js index 00dd055..7487419 100644 --- a/www/js/views/existing.js +++ b/www/js/views/existing.js @@ -6,6 +6,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click #use_report': 'useReport', 'click #save_report': 'saveReport', diff --git a/www/js/views/fms.js b/www/js/views/fms.js index d701b00..7302c4d 100644 --- a/www/js/views/fms.js +++ b/www/js/views/fms.js @@ -5,6 +5,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click .ui-btn-right': 'onClickButtonNext' @@ -32,8 +33,20 @@ return this; }, + fixPageHeight: function() { + var screen = $(window).height(), + header = $('[data-role=header]').height(), + footer = $('[data-role=footer]').height(), + content = screen - header - footer; + $('[data-role=content]').css({'height': content }); + }, + afterRender: function() {}, + beforeDisplay: function() { + this.fixPageHeight(); + }, + afterDisplay: function() {}, navigate: function( route, direction ) { diff --git a/www/js/views/login.js b/www/js/views/login.js index 119db8c..98ede73 100644 --- a/www/js/views/login.js +++ b/www/js/views/login.js @@ -7,6 +7,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click #login': 'onClickLogin', 'click #logout': 'onClickLogout', diff --git a/www/js/views/photo.js b/www/js/views/photo.js index 8d4b20e..e802c73 100644 --- a/www/js/views/photo.js +++ b/www/js/views/photo.js @@ -8,6 +8,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click .ui-btn-right': 'onClickButtonNext', diff --git a/www/js/views/reports.js b/www/js/views/reports.js index 8340aae..2704dd1 100644 --- a/www/js/views/reports.js +++ b/www/js/views/reports.js @@ -7,6 +7,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .del_report': 'deleteReport', 'click .use_report': 'useReport', diff --git a/www/js/views/search.js b/www/js/views/search.js index 1fa3e38..b506884 100644 --- a/www/js/views/search.js +++ b/www/js/views/search.js @@ -9,6 +9,7 @@ 'click #submit': 'search', 'click #locate': 'goLocate', 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay' }, diff --git a/www/js/views/sent.js b/www/js/views/sent.js index 11defb5..03ec7a7 100644 --- a/www/js/views/sent.js +++ b/www/js/views/sent.js @@ -7,6 +7,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'vclick .ui-btn-left': 'onClickButtonPrev' } diff --git a/www/js/views/submit.js b/www/js/views/submit.js index 9eb4de2..01117fd 100644 --- a/www/js/views/submit.js +++ b/www/js/views/submit.js @@ -7,6 +7,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click .ui-btn-right': 'onClickButtonNext', @@ -88,6 +89,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click #have_password': 'onClickPassword', @@ -139,6 +141,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click #send_confirm': 'onClickSubmit', @@ -197,6 +200,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click #report': 'onClickSubmit', @@ -263,6 +267,7 @@ events: { 'pagehide': 'destroy', + 'pagebeforeshow': 'beforeDisplay', 'pageshow': 'afterDisplay', 'click .ui-btn-left': 'onClickButtonPrev', 'click #report': 'onClickSubmit' diff --git a/www/templates/en/around.html b/www/templates/en/around.html index e74c3de..e10ddc2 100644 --- a/www/templates/en/around.html +++ b/www/templates/en/around.html @@ -4,7 +4,7 @@ </div> <div data-role="content"> - <div id="locating" class="nodisplay" style="text-align: center; padding-top: 50%"> + <div id="locating" class="nodisplay" style="background: white; position: absolute; top: 0; left: 0; right: 0; bottom: 0; z-index: 3010; text-align: center; padding-top: 50%"> <p> Getting Your Location </p> |