Move sidebar footer elements elsewhere

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a33e281ce8e0762bfcc64faa693adebfc30b7911..cecceaf3563b9bf210cff59669e4a7c73b1d1373 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -4,6 +4,7 @@
 //= require jquery.cookie
 //= require jquery.throttle-debounce
 //= require bootstrap.tooltip
 //= require jquery.cookie
 //= require jquery.throttle-debounce
 //= require bootstrap.tooltip

+//= require bootstrap.dropdown

 //= require augment
 //= require osm
 //= require leaflet
 //= require augment
 //= require osm
 //= require leaflet


@@ -16,10 +17,7 @@
 //= require oauth
 //= require piwik
 //= require map
 //= require oauth
 //= require piwik
 //= require map

-//= require menu
-//= require sidebar

 //= require richtext
 //= require richtext

-//= require geocoder

 //= require querystring
 
 var querystring = require('querystring-component');
 //= require querystring
 
 var querystring = require('querystring-component');


@@ -28,13 +26,6 @@ function zoomPrecision(zoom) {
     return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
 }
 
     return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
 }
 

-function normalBounds(bounds) {
-    if (bounds instanceof L.LatLngBounds) return bounds;
-    return new L.LatLngBounds(
-        new L.LatLng(bounds[0][0], bounds[0][1]),
-        new L.LatLng(bounds[1][0], bounds[1][1]));
-}
-

 function remoteEditHandler(bbox, select) {
   var loaded = false,
       query = {
 function remoteEditHandler(bbox, select) {
   var loaded = false,
       query = {


@@ -69,52 +60,39 @@ function remoteEditHandler(bbox, select) {
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */

-function updatelinks(loc, zoom, layers, bounds, object) {
+function updatelinks(loc, zoom, layers, object) {

   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
         args = querystring.parse(link.search.substring(1));
 
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
         args = querystring.parse(link.search.substring(1));
 

-    if (bounds && $(link).hasClass("bbox")) args.bbox = normalBounds(bounds).toBBoxString();

     if (object && $(link).hasClass("object")) args[object.type] = object.id;
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 
     if (object && $(link).hasClass("object")) args[object.type] = object.id;
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 

-    if ($(link).hasClass("llz")) {
-      args = {
-        lat: loc.lat,
-        lon: loc.lon || loc.lng,
-        zoom: zoom
-      };
-
-      if (layers && $(link).hasClass("layers")) {
-        args.layers = layers;
-      }
+    args = {
+      lat: loc.lat,
+      lon: loc.lon || loc.lng,
+      zoom: zoom
+    };

 
 

-      href += OSM.formatHash(args);
+    if (layers && $(link).hasClass("layers")) {
+      args.layers = layers;

     }
 
     }
 

-    link.href = href;
+    href += OSM.formatHash(args);

 
 

-    var minzoom = $(link).data("minzoom");
-    if (minzoom) {
-      var name = link.id.replace(/anchor$/, "");
-      $(link).off("click.minzoom");
-      if (zoom >= minzoom) {
-        $(link)
-          .attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
-          .removeClass("disabled");
-      } else {
-        $(link)
-          .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"))
-          .addClass("disabled")
-          .on("click.minzoom", function () {
-            alert(I18n.t("javascripts.site." + name + "_zoom_alert"));
-            return false;
-          });
-      }
-    }
+    link.href = href;

   });
   });

+
+  var editDisabled = zoom < 13;
+  $('#edit_tab')
+    .tooltip({placement: 'bottom'})
+    .off('click.minzoom')
+    .on('click.minzoom', function() { return !editDisabled; })
+    .toggleClass('disabled', editDisabled)
+    .attr('data-original-title', editDisabled ?
+      I18n.t('javascripts.site.edit_disabled_tooltip') : '');

 }
 
 // generate a cookie-safe string of map state
 }
 
 // generate a cookie-safe string of map state


@@ -136,6 +114,14 @@ function escapeHTML(string) {
   });
 }
 
   });
 }
 

+function maximiseMap() {
+  $("#content").addClass("maximised");
+}
+
+function minimiseMap() {
+  $("#content").removeClass("maximised");
+}
+

 /*
  * Forms which have been cached by rails may have the wrong
  * authenticity token, so patch up any forms with the correct
 /*
  * Forms which have been cached by rails may have the wrong
  * authenticity token, so patch up any forms with the correct


@@ -144,4 +130,8 @@ function escapeHTML(string) {
 $(document).ready(function () {
   var auth_token = $("meta[name=csrf-token]").attr("content");
   $("form input[name=authenticity_token]").val(auth_token);
 $(document).ready(function () {
   var auth_token = $("meta[name=csrf-token]").attr("content");
   $("form input[name=authenticity_token]").val(auth_token);

+
+  $("#menu-icon").on("click", function() {
+    $("header").toggleClass("closed");
+  });

 });
 });