display error when server returns error

diff --git a/build.sh b/build.sh
index 1d4870a6c5e3312edd821bc64f71708ecd479981..964a501d5a9d3b1ebe5af5a237bdb31e036fcbfd 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
 rsync --quiet --recursive src/assets dist/
 rsync --quiet --recursive src/vendor/js/* dist/assets/js/
 rsync --quiet --recursive src/vendor/css/* dist/assets/css/
 rsync --quiet --recursive src/assets dist/
 rsync --quiet --recursive src/vendor/js/* dist/assets/js/
 rsync --quiet --recursive src/vendor/css/* dist/assets/css/

-rsync --quiet --recursive src/vendor/images/* dist/assets/images/
+# rsync --quiet --recursive src/vendor/images/* dist/assets/images/

 rsync --quiet --recursive src/templates dist/
 # rsync --quiet --recursive src/partials dist/
 
 rsync --quiet --recursive src/templates dist/
 # rsync --quiet --recursive src/partials dist/
 

diff --git a/src/assets/css/common.css b/src/assets/css/common.css
index e667b9a2da12bd25206ecd7d958c01c8e01b5238..7f61a4440a985c8add734a8c418b6b430ff6acd2 100755 (executable)
--- a/src/assets/css/common.css
+++ b/src/assets/css/common.css
@@ -40,4 +40,12 @@ footer {
 
 footer p {
   margin: 1em;
 
 footer p {
   margin: 1em;

+}
+
+#error-overlay {
+  text-align: center;
+  font-style: italic;
+  padding: 2em 4em;
+  margin: 4em 8em;
+  background-color: #eee;

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/src/assets/js/nominatim-ui.js b/src/assets/js/nominatim-ui.js
index d6b8c65c358a177278d0e9279d361c0da4f08cfc..5f8eeeff212fcbf0c40ba40673b5f5b62ac9a68e 100755 (executable)
--- a/src/assets/js/nominatim-ui.js
+++ b/src/assets/js/nominatim-ui.js
@@ -68,6 +68,20 @@ function render_template(el, template_name, page_context) {
     el.html(html);
 }
 
     el.html(html);
 }
 

+function show_error(html) {
+    $('#error-overlay').html(html).show();   
+}
+
+function hide_error() {
+    $('#error-overlay').empty().hide();    
+}
+
+
+$(document).ajaxError(function(event, jqXHR, ajaxSettings, thrownError) {
+    // console.log(thrownError);
+    // console.log(ajaxSettings);
+    show_error('Error fetching results from <a href="' + ajaxSettings.url + '">' + ajaxSettings.url + '</a>');
+});

 
 /*********************************************************
 * FORWARD/REVERSE SEARCH PAGE
 
 /*********************************************************
 * FORWARD/REVERSE SEARCH PAGE


@@ -306,7 +320,9 @@ function init_map_on_search_page(is_reverse_search, nominatim_results, request_l
 
 
 
 
 
 

-
+jQuery(document).ready(function(){
+    hide_error();
+});

 
 
 
 
 
 

diff --git a/src/layout.html b/src/layout.html
index 3fef5dd22f8099513b14c311010dec48af52bc9a..29522f6bbd87914528d4d85d143ed6fe428776b6 100644 (file)
--- a/src/layout.html
+++ b/src/layout.html
@@ -90,9 +90,12 @@
     </div>
 
     <main>
     </div>
 
     <main>

-        You need Javascript enable to view this page.

     </main>
 
     </main>
 

+    <div id="error-overlay">
+        You need Javascript enabled to view this page.
+    </div>
+

     <footer>
         <p class="disclaimer">
             Addresses and postcodes are approximate
     <footer>
         <p class="disclaimer">
             Addresses and postcodes are approximate