Move notes resources to assets directory

[rails.git] / app / views / browse / _map.html.erb

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index b84f7a483c9c7a7dd9fcd1a6dcb609b7ffb11ea1..d3af9bc156e0f448c490fcd8750dd91cf1d341c7 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -5,14 +5,18 @@
 </iframe>
 
 <div id="browse_map">
-  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
+  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
   <div id="small_map">
   </div>
   <span id="loading"><%= t 'browse.map.loading' %></span>
+  <% if map.instance_of? Note -%>
+  <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :notes => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
+  <% else -%>
   <%= link_to(t("browse.map.larger.area"), { :controller => :site, :action => :index, :box => "yes" }, { :id => "area_larger_map", :class => "geolink bbox" }) %>
+  <% end -%>
   <br />
   <%= link_to(t("browse.map.edit.area"), { :controller => :site, :action => :edit }, { :id => "area_edit", :class => "geolink bbox" }) %>
-  <% unless map.instance_of? Changeset %>
+  <% unless map.instance_of? Changeset or map.instance_of? Note %>
     <br />
     <%= link_to("", { :controller => :site, :action => :index }, { :id => "object_larger_map", :class => "geolink object" }) %>
     <br />
@@ -39,7 +43,7 @@
   </ul>
 </div>
 
-<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
+<% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
   <script type="text/javascript">
     OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
@@ -50,19 +54,19 @@
       var bottom = bbox.bottom - 0.0001;
       var loaded = false;
 
-      $("linkloader").observe("load", function () { loaded = true; });
+      $("#linkloader").load(function () { loaded = true; });
 
       if (select) {
-        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select;
+        $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select);
       } else {
-        $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom;
+        $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom);
       }
 
       setTimeout(function () {
-        if (!loaded) alert("<%= escape_javascript(t('site.index.remote_failed')) %>");
+        if (!loaded) alert("<%=j t('site.index.remote_failed') %>");
       }, 1000);
 
-      event.stop();
+      return false;
     }
 
     function init() {
@@ -70,7 +74,7 @@
         controls: [ new OpenLayers.Control.Navigation() ]
       });
 
-      <% if map.instance_of? Changeset %>
+      <% if map.instance_of? Changeset -%>
         <% bbox = map.bbox.to_unscaled %>
         var minlon = <%= bbox.min_lon %>;
         var minlat = <%= bbox.min_lat %>;
@@ -82,29 +86,48 @@
         setMapExtent(bbox);
         addBoxToMap(bbox);
 
-        $("loading").style.display = "none";
+        $("#loading").hide();
+        $("#browse_map .geolink").show();
 
-        $$("#browse_map .geolink").each(function (link) {
-          link.style.display = "inline";
+        $("#remote_area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);
         });
 
-        $("remote_area_edit").observe("click", function (event) {
-          remoteEditHandler(event, bbox);
+        <% if preferred_editor == "remote" -%>
+        $("#area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);
         });
-
-        <% if preferred_editor == "remote" %>
-          $("area_edit").observe("click", function (event) {
-            remoteEditHandler(event, bbox);
-          });
-        <% end %>
+        <% end -%>
 
         updatelinks(centre.lon, centre.lat, 16, null, minlon, minlat, maxlon, maxlat)
+      <% elsif map.instance_of? Note %>
+        var centre = new OpenLayers.LonLat(<%= map.lon %>, <%= map.lat %>);
+
+        setMapCenter(centre, 16);
+        addMarkerToMap(centre);
+
+        var bbox = getMapExtent();
+
+        $("#loading").hide();
+        $("#browse_map .geolink").show();
+
+        $("#remote_area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);
+        });
+
+        <% if preferred_editor == "remote" -%>
+        $("#area_edit").click(function (event) {
+          return remoteEditHandler(event, bbox);
+        });
+        <% end -%>
+
+        updatelinks(centre.lon, centre.lat, 16, null, bbox.left, bbox.bottom, bbox.right, bbox.top)
       <% else %>
         var obj_type = "<%= map.class.name.downcase %>";
         var obj_id = <%= map.id %>;
         var obj_version = <%= map.version %>;
         var obj_visible = <%= map.visible %>;
-        var url = "/api/<%= "#{API_VERSION}" %>/<%= map.class.name.downcase %>/<%= map.id %>";
+        var url = "/api/<%= API_VERSION %>/<%= map.class.name.downcase %>/<%= map.id %>";
 
         if (obj_type != "node") {
           url += "/full";
@@ -114,42 +137,45 @@
         }
 
         addObjectToMap(url, true, function(extent) {
-          $("loading").style.display = "none";
-
-          $$("#browse_map .geolink").each(function (link) {
-            link.style.display = "inline";
-          });
+          $("#loading").hide();
+          $("#browse_map .geolink").show();
 
           if (extent) {
             extent.transform(map.getProjectionObject(), map.displayProjection);
 
             var centre = extent.getCenterLonLat();
 
-            $("remote_area_edit").observe("click", function (event) {
-              remoteEditHandler(event, extent);
+            $("#remote_area_edit").click(function (event) {
+              return remoteEditHandler(event, extent);
             });
 
-            <% if preferred_editor == "remote" %>
-              $("area_edit").observe("click", function (event) {
-                remoteEditHandler(event, extent);
-              });
-            <% end %>
+            <% if preferred_editor == "remote" -%>
+            $("#area_edit").click(function (event) {
+              return remoteEditHandler(event, extent);
+            });
+            <% end -%>
 
-            <% unless map.instance_of? Changeset %>
-              $("remote_object_edit").observe("click", function (event) {
-                remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
-              });
+            <% unless map.instance_of? Changeset -%>
+            $("#remote_object_edit").click(function (event) {
+              return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
+            });
+
+            <% if preferred_editor == "remote" -%>
+            $("#object_edit").click(function (event) {
+              return remoteEditHandler(event, extent, "<%= map.class.to_s.downcase + map.id.to_s %>");
+            });
+            <% end -%>
 
-              $("object_larger_map").innerHTML = "<%= t('browse.map.larger.' + map.class.to_s.downcase) %>";
-              $("object_edit").innerHTML = "<%= t('browse.map.edit.' + map.class.to_s.downcase) %>";
-            <% end %>
+            $("#object_larger_map").html("<%=j t('browse.map.larger.' + map.class.to_s.downcase) %>");
+            $("#object_edit").html("<%=j t('browse.map.edit.' + map.class.to_s.downcase) %>");
+            <% end -%>
 
-            updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>)
+            updatelinks(centre.lon, centre.lat, 16, null, extent.left, extent.bottom, extent.right, extent.top, "<%= map.class.to_s.downcase %>", <%= map.id %>);
           } else {
-            $("small_map").style.display = "none";
+            $("#small_map").hide();
           }
         });
-      <% end %>
+      <% end -%>
 
       createMenu("area_edit", "area_edit_menu", 1000, "right");
       createMenu("object_edit", "object_edit_menu", 1000, "right");