Use correct extension and type for avatar images attached to mails

[rails.git] / app / assets / javascripts / user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 7d8c2f33410532e395f55ad1ca1909f0e9228e2a..964f187f9795d7861ffc7ceb6b0c8f3514234e5b 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,43 +1,137 @@
+//= require leaflet.locatecontrol/src/L.Control.Locate
+

 $(document).ready(function () {
 $(document).ready(function () {

-  var params = $("#map").data();
-  var map = createMap("map");
+  if ($("#map").length) {
+    var map = L.map("map", {
+      attributionControl: false,
+      zoomControl: false
+    }).addLayer(new L.OSM.Mapnik());
+
+    var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright";
+
+    L.OSM.zoom({ position: position })
+      .addTo(map);
+
+    var locate = L.control.locate({
+      position: position,
+      icon: "icon geolocate",
+      iconLoading: "icon geolocate",
+      strings: {
+        title: I18n.t("javascripts.map.locate.title"),
+        popup: function (options) {
+          return I18n.t("javascripts.map.locate." + options.unit + "Popup", { count: options.distance });
+        }
+      }
+    }).addTo(map);

 
 

-  setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+    var locateContainer = locate.getContainer();

 
 

-  if ($("#map").hasClass("set_location")) {
-    var marker;
+    $(locateContainer)
+      .removeClass("leaflet-control-locate leaflet-bar")
+      .addClass("control-locate")
+      .children("a")
+      .attr("href", "#")
+      .removeClass("leaflet-bar-part leaflet-bar-part-single")
+      .addClass("control-button");

 
 

-    if (params.marker) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat));
+    if (OSM.home) {
+      map.setView([OSM.home.lat, OSM.home.lon], 12);
+    } else {
+      map.setView([0, 0], 0);

     }
 
     }
 

-    map.events.register("click", map, function (e) {
-      closeMapPopup();
+    if ($("#map").hasClass("set_location")) {
+      var marker = L.marker([0, 0], { icon: OSM.getUserIcon() });
+
+      if (OSM.home) {
+        marker.setLatLng([OSM.home.lat, OSM.home.lon]);
+        marker.addTo(map);
+      }

 
 

-      if ($('#updatehome').is(':checked')) {
-        var lonlat = getEventPosition(e);
+      map.on("click", function (e) {
+        if ($("#updatehome").is(":checked")) {
+          var zoom = map.getZoom(),
+              precision = OSM.zoomPrecision(zoom),
+              location = e.latlng.wrap();

 
 

-        $('#homerow').removeClass();
-        $('#home_lat').val(lonlat.lat);
-        $('#home_lon').val(lonlat.lon);
+          $("#home_message").hide();
+          $("#home_lat").val(location.lat.toFixed(precision));
+          $("#home_lon").val(location.lng.toFixed(precision));

 
 

-        if (marker) {
-          removeMarkerFromMap(marker);
+          marker.setLatLng(e.latlng);
+          marker.addTo(map);

         }
         }

+      });
+    } else {
+      $("[data-user]").each(function () {
+        var user = $(this).data("user");
+        if (user.lon && user.lat) {
+          L.marker([user.lat, user.lon], { icon: OSM.getUserIcon(user.icon) }).addTo(map)
+            .bindPopup(user.description);
+        }
+      });
+    }
+  }

 
 

-        marker = addMarkerToMap(lonlat);
-      }
-    });
+  function updateAuthUID() {
+    var provider = $("select#user_auth_provider").val();
+
+    if (provider === "openid") {
+      $("input#user_auth_uid").show().prop("disabled", false);
+    } else {
+      $("input#user_auth_uid").hide().prop("disabled", true);
+    }
+  }
+
+  updateAuthUID();
+
+  $("select#user_auth_provider").on("change", updateAuthUID);
+
+  $("input#user_avatar").on("change", function () {
+    $("#user_avatar_action_new").prop("checked", true);
+  });
+
+  function enableAuth() {
+    $("#auth_prompt").hide();
+    $("#auth_field").show();
+    $("#user_auth_uid").prop("disabled", false);
+  }
+
+  function disableAuth() {
+    $("#auth_prompt").show();
+    $("#auth_field").hide();
+    $("#user_auth_uid").prop("disabled", true);
+  }
+
+  $("#auth_enable").click(enableAuth);
+
+  if ($("select#user_auth_provider").val() === "") {
+    disableAuth();

   } else {
   } else {

-    addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat), null, params.marker.description);
-
-    $("[data-user]").each(function () {
-      var user = $(this).data('user');
-      if (user.lon && user.lat) {
-        var icon = OpenLayers.Marker.defaultIcon();
-        icon.url = OpenLayers.Util.getImageLocation(user.icon);
-        addMarkerToMap(new OpenLayers.LonLat(user.lon, user.lat), icon, user.description);
-      }
-    });
+    enableAuth();

   }
   }

+
+  $("#user_all").change(function () {
+    $("#user_list input[type=checkbox]").prop("checked", $("#user_all").prop("checked"));
+  });
+
+  $("#content.user_confirm").each(function () {
+    $(this).hide();
+    $(this).find("#confirm").submit();
+  });
+
+  $("input[name=legale]").change(function () {
+    var url = $(this).data("url");
+
+    $("#contributorTerms").html("<div class='spinner-border' role='status'><span class='visually-hidden'>" + I18n.t("browse.start_rjs.loading") + "</span></div>");
+    $("#contributorTerms").load(url);
+  });
+
+  $("#read_ct").on("click", function () {
+    $("#continue").prop("disabled", !($(this).prop("checked") && $("#read_tou").prop("checked")));
+  });
+
+  $("#read_tou").on("click", function () {
+    $("#continue").prop("disabled", !($(this).prop("checked") && $("#read_ct").prop("checked")));
+  });

 });
 });