Fix double escaping of date markup in note feed

[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 f44e5bb318e92871a3aada2e85e1de15f731adf0..ed3cc0faf169b829b828caab84b00ad67a1bce1d 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -2,7 +2,7 @@
 </iframe>
 
 <div id="browse_map" class='clearfix content_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? %>
 
   <% content_for :head do %>
     <%= javascript_include_tag "browse" %>
@@ -19,6 +19,13 @@
          :maxlon => bbox.max_lon,
          :maxlat => bbox.max_lat
        }
+     elsif map.instance_of? Note
+       data = {
+         :type => "note",
+         :id   => map.id,
+         :lon  => map.lon,
+         :lat  => map.lat
+       }
      else
        data = {
          :type    => map.class.name.downcase,
@@ -33,13 +40,20 @@
 
 <ul class='secondary-actions clearfix'>
   <li>
-    <%= 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(:notes => "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 -%>
   </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 },
@@ -56,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 },