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 cf59a4679423395c7fc20a047ed5f2578404ff15..ed3cc0faf169b829b828caab84b00ad67a1bce1d 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -22,6 +22,7 @@
      elsif map.instance_of? Note
        data = {
          :type => "note",
+         :id   => map.id,
          :lon  => map.lon,
          :lat  => map.lat
        }
@@ -52,7 +53,7 @@
     <% end -%>
   </li>
   <li>
-    <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "â\96¾", :class => "menuicon"),
+    <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "â\96¼", :class => "menuicon"),
                 edit_path,
                 :id => "area_edit",
                 :data => { :editor => preferred_editor },
@@ -60,7 +61,7 @@
   </li>
 </ul>
 
-  <% unless map.instance_of? Changeset or map.instance_of? Note %>
+  <% unless map.instance_of? Changeset %>
   <ul class='secondary-actions clearfix'>
     <li>
       <%= link_to t("browse.map.larger." + map.class.to_s.downcase),
@@ -69,7 +70,7 @@
                   :class => "geolink object" %>
     </li>
     <li>
-      <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "â\96¾", :class => "menuicon"),
+      <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "â\96¼", :class => "menuicon"),
                   edit_path,
                   :id => "object_edit",
                   :data => { :editor => preferred_editor },