Merge remote-tracking branch 'upstream/pull/4349'

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

diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js
index b9c48f15a8a3227208da6466fb247a54cf19b547..c096a92fcf725b4d2ce3e2d144416cfcdfe726fc 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -23,17 +23,15 @@ L.OSM.share = function (options) {
     $("<div>")
       .attr("class", "form-check mb-3")
       .appendTo($form)
     $("<div>")
       .attr("class", "form-check mb-3")
       .appendTo($form)

-      .append(
-        $("<label>")
-          .attr("for", "link_marker")
-          .attr("class", "form-check-label")
-          .append(
-            $("<input>")
-              .attr("id", "link_marker")
-              .attr("type", "checkbox")
-              .attr("class", "form-check-input")
-              .bind("change", toggleMarker))
-          .append(I18n.t("javascripts.share.include_marker")));
+      .append($("<label>")
+        .attr("for", "link_marker")
+        .attr("class", "form-check-label")
+        .text(I18n.t("javascripts.share.include_marker")))
+      .append($("<input>")
+        .attr("id", "link_marker")
+        .attr("type", "checkbox")
+        .attr("class", "form-check-input")
+        .bind("change", toggleMarker));

 
     $("<div class='btn-group btn-group-sm mb-2'>")
       .appendTo($form)
 
     $("<div class='btn-group btn-group-sm mb-2'>")
       .appendTo($form)


@@ -66,27 +64,34 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("class", "share-tab")
 
     $("<div>")
       .attr("class", "share-tab")

-      .css("display", "block")

       .appendTo($form)
       .append($("<input>")
         .attr("id", "long_input")
         .attr("type", "text")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "long_input")
         .attr("type", "text")

+        .attr("class", "form-control form-control-sm font-monospace")
+        .attr("readonly", true)

         .on("click", select));
 
     $("<div>")
       .attr("class", "share-tab")
         .on("click", select));
 
     $("<div>")
       .attr("class", "share-tab")

+      .hide()

       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")
         .attr("type", "text")
       .appendTo($form)
       .append($("<input>")
         .attr("id", "short_input")
         .attr("type", "text")

+        .attr("class", "form-control form-control-sm font-monospace")
+        .attr("readonly", true)

         .on("click", select));
 
     $("<div>")
       .attr("class", "share-tab")
         .on("click", select));
 
     $("<div>")
       .attr("class", "share-tab")

+      .hide()

       .appendTo($form)
       .append(
         $("<textarea>")
           .attr("id", "embed_html")
       .appendTo($form)
       .append(
         $("<textarea>")
           .attr("id", "embed_html")

+          .attr("class", "form-control form-control-sm font-monospace")
+          .attr("readonly", true)

           .on("click", select))
       .append(
         $("<p>")
           .on("click", select))
       .append(
         $("<p>")


@@ -130,46 +135,61 @@ L.OSM.share = function (options) {
       .attr("method", "post")
       .appendTo($imageSection);
 
       .attr("method", "post")
       .appendTo($imageSection);
 

-    $("<div>")
-      .attr("class", "mb-3 form-check")
-      .appendTo($form)
-      .append(
-        $("<label>")
-          .attr("for", "image_filter")
-          .attr("class", "form-check-label")
-          .append(
-            $("<input>")
-              .attr("id", "image_filter")
-              .attr("type", "checkbox")
-              .attr("class", "form-check-input")
-              .bind("change", toggleFilter))
-          .append(I18n.t("javascripts.share.custom_dimensions")));
-

     $("<div>")
       .appendTo($form)
     $("<div>")
       .appendTo($form)

-      .append(
-        $("<label>")
-          .attr("for", "mapnik_format")
-          .text(I18n.t("javascripts.share.format")))
-      .append($("<select>")
-        .attr("name", "mapnik_format")
-        .attr("id", "mapnik_format")
-        .append($("<option>").val("png").text("PNG").prop("selected", true))
-        .append($("<option>").val("jpeg").text("JPEG"))
-        .append($("<option>").val("svg").text("SVG"))
-        .append($("<option>").val("pdf").text("PDF")));
+      .attr("class", "row mb-3")
+      .append($("<label>")
+        .attr("for", "mapnik_format")
+        .attr("class", "col-auto col-form-label")
+        .text(I18n.t("javascripts.share.format")))
+      .append($("<div>")
+        .attr("class", "col-auto")
+        .append($("<select>")
+          .attr("name", "mapnik_format")
+          .attr("id", "mapnik_format")
+          .attr("class", "form-select w-auto")
+          .append($("<option>").val("png").text("PNG").prop("selected", true))
+          .append($("<option>").val("jpeg").text("JPEG"))
+          .append($("<option>").val("svg").text("SVG"))
+          .append($("<option>").val("pdf").text("PDF"))));

 
     $("<div>")
       .appendTo($form)
 
     $("<div>")
       .appendTo($form)

+      .attr("class", "row mb-3")

       .append($("<label>")
         .attr("for", "mapnik_scale")
       .append($("<label>")
         .attr("for", "mapnik_scale")

+        .attr("class", "col-auto col-form-label")

         .text(I18n.t("javascripts.share.scale")))
         .text(I18n.t("javascripts.share.scale")))

-      .append("1 : ")
-      .append($("<input>")
-        .attr("name", "mapnik_scale")
-        .attr("id", "mapnik_scale")
-        .attr("type", "text")
-        .on("change", update));
+      .append($("<div>")
+        .attr("class", "col-auto")
+        .append($("<div>")
+          .attr("class", "input-group flex-nowrap")
+          .append($("<span>")
+            .attr("class", "input-group-text")
+            .text("1 : "))
+          .append($("<input>")
+            .attr("name", "mapnik_scale")
+            .attr("id", "mapnik_scale")
+            .attr("type", "text")
+            .attr("class", "form-control")
+            .on("change", update))));
+
+    $("<div>")
+      .attr("class", "row mb-3")
+      .appendTo($form)
+      .append($("<div>")
+        .attr("class", "col-auto")
+        .append($("<div>")
+          .attr("class", "form-check")
+          .append($("<label>")
+            .attr("for", "image_filter")
+            .attr("class", "form-check-label")
+            .text(I18n.t("javascripts.share.custom_dimensions")))
+          .append($("<input>")
+            .attr("id", "image_filter")
+            .attr("type", "checkbox")
+            .attr("class", "form-check-input")
+            .bind("change", toggleFilter))));

 
     ["minlon", "minlat", "maxlon", "maxlat"].forEach(function (name) {
       $("<input>")
 
     ["minlon", "minlat", "maxlon", "maxlat"].forEach(function (name) {
       $("<input>")


@@ -315,7 +335,7 @@ L.OSM.share = function (options) {
       }
 
       $("#embed_html").val(
       }
 
       $("#embed_html").val(

-        "<iframe width=\"425\" height=\"350\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\" src=\"" +
+        "<iframe width=\"425\" height=\"350\" src=\"" +

           escapeHTML(OSM.SERVER_PROTOCOL + "://" + OSM.SERVER_URL + "/export/embed.html?" + $.param(params)) +
           "\" style=\"border: 1px solid black\"></iframe><br/>" +
           "<small><a href=\"" + escapeHTML(map.getUrl(marker)) + "\">" +
           escapeHTML(OSM.SERVER_PROTOCOL + "://" + OSM.SERVER_URL + "/export/embed.html?" + $.param(params)) +
           "\" style=\"border: 1px solid black\"></iframe><br/>" +
           "<small><a href=\"" + escapeHTML(map.getUrl(marker)) + "\">" +