From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 8 Nov 2013 18:46:24 +0000 (-0800)
Subject: Fix browse overlay status messages
X-Git-Tag: live~5234^2~140
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b903d8b7462519d6ef8f9175fdbde1df6620ccbb

Fix browse overlay status messages
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 2ed869905..7c9d255bb 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -103,10 +103,12 @@ $(document).ready(function () {
   map.dataLayer.options.code = 'D';
 
   if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    initializeNotes(map);
     if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
       map.addLayer(map.noteLayer);
     }
 
+    initializeBrowse(map);
     if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
       map.addLayer(map.dataLayer);
     }
@@ -227,9 +229,6 @@ $(document).ready(function () {
     });
   }
 
-  initializeBrowse(map);
-  initializeNotes(map);
-
   OSM.Index = function(map) {
     var page = {};
 
diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 772690ba3..a0bb42685 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -36,6 +36,7 @@ function initializeBrowse(map) {
   map.on('layerremove', function (e) {
     if (e.layer === dataLayer) {
       map.off("moveend", updateData);
+      clearStatus();
     }
   });
 
@@ -46,28 +47,19 @@ function initializeBrowse(map) {
         browseBounds = bounds;
         getData();
       }
-    } else {
-      setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
     }
   }
 
   function displayFeatureWarning(count, limit, callback) {
     clearStatus();
 
-    var div = document.createElement("div");
-
-    var p = document.createElement("p");
-    p.appendChild(document.createTextNode(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit })));
-    div.appendChild(p);
-
-    var input = document.createElement("input");
-    input.type = "submit";
-    input.value = I18n.t('browse.start_rjs.load_data');
-    input.onclick = callback;
-    div.appendChild(input);
-
-    $("#browse_content").html("");
-    $("#browse_content").append(div);
+    $('#browse_status').append(
+      $("<p class='warning'></p>")
+        .text(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit }))
+        .append(
+          $("<input type='submit'>")
+            .val(I18n.t('browse.start_rjs.load_data'))
+            .click(callback)));
   }
 
   var dataLoader;
@@ -105,14 +97,13 @@ function initializeBrowse(map) {
     dataLoader = $.ajax({
       url: url,
       success: function (xml) {
-        clearStatus();
-
         dataLayer.clearLayers();
         selectedLayer = null;
 
         var features = dataLayer.buildFeatures(xml);
 
         function addFeatures() {
+          clearStatus();
           dataLayer.addData(features);
         }
 
@@ -144,8 +135,10 @@ function initializeBrowse(map) {
   }
 
   function setStatus(status) {
+    $('#browse_status').append($('<p></p>').text(status));
   }
 
   function clearStatus() {
+    $('#browse_status').empty();
   }
 }
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index e7b723d41..451d45948 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -887,6 +887,12 @@ nav.secondary {
   }
 }
 
+#browse_status {
+  p {
+    padding: $lineheight;
+  }
+}
+
 #sidebar_content {
   .loader,
   .load_more {
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index 524dc566f..1daae059e 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -33,6 +33,8 @@
       <p class="error"><%= t 'layouts.osm_read_only' %></p>
     <% end %>
 
+    <div id="browse_status"></div>
+
     <div id="sidebar_content">
       <%= render :partial => "layouts/flash" %>
       <%= yield %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ee316f055..cbd1c60c1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -228,7 +228,7 @@ en:
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"
-      loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      loaded_an_area_with_num_features: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are sure you want to display this data?"
       load_data: "Load Data"
       unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})"
       loading: "Loading..."