Merge commit '73f0be96472a8d021a6347953192ca7b6ec509d7'

[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 eedfe3ab34abfab47f41ee4619fdf0ee6065337a..79cb959732211750a7b517a07f44b9e4e77c14ad 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -44,19 +44,20 @@ L.OSM.share = function (options) {
       .appendTo($linkSection);
 
     var $form = $("<form>")
       .appendTo($linkSection);
 
     var $form = $("<form>")

-      .attr("class", "standard-form")

       .appendTo($linkSection);
 
     $("<div>")
       .appendTo($linkSection);
 
     $("<div>")

-      .attr("class", "form-row")
+      .attr("class", "form-check form-group")

       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "link_marker")
       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "link_marker")

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

           .append(
             $("<input>")
               .attr("id", "link_marker")
               .attr("type", "checkbox")
           .append(
             $("<input>")
               .attr("id", "link_marker")
               .attr("type", "checkbox")

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

               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 
               .bind("change", toggleMarker))
           .append(I18n.t("javascripts.share.include_marker")));
 


@@ -91,7 +92,7 @@ L.OSM.share = function (options) {
       });
 
     $("<div>")
       });
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "share-tab")

       .css("display", "block")
       .appendTo($form)
       .append($("<input>")
       .css("display", "block")
       .appendTo($form)
       .append($("<input>")


@@ -100,7 +101,7 @@ L.OSM.share = function (options) {
         .on("click", select));
 
     $("<div>")
         .on("click", select));
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "share-tab")

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


@@ -108,7 +109,7 @@ L.OSM.share = function (options) {
         .on("click", select));
 
     $("<div>")
         .on("click", select));
 
     $("<div>")

-      .attr("class", "form-row share-tab")
+      .attr("class", "share-tab")

       .appendTo($form)
       .append(
         $("<textarea>")
       .appendTo($form)
       .append(
         $("<textarea>")


@@ -116,7 +117,7 @@ L.OSM.share = function (options) {
           .on("click", select))
       .append(
         $("<p>")
           .on("click", select))
       .append(
         $("<p>")

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

           .text(I18n.t("javascripts.share.paste_html"))
           .appendTo($linkSection));
 
           .text(I18n.t("javascripts.share.paste_html"))
           .appendTo($linkSection));
 


@@ -147,32 +148,32 @@ L.OSM.share = function (options) {
 
     $("<div>")
       .attr("id", "export-warning")
 
     $("<div>")
       .attr("id", "export-warning")

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

       .text(I18n.t("javascripts.share.only_standard_layer"))
       .appendTo($imageSection);
 
     $form = $("<form>")
       .attr("id", "export-image")
       .text(I18n.t("javascripts.share.only_standard_layer"))
       .appendTo($imageSection);
 
     $form = $("<form>")
       .attr("id", "export-image")

-      .attr("class", "standard-form")

       .attr("action", "/export/finish")
       .attr("method", "post")
       .appendTo($imageSection);
 
     $("<div>")
       .attr("action", "/export/finish")
       .attr("method", "post")
       .appendTo($imageSection);
 
     $("<div>")

-      .attr("class", "form-row")
+      .attr("class", "form-group form-check")

       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "image_filter")
       .appendTo($form)
       .append(
         $("<label>")
           .attr("for", "image_filter")

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

           .append(
             $("<input>")
               .attr("id", "image_filter")
               .attr("type", "checkbox")
           .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>")
               .bind("change", toggleFilter))
           .append(I18n.t("javascripts.share.custom_dimensions")));
 
     $("<div>")

-      .attr("class", "form-row")

       .appendTo($form)
       .append(
         $("<label>")
       .appendTo($form)
       .append(
         $("<label>")


@@ -187,7 +188,6 @@ L.OSM.share = function (options) {
         .append($("<option>").val("pdf").text("PDF")));
 
     $("<div>")
         .append($("<option>").val("pdf").text("PDF")));
 
     $("<div>")

-      .attr("class", "form-row")

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


@@ -222,13 +222,19 @@ L.OSM.share = function (options) {
       .attr("type", "hidden")
       .appendTo($form);
 
       .attr("type", "hidden")
       .appendTo($form);
 

+    var args = {
+      width: "<span id=\"mapnik_image_width\"></span>",
+      height: "<span id=\"mapnik_image_height\"></span>"
+    };
+

     $("<p>")
     $("<p>")

-      .attr("class", "deemphasize")
-      .html(I18n.t("javascripts.share.image_size") + " <span id=\"mapnik_image_width\"></span> x <span id=\"mapnik_image_height\"></span>")
+      .attr("class", "text-muted")
+      .html(I18n.t("javascripts.share.image_dimensions", args))

       .appendTo($form);
 
     $("<input>")
       .attr("type", "submit")
       .appendTo($form);
 
     $("<input>")
       .attr("type", "submit")

+      .attr("class", "btn btn-primary")

       .attr("value", I18n.t("javascripts.share.download"))
       .appendTo($form);
 
       .attr("value", I18n.t("javascripts.share.download"))
       .appendTo($form);