diff --git a/frontend-js/src/main/js/map/CustomMap.js b/frontend-js/src/main/js/map/CustomMap.js index f4a27abf992fb7239474904a6901816f96fa034d..322dee81b14a7b31aa6149c17cdc94b888e00027 100644 --- a/frontend-js/src/main/js/map/CustomMap.js +++ b/frontend-js/src/main/js/map/CustomMap.js @@ -288,26 +288,6 @@ CustomMap.prototype.createMapMenu = function() { })(); this.divBelt.appendChild(submenuButtonDiv2); } - - var rightHeaderMenu = document.createElement('div'); - rightHeaderMenu.className = "rightHeaderMenu"; - - var submenuButtonDiv = document.createElement('button'); - submenuButtonDiv.id = "clear_button"; - submenuButtonDiv.className = "overview_button"; - submenuButtonDiv.innerHTML = "<i class='fa fa-times' style='font-size:18px; font-weight:300; padding-right:10px;'></i> CLEAR"; - submenuButtonDiv.title = "Clear all queries"; - submenuButtonDiv.style.display = 'inline'; - submenuButtonDiv.onclick = (function() { - return function() { - selfMap.clearData(); - return false; - }; - })(); - rightHeaderMenu.appendChild(submenuButtonDiv); - - this.divBelt.appendChild(rightHeaderMenu); - }; CustomMap.prototype.registerSource = function(overlayCollection) { diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js index f3efdc5199b29b3fb1f2907f0b9de08ff0f13875..1c463a5d8d36e36edf7177d0e2edf707943fcaad 100644 --- a/frontend-js/src/main/js/minerva.js +++ b/frontend-js/src/main/js/minerva.js @@ -283,7 +283,16 @@ function create(params) { return false; }; })(); + + var clearButton = document.getElementsByName("clearButton")[0]; + clearButton.onclick = (function() { + return function() { + result.clearData(); + return false; + }; + })(); + if (ServerConnector.getSessionData().getShowComments()) { result.getControl(ControlType.COMMENT_CHECKBOX).checked=true; return result.refreshComments(); diff --git a/frontend-js/src/test/js/helper.js b/frontend-js/src/test/js/helper.js index 05b1e0d9ce47d6b920dc35c766650811a06466d5..18d101d871f9cf42084b0d1b0c613e170a23d30b 100644 --- a/frontend-js/src/test/js/helper.js +++ b/frontend-js/src/test/js/helper.js @@ -61,6 +61,10 @@ Helper.prototype.createMenuDiv = function() { refreshCommentButton.setAttribute("name", "refreshCommentButton"); result.appendChild(refreshCommentButton); + var clearButton = document.createElement("button"); + clearButton.setAttribute("name", "clearButton"); + result.appendChild(clearButton); + return result; }; diff --git a/web/src/main/webapp/index.xhtml b/web/src/main/webapp/index.xhtml index f66134bb2e0ae66766b85e227cfe060dc7374550..f7208909b305aaca2e3ced22a29043b906917b69 100644 --- a/web/src/main/webapp/index.xhtml +++ b/web/src/main/webapp/index.xhtml @@ -134,6 +134,10 @@ function initMap(){ <i class='fa fa-refresh' style='font-size:21px; font-weight:400;'></i> </button> </div> + <button name="clearButton" class="overview_button" title="Clear all queries"> + <i class='fa fa-times' style='font-size:18px; font-weight:300; padding-right:10px;'></i> + CLEAR + </button> </div> </div> <div id="mapElement" class="mapClass"/>