Put link next to input and make it non-navigable

[rails.git] / app / assets / javascripts / leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 2f06ab9c577aa7105f3ff51408c183476d51f5c0..edcbfbd4dd9dd94e73879908644b879f768dc51a 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -18,26 +18,23 @@ L.OSM.layers = function(options) {
     var $ui = $('<div>')
       .attr('class', 'layers-ui');
 
     var $ui = $('<div>')
       .attr('class', 'layers-ui');
 

-    $('<section>')
-       .appendTo($ui)
-       .append(
-          $('<a>')
-            .html('&raquo;')
-            .attr('class', 'close-button')
-            .attr('href', '#')
-            .bind('click', toggle))
-       .append(
-        $('<h2>')
+    $('<div>')
+      .attr('class', 'sidebar_heading')
+      .appendTo($ui)
+      .append(
+        $('<a>')
+          .text(I18n.t('javascripts.close'))
+          .attr('class', 'sidebar_close')
+          .attr('href', '#')
+          .bind('click', toggle))
+      .append(
+        $('<h4>')

           .text(I18n.t('javascripts.map.layers.header')));
 
           .text(I18n.t('javascripts.map.layers.header')));
 

-    var baseSection = $('<section>')
-      .addClass('base-layers')
+    var baseSection = $('<div>')
+      .attr('class', 'section base-layers')

       .appendTo($ui);
 
       .appendTo($ui);
 

-    $('<p>')
-      .text(I18n.t('javascripts.map.layers.base'))
-      .appendTo(baseSection);
-

     list = $('<ul>')
       .appendTo(baseSection);
 
     list = $('<ul>')
       .appendTo(baseSection);
 


@@ -67,16 +64,20 @@ L.OSM.layers = function(options) {
 
         function shown() {
           miniMap.invalidateSize();
 
         function shown() {
           miniMap.invalidateSize();

-          setView();
-          map.on('moveend', setView);
+          setView({animate: false});
+          map.on('moveend', moved);

         }
 
         function hide() {
         }
 
         function hide() {

-          map.off('moveend', setView);
+          map.off('moveend', moved);
+        }
+
+        function moved() {
+          setView();

         }
 
         }
 

-        function setView() {
-          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0));
+        function setView(options) {
+          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0), options);

         }
       });
 
         }
       });
 


@@ -108,8 +109,8 @@ L.OSM.layers = function(options) {
     });
 
     if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
     });
 
     if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {

-      var overlaySection = $('<section>')
-        .addClass('overlay-layers')
+      var overlaySection = $('<div>')
+        .attr('class', 'section overlay-layers')

         .appendTo($ui);
 
       $('<p>')
         .appendTo($ui);
 
       $('<p>')