Merge branch 'master' into notes

[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 d0e5af81e676236609bc14db33731a54d962a44d..8c28644b11f06df0540a12af7d8f2f7a5ec1bbb5 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -19,6 +19,12 @@
          :maxlon => bbox.max_lon,
          :maxlat => bbox.max_lat
        }
+     elsif map.instance_of? Note
+       data = {
+         :type => "note",
+         :lon  => map.lon,
+         :lon  => map.lat
+       }
      else
        data = {
          :type    => map.class.name.downcase,
@@ -31,10 +37,17 @@
   <%= content_tag "div", "", :id => "small_map", :data => data %>
   <span id="loading"><%= t 'browse.map.loading' %></span>
 
-  <%= link_to t("browse.map.larger.area"),
-              root_path(:box => "yes"),
-              :id => "area_larger_map",
-              :class => "geolink bbox" %>
+  <% if map.instance_of? Note -%>
+    <%= link_to t("browse.map.larger.area"),
+                root_path(:note => "yes"),
+                :id => "area_larger_map",
+                :class => "geolink bbox" %>
+  <% else -%>
+    <%= link_to t("browse.map.larger.area"),
+                root_path(:box => "yes"),
+                :id => "area_larger_map",
+                :class => "geolink bbox" %>
+  <% end -%>
   <br />
   <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"),
               edit_path,
@@ -42,7 +55,7 @@
               :data => { :editor => preferred_editor },
               :class => "geolink bbox" %>
 
-  <% unless map.instance_of? Changeset %>
+  <% unless map.instance_of? Changeset or map.instance_of? Note %>
     <br />
     <%= link_to t("browse.map.larger." + map.class.to_s.downcase),
                 root_path,