Fix layer map bounciness (#361)

[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 8c28644b11f06df0540a12af7d8f2f7a5ec1bbb5..ed3cc0faf169b829b828caab84b00ad67a1bce1d 100644 (file)
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,8 +1,8 @@
 <iframe id="linkloader" style="display: none">
 </iframe>
 
 <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" %>
 
   <% content_for :head do %>
     <%= javascript_include_tag "browse" %>


@@ -22,8 +22,9 @@
      elsif map.instance_of? Note
        data = {
          :type => "note",
      elsif map.instance_of? Note
        data = {
          :type => "note",

+         :id   => map.id,

          :lon  => map.lon,
          :lon  => map.lon,

-         :lon  => map.lat
+         :lat  => map.lat

        }
      else
        data = {
        }
      else
        data = {


@@ -37,36 +38,45 @@
   <%= 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(: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,
-              :id => "area_edit",
-              :data => { :editor => preferred_editor },
-              :class => "geolink bbox" %>
-
-  <% 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"),
+<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,
                 edit_path,

-                :id => "object_edit",
+                :id => "area_edit",

                 :data => { :editor => preferred_editor },
                 :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 %>
   <% end %>
 
   <% else %>