diff options
| author | Struan Donald <struan@exo.org.uk> | 2013-07-10 12:53:06 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2013-07-10 12:53:06 +0100 |
| commit | 31b1df7bb36ff70c82d1d36306b0d62bcffc94c8 (patch) | |
| tree | 4ce745e682c68cb92c4dd492c441b784cbe10a81 /www | |
| parent | 97cb8ed2e686bb3a9dd032c2b5833e645fdcecf1 (diff) | |
turn off splash screen fading and add in locating like screens on index
page and home page to minimise the flickering at start up
Diffstat (limited to 'www')
| -rw-r--r-- | www/css/fms.css | 2 | ||||
| -rw-r--r-- | www/index.html | 3 | ||||
| -rw-r--r-- | www/js/views/home.js | 1 | ||||
| -rw-r--r-- | www/templates/en/home.html | 31 |
4 files changed, 9 insertions, 28 deletions
diff --git a/www/css/fms.css b/www/css/fms.css index 2f06a1b..72f10f8 100644 --- a/www/css/fms.css +++ b/www/css/fms.css @@ -436,6 +436,7 @@ /* locating screen */ + #load-screen, #locating { position: absolute; top: 0; @@ -448,6 +449,7 @@ padding-top:40px; } + #load-screen .radar, #locating .radar { background: transparent url('../images/radar.svg') no-repeat top center; width: 100%; diff --git a/www/index.html b/www/index.html index f1b075f..d5335f3 100644 --- a/www/index.html +++ b/www/index.html @@ -84,5 +84,8 @@ <div id="map"></div> </div> <div class="jquerymobile"></div> + <div id="load-screen"> + <div class="radar"></div> + </div> </body> </html> diff --git a/www/js/views/home.js b/www/js/views/home.js index dd908f0..998af1c 100644 --- a/www/js/views/home.js +++ b/www/js/views/home.js @@ -23,6 +23,7 @@ }, afterDisplay: function() { + $('#load-screen').hide(); if ( FMS.isOffline ) { this.navigate( 'offline' ); } else if ( FMS.currentDraft && ( diff --git a/www/templates/en/home.html b/www/templates/en/home.html index 2a19d6d..e8e0e8c 100644 --- a/www/templates/en/home.html +++ b/www/templates/en/home.html @@ -1,30 +1,5 @@ -<div id="index-header" data-role="header"> - <a id="view-my-reports" class="nodisplay" data-role="button" href="#"> - Drafts <span class="draft_count"><% print( FMS.allDrafts.length ) %></span> - </a> - <h1>Find problem</h1> - <a id="login-options" class="ui-btn-right">Account</a> -</div> -<div data-role="content" class="table-cell"> - <div class="container"> - <div class="content" role="main"> - <div class="tablewrapper"> - <div id="locating" class="nodisplay" style="text-align: center; padding-top: 50%"> - Determining location<br> - <span id="accuracy"></span> - </div> - <div id="have_saved" class="nodisplay"> - <p> - You have an incomplete report saved. Would you like to: - </p> - <ul> - <li><input type="button" id="use_saved" value="Complete Saved Report"></li> - <li>Or create a new report and:</li> - <li><input type="button" id="delete_saved" value="Delete Saved Report"></li> - <li><input type="button" id="continue" value="Keep Saved Report"></li> - </ul> - </div> - </div> - </div> +<div data-role="content"> + <div id="locating"> + <div class="radar"></div> </div> </div> |