Fix up issues with notes in the data browser

[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 9346b567022016ef28634e522c85d01e6ed1db75..a8201b912cc0235814532b8da234e738632c5f9c 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -3,7 +3,7 @@
    <%= render :partial => "layouts/head" %>
    <body class="<%= params[:controller] %> <%= params[:controller] %>-<%= params[:action] %>">
      <div id="small-title">
-      <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), root_path) %>
+      <%= link_to(image_tag("osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text')), root_path) %>
        <h1><%= t 'layouts.project_name.h1' %></h1>
      </div>
      <div id="content">
@@ -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 %>
@@ -127,10 +128,10 @@
          </ul>
        </div>
        <div id="sotm">
-        <%= link_to image_tag("sotm.png",
+        <%= link_to image_tag("sotmpdx.png",
            :alt => t('layouts.sotm2012'),
            :title => t('layouts.sotm2012'),
-          :border => "0"), "http://stateofthemap.org/register-now/" %>
+          :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>