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 31f87eb856da5c55253e8664f3af887ff4282c60..3839416859f227457b82f0686ae83c5668ad958d 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -51,7 +51,7 @@
     </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), {
@@ -127,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>