Sidebar work

[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 f694d04644ebfcdd0228d39d701b98ada8409481..ed703665d1e55e8aa8be021fca5ac4dcbdebf59d 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,7 +1,4 @@
-<iframe id="linkloader" style="display: none">
-</iframe>
-
-<div id="browse_map">
+<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 %>
   <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
 
   <% content_for :head do %>


@@ -22,6 +19,7 @@
      elsif map.instance_of? Note
        data = {
          :type => "note",
      elsif map.instance_of? Note
        data = {
          :type => "note",

+         :id   => map.id,

          :lon  => map.lon,
          :lat  => map.lat
        }
          :lon  => map.lon,
          :lat  => map.lat
        }


@@ -37,61 +35,44 @@
   <%= content_tag "div", "", :id => "small_map", :data => data %>
   <span id="loading"><%= t 'browse.map.loading' %></span>
 
   <%= content_tag "div", "", :id => "small_map", :data => data %>
   <span id="loading"><%= t 'browse.map.loading' %></span>
 

-  <% 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 -%>
-  <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" %>
+  <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>
+      <%= render :partial => 'layouts/edit_menu',
+                 :locals => { :link_text => t("browse.map.edit.area"),
+                              :link_class => 'bbox' } %>
+    </li>
+  </ul>

 
 

-  <% unless map.instance_of? Changeset or map.instance_of? Note %>
-    <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"),
-                edit_path,
-                :id => "object_edit",
-                :data => { :editor => preferred_editor },
-                :class => "geolink object" %>
+  <% 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>
+      <%= render :partial => 'layouts/edit_menu',
+                 :locals => { :link_text => t("browse.map.edit." + map.class.to_s.downcase),
+                              :link_class => 'object' } %>
+    </li>
+  </ul>

   <% end %>
 
   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>
 </div>
   <% end %>
 
   <% else %>
     <%= t 'browse.map.deleted' %>
   <% end %>
 </div>

-
-<div id="area_edit_menu" class="menu">
-  <ul>
-    <% 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},
-                      :class => "geolink bbox" %></li>
-    <% end %>
-  </ul>
-</div>
-
-<div id="object_edit_menu" class="menu">
-  <ul>
-    <% 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},
-                      :class => "geolink object" %></li>
-    <% end %>
-  </ul>
-</div>