Create pane button fn

[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 87ff8737048a6319c91839416e41f38f23bff4da..9ef2d759eea4af789f5c0d9a6882fa5d9b187528 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,5 +1,5 @@
 L.OSM.layers = function (options) {
 L.OSM.layers = function (options) {

-  var control = L.control(options);
+  var control = L.OSM.sidebarPane(options);

 
   control.onAdd = function (map) {
     var layers = options.layers;
 
   control.onAdd = function (map) {
     var layers = options.layers;


@@ -7,28 +7,10 @@ L.OSM.layers = function (options) {
     var $container = $("<div>")
       .attr("class", "control-layers");
 
     var $container = $("<div>")
       .attr("class", "control-layers");
 

-    var button = $("<a>")
-      .attr("class", "control-button")
-      .attr("href", "#")
-      .attr("title", I18n.t("javascripts.map.layers.title"))
-      .html("<span class=\"icon layers\"></span>")
-      .on("click", toggle)
+    var button = this.makeButton("layers", "javascripts.map.layers.title", toggle)

       .appendTo($container);
 
       .appendTo($container);
 

-    var $ui = $("<div>")
-      .attr("class", "layers-ui");
-
-    $("<div>")
-      .attr("class", "sidebar_heading")
-      .appendTo($ui)
-      .append(
-        $("<span>")
-          .text(I18n.t("javascripts.close"))
-          .attr("class", "icon close")
-          .bind("click", toggle))
-      .append(
-        $("<h4>")
-          .text(I18n.t("javascripts.map.layers.header")));
+    var $ui = this.makeUI("layers-ui", "javascripts.map.layers.header", toggle);

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


@@ -116,10 +98,10 @@ L.OSM.layers = function (options) {
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))
 
       $("<p>")
         .text(I18n.t("javascripts.map.layers.overlays"))

-        .attr("class", "deemphasize")
+        .attr("class", "text-muted")

         .appendTo(overlaySection);
 
         .appendTo(overlaySection);
 

-      var overlays = $("<ul class='list-unstyled'>")
+      var overlays = $("<ul class='list-unstyled form-check'>")

         .appendTo(overlaySection);
 
       var addOverlay = function (layer, name, maxArea) {
         .appendTo(overlaySection);
 
       var addOverlay = function (layer, name, maxArea) {


@@ -130,12 +112,14 @@ L.OSM.layers = function (options) {
           .appendTo(overlays);
 
         var label = $("<label>")
           .appendTo(overlays);
 
         var label = $("<label>")

+          .attr("class", "form-check-label")

           .appendTo(item);
 
         var checked = map.hasLayer(layer);
 
         var input = $("<input>")
           .attr("type", "checkbox")
           .appendTo(item);
 
         var checked = map.hasLayer(layer);
 
         var input = $("<input>")
           .attr("type", "checkbox")

+          .attr("class", "form-check-input")

           .prop("checked", checked)
           .appendTo(label);
 
           .prop("checked", checked)
           .appendTo(label);
 


@@ -169,7 +153,7 @@ L.OSM.layers = function (options) {
           }
 
           $(item).attr("class", disabled ? "disabled" : "");
           }
 
           $(item).attr("class", disabled ? "disabled" : "");

-          item.attr("data-original-title", disabled ?
+          item.attr("data-bs-original-title", disabled ?

             I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
         });
       };
             I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
         });
       };