Fix lists in rich text to display properly

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


@@ -31,29 +31,38 @@
   <%= 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>
 

-  <%= 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>
+    <%= link_to t("browse.map.larger.area"),
+                root_path(:box => "yes"),
+                :id => "area_larger_map",
+                :class => "geolink bbox" %>
+  </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 %>


@@ -63,7 +72,7 @@
 
 <div id="area_edit_menu" class="menu">
   <ul>
 
 <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},
       <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
                       edit_path(:editor => editor),
                       :data => {:editor => editor},


@@ -74,7 +83,7 @@
 
 <div id="object_edit_menu" class="menu">
   <ul>
 
 <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},
       <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
                       edit_path(:editor => editor),
                       :data => {:editor => editor},