X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7c5d0fff3d8aab23b17e32aa65f1f9e0beb95d3c..ad60ee5c9c9fbb760d54c94448ba96a790e78a71:/app/views/browse/_map.html.erb

diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index d598847fc..9b82753fb 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,8 +1,5 @@
-<iframe id="linkloader" style="display: none">
-</iframe>
-
-<div id="browse_map">
-  <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible %>
+<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? %>
 
   <% content_for :head do %>
     <%= javascript_include_tag "browse" %>
@@ -19,6 +16,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,
@@ -31,29 +35,45 @@
   <%= 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" %>
-  <br />
-  <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▾", :class => "menuicon"),
-              edit_path,
-              :id => "area_edit",
-              :data => { :editor => preferred_editor },
-              :class => "geolink bbox" %>
-
-  <% unless map.instance_of? Changeset %>
-    <br />
-    <%= link_to t("browse.map.larger." + map.class.to_s.downcase),
-                root_path,
-                :id => "object_larger_map",
-                :class => "geolink object" %>
-    <br />
-    <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▾", :class => "menuicon"),
+<ul class='secondary-actions clearfix'>
+  <li>
+    <% 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, "▼", :class => "menuicon"),
                 edit_path,
-                :id => "object_edit",
+                :id => "area_edit",
                 :data => { :editor => preferred_editor },
-                :class => "geolink object" %>
+                :class => "geolink bbox" %>
+  </li>
+</ul>
+
+  <% unless map.instance_of? Changeset %>
+  <ul class='secondary-actions clearfix'>
+    <li>
+      <%= link_to t("browse.map.larger." + map.class.to_s.downcase),
+                  root_path,
+                  :id => "object_larger_map",
+                  :class => "geolink object" %>
+    </li>
+    <li>
+      <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▼", :class => "menuicon"),
+                  edit_path,
+                  :id => "object_edit",
+                  :data => { :editor => preferred_editor },
+                  :class => "geolink object" %>
+    </li>
+  </ul>
   <% end %>
 
   <% else %>
@@ -63,7 +83,7 @@
 
 <div id="area_edit_menu" class="menu">
   <ul>
-    <% Editors::ALL_EDITORS.each do |editor| %>
+    <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
       <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
                       edit_path(:editor => editor),
                       :data => {:editor => editor},
@@ -74,7 +94,7 @@
 
 <div id="object_edit_menu" class="menu">
   <ul>
-    <% Editors::ALL_EDITORS.each do |editor| %>
+    <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
       <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
                       edit_path(:editor => editor),
                       :data => {:editor => editor},