Merge branch 'master' into notes

[rails.git] / app / views / layouts / site.html.erb

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index 064fbed0a291f434353bf87e5ab93804456570fe..3839416859f227457b82f0686ae83c5668ad958d 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -32,7 +32,7 @@
         <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, {
           :id => 'editanchor',
           :title => t('javascripts.site.edit_tooltip'),
-          :data => { :minzoom => 13 },
+          :data => { :minzoom => 13, :editor => preferred_editor },
           :class => 'geolink llz object disabled'
         } %></li>
         <li><%= link_to t('layouts.history'), browse_changesets_path, {
@@ -44,17 +44,18 @@
         <li><%= link_to t('layouts.export'), export_path, {
           :id => 'exportanchor',
           :title => t('layouts.export_tooltip'),
+          :data => { :url => url_for(:controller => :export, :action => :start) },
           :class => 'geolink llz layers'
         } %></li>
       </ul>
     </div>
     <div id="editmenu" 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), {
-            :id => editor + 'anchor',
+            :data => { :editor => editor },
             :class => "geolink llz object"
           } %></li>
         <% end %>
@@ -126,12 +127,6 @@
           <%= yield :left_menu %>
         </ul>
       </div>
-      <div id="sotm">
-        <%= link_to image_tag("sotmpdx.png",
-          :alt => t('layouts.sotm2012'),
-          :title => t('layouts.sotm2012'),
-          :border => "0"), "http://stateofthemap.us/" %>
-      </div>
       <div class="donate">
         <a href="http://donate.openstreetmap.org/" title="<%= h(t('layouts.make_a_donation.title')) %>"><%= h(t('layouts.make_a_donation.text')) %></a>
       </div>