From 4ab48c4e43818efc547c3f86af8e13c7b25798af Mon Sep 17 00:00:00 2001
From: Paco Dupont <paco.dupont@exwexs.fr>
Date: Tue, 5 Dec 2017 13:14:13 +0100
Subject: [PATCH 1/5] Fix loading text if naturalEvents is not set

---
 web/index.html                     | 3 ++-
 web/js/layers/wv.layers.sidebar.js | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index ccd0ddf51b..66ea89d00f 100644
--- a/web/index.html
+++ b/web/index.html
@@ -291,7 +291,8 @@
               <ul id="productsHolder-tabs"></ul>
               <div id="productsHoldertoggleButtonHolder"></div>
               <div id="products"></div>
-              <div id="wv-events">Loading...</div>
+              <div id="wv-events"></div>
+              <div id="wv-loading">Loading...</div>
               <div id="wv-data"></div>
             </section>
             <div id="wv-map" class="wv-map"></div>
diff --git a/web/js/layers/wv.layers.sidebar.js b/web/js/layers/wv.layers.sidebar.js
index 0aa0e84189..1e384580a9 100644
--- a/web/js/layers/wv.layers.sidebar.js
+++ b/web/js/layers/wv.layers.sidebar.js
@@ -227,6 +227,9 @@ wv.layers.sidebar = wv.layers.sidebar || function (models, config) {
 
     $('.accordionToggler')
       .bind('click', self.toggle);
+
+    // Hide loading information after rendering
+    $('#wv-loading').hide();
   };
 
   var onTabChange = function (e, ui) {

From fb07155197d239923a63fefa9a188a94f7b643b0 Mon Sep 17 00:00:00 2001
From: Paco Dupont <paco.dupont@exwexs.fr>
Date: Tue, 5 Dec 2017 16:37:49 +0100
Subject: [PATCH 2/5] Moved wv-loading div at the end of the productsHolder
 section

---
 web/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index 66ea89d00f..667cba35fd 100644
--- a/web/index.html
+++ b/web/index.html
@@ -292,8 +292,8 @@
               <div id="productsHoldertoggleButtonHolder"></div>
               <div id="products"></div>
               <div id="wv-events"></div>
-              <div id="wv-loading">Loading...</div>
               <div id="wv-data"></div>
+              <div id="wv-loading">Loading...</div>
             </section>
             <div id="wv-map" class="wv-map"></div>
             <div id="eventsHolder"></div>

From 2f0952a2970be34dd17d45f0c1bdaee538499e90 Mon Sep 17 00:00:00 2001
From: Paco Dupont <paco.dupont@gmail.com>
Date: Fri, 19 Jan 2018 09:22:09 +0100
Subject: [PATCH 3/5] added loading text to events div

---
 web/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index.html b/web/index.html
index 667cba35fd..dbd5bb4e98 100644
--- a/web/index.html
+++ b/web/index.html
@@ -291,7 +291,7 @@
               <ul id="productsHolder-tabs"></ul>
               <div id="productsHoldertoggleButtonHolder"></div>
               <div id="products"></div>
-              <div id="wv-events"></div>
+              <div id="wv-events">Loading...</div>
               <div id="wv-data"></div>
               <div id="wv-loading">Loading...</div>
             </section>

From bc59df9652f8ca847f7db6f42ebeadbea2fc6e95 Mon Sep 17 00:00:00 2001
From: Paco Dupont <paco.dupont@gmail.com>
Date: Fri, 19 Jan 2018 09:48:39 +0100
Subject: [PATCH 4/5] Removed loading div, added Loading text on naturalEvent
 init

---
 web/index.html                              | 3 +--
 web/js/layers/wv.layers.sidebar.js          | 3 ---
 web/js/naturalEvents/wv.naturalEvents.ui.js | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/index.html b/web/index.html
index dbd5bb4e98..4a718783ab 100644
--- a/web/index.html
+++ b/web/index.html
@@ -291,9 +291,8 @@
               <ul id="productsHolder-tabs"></ul>
               <div id="productsHoldertoggleButtonHolder"></div>
               <div id="products"></div>
-              <div id="wv-events">Loading...</div>
+              <div id="wv-events"></div>
               <div id="wv-data"></div>
-              <div id="wv-loading">Loading...</div>
             </section>
             <div id="wv-map" class="wv-map"></div>
             <div id="eventsHolder"></div>
diff --git a/web/js/layers/wv.layers.sidebar.js b/web/js/layers/wv.layers.sidebar.js
index 1e384580a9..0aa0e84189 100644
--- a/web/js/layers/wv.layers.sidebar.js
+++ b/web/js/layers/wv.layers.sidebar.js
@@ -227,9 +227,6 @@ wv.layers.sidebar = wv.layers.sidebar || function (models, config) {
 
     $('.accordionToggler')
       .bind('click', self.toggle);
-
-    // Hide loading information after rendering
-    $('#wv-loading').hide();
   };
 
   var onTabChange = function (e, ui) {
diff --git a/web/js/naturalEvents/wv.naturalEvents.ui.js b/web/js/naturalEvents/wv.naturalEvents.ui.js
index 2982a9aad9..6a45150e67 100644
--- a/web/js/naturalEvents/wv.naturalEvents.ui.js
+++ b/web/js/naturalEvents/wv.naturalEvents.ui.js
@@ -9,6 +9,9 @@ wv.naturalEvents.ui = wv.naturalEvents.ui || function (models, ui, config, reque
   var naturalEventMarkers = wv.naturalEvents.markers(models, ui, config);
 
   var init = function () {
+    // Display loading information for user feedback on slow network
+    $('#wv-events').text("Loading...");
+
     view = ui.map.selected.getView();
 
     request.events.on('queryResults', function () {

From 2e3215798f60d207cb0fe2cba92e9bdfe59168f8 Mon Sep 17 00:00:00 2001
From: Paco Dupont <paco.dupont@gmail.com>
Date: Fri, 19 Jan 2018 09:59:39 +0100
Subject: [PATCH 5/5] changed loading string to single quote

---
 web/js/naturalEvents/wv.naturalEvents.ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/js/naturalEvents/wv.naturalEvents.ui.js b/web/js/naturalEvents/wv.naturalEvents.ui.js
index 6a45150e67..02fe46f550 100644
--- a/web/js/naturalEvents/wv.naturalEvents.ui.js
+++ b/web/js/naturalEvents/wv.naturalEvents.ui.js
@@ -10,7 +10,7 @@ wv.naturalEvents.ui = wv.naturalEvents.ui || function (models, ui, config, reque
 
   var init = function () {
     // Display loading information for user feedback on slow network
-    $('#wv-events').text("Loading...");
+    $('#wv-events').text('Loading...');
 
     view = ui.map.selected.getView();