Add testing for moderator users and issues

[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 6701e0bbd4ccf89227dd6de1c2797eba7c7aba04..044c767cf30485e3c41cb7c2b28fcb7596514307 100644 (file)
--- a/app/assets/javascripts/leaflet.share.js
+++ b/app/assets/javascripts/leaflet.share.js
@@ -11,7 +11,7 @@ L.OSM.share = function (options) {
       .attr('class', 'control-share');
 
     var button = $('<a>')
       .attr('class', 'control-share');
 
     var button = $('<a>')

-      .attr('class', 'control-button mobile-hide')
+      .attr('class', 'control-button')

       .attr('href', '#')
       .attr('title', I18n.t('javascripts.share.title'))
       .html('<span class="icon share"></span>')
       .attr('href', '#')
       .attr('title', I18n.t('javascripts.share.title'))
       .html('<span class="icon share"></span>')


@@ -120,6 +120,21 @@ L.OSM.share = function (options) {
           .text(I18n.t('javascripts.share.paste_html'))
           .appendTo($linkSection));
 
           .text(I18n.t('javascripts.share.paste_html'))
           .appendTo($linkSection));
 

+    // Geo URI
+
+    var $geoUriSection = $('<div>')
+      .attr('class', 'section share-geo-uri')
+      .appendTo($ui);
+
+    $('<h4>')
+      .text(I18n.t('javascripts.share.geo_uri'))
+      .appendTo($geoUriSection);
+
+    $('<div>')
+      .appendTo($geoUriSection)
+      .append($('<a>')
+        .attr('id', 'geo_uri'));
+

     // Image
 
     var $imageSection = $('<div>')
     // Image
 
     var $imageSection = $('<div>')


@@ -130,7 +145,14 @@ L.OSM.share = function (options) {
       .text(I18n.t('javascripts.share.image'))
       .appendTo($imageSection);
 
       .text(I18n.t('javascripts.share.image'))
       .appendTo($imageSection);
 

+    $('<div>')
+      .attr('id', 'export-warning')
+      .attr('class', 'deemphasize')
+      .text(I18n.t('javascripts.share.only_standard_layer'))
+      .appendTo($imageSection);
+

     $form = $('<form>')
     $form = $('<form>')

+      .attr('id', 'export-image')

       .attr('class', 'standard-form')
       .attr('action', '/export/finish')
       .attr('method', 'post')
       .attr('class', 'standard-form')
       .attr('action', '/export/finish')
       .attr('method', 'post')


@@ -191,6 +213,15 @@ L.OSM.share = function (options) {
       .attr('type', 'hidden')
       .appendTo($form);
 
       .attr('type', 'hidden')
       .appendTo($form);
 

+    var csrf_param = $("meta[name=csrf-param]").attr("content"),
+        csrf_token = $("meta[name=csrf-token]").attr("content");
+
+    $('<input>')
+      .attr('name', csrf_param)
+      .attr('value', csrf_token)
+      .attr('type', 'hidden')
+      .appendTo($form);
+

     $('<p>')
       .attr('class', 'deemphasize')
       .html(I18n.t('javascripts.share.image_size') + ' <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span>')
     $('<p>')
       .attr('class', 'deemphasize')
       .html(I18n.t('javascripts.share.image_size') + ' <span id="mapnik_image_width"></span> x <span id="mapnik_image_height"></span>')


@@ -230,6 +261,7 @@ L.OSM.share = function (options) {
 
       update();
       options.sidebar.togglePane($ui, button);
 
       update();
       options.sidebar.togglePane($ui, button);

+      $('.leaflet-control .control-button').tooltip('hide');

     }
 
     function toggleMarker() {
     }
 
     function toggleMarker() {


@@ -273,6 +305,19 @@ L.OSM.share = function (options) {
       update();
     }
 
       update();
     }
 

+    function escapeHTML(string) {
+      var htmlEscapes = {
+        '&': '&amp;',
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        "'": '&#x27;'
+      };
+      return string === null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
+        return htmlEscapes[match];
+      });
+    }
+

     function update() {
       var bounds = map.getBounds();
 
     function update() {
       var bounds = map.getBounds();
 


@@ -301,11 +346,17 @@ L.OSM.share = function (options) {
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +
 
       $('#embed_html').val(
         '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' +

-          escapeHTML('http://' + OSM.SERVER_URL + '/export/embed.html?' + $.param(params)) +
+          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(I18n.t('javascripts.share.view_larger_map')) + '</a></small>');
 
           '" style="border: 1px solid black"></iframe><br/>' +
           '<small><a href="' + escapeHTML(map.getUrl(marker)) + '">' +
           escapeHTML(I18n.t('javascripts.share.view_larger_map')) + '</a></small>');
 

+      // Geo URI
+
+      $('#geo_uri')
+        .attr('href', map.getGeoUri(marker))
+        .html(map.getGeoUri(marker));
+

       // Image
 
       if (locationFilter.isEnabled()) {
       // Image
 
       if (locationFilter.isEnabled()) {


@@ -329,6 +380,14 @@ L.OSM.share = function (options) {
 
       $("#mapnik_image_width").text(Math.round(size.x / scale / 0.00028));
       $("#mapnik_image_height").text(Math.round(size.y / scale / 0.00028));
 
       $("#mapnik_image_width").text(Math.round(size.x / scale / 0.00028));
       $("#mapnik_image_height").text(Math.round(size.y / scale / 0.00028));

+
+      if (map.getMapBaseLayerId() === 'mapnik') {
+        $('#export-image').show();
+        $('#export-warning').hide();
+      } else {
+        $('#export-image').hide();
+        $('#export-warning').show();
+      }

     }
 
     function select() {
     }
 
     function select() {