X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..f3b319cb4f9521ca2fb1f514c8b368bd894bab3b:/app/views/layouts/site.html.erb?ds=sidebyside

diff --git a/app/views/layouts/site.html.erb b/app/views/layouts/site.html.erb
index d36681d97..542bcca2a 100644
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -13,7 +13,7 @@
           :alt => t('layouts.logo.alt_text')),
           root_path) %>
         <h1><%= t 'layouts.project_name.h1' %></h1>
-        <h2 class="nowrap"><%= t('layouts.tag_line') %></h2>
+        <h2><%= t('layouts.tag_line') %></h2>
       </div>
       <%= yield :optionals %>
       <% unless @user %>
@@ -38,11 +38,6 @@
         <p><%= t 'layouts.osm_read_only' %></p>
       </div>
       <% end %>
-      <% if false %>
-      <div class="sidebar-notice">
-        <p><%= raw t 'layouts.donate', :link => "<a href=\"http://donate.openstreetmap.org/\">#{t('layouts.donate_link_text')}</a>" %></p>
-      </div>
-      <% end %>
       <ul id="left_menu" class="left_menu">
         <li>
           <h4><%= t'layouts.help' %></h4>
@@ -70,8 +65,23 @@
         </li>
         <%= yield :left_menu %>
       </ul>
+      <div class='ad-container'>
+        <div class='ads'>
+          <%= ad = [{:image => 'sotm-birmingham-ad.png',
+                     :title => 'State of the Map Birmingham',
+                     :href =>'http://stateofthemap.org/'},
+                    {:image => 'donate-ad.png',
+                     :title => 'Server Donation Drive',
+                     :href =>'http://donate.openstreetmap.org/'}].sample
+
+              link_to ad[:href], :title => ad[:title] do
+                image_tag ad[:image], :class => :ad
+              end
+          %>
+        </div>
+      </div>
       <a title="<%= h(t('layouts.make_a_donation.title')) %>" href="http://donate.openstreetmap.org/" class="donate">
-        <span class='donate-icon'></span><p><%= h(t('layouts.make_a_donation.text')) %></p>
+        <span><%= h(t('layouts.make_a_donation.text')) %></span>
       </a>
       <div class='sidebar-copy'>
         <p class='deemphasize'><%= t 'layouts.partners_html',
@@ -100,7 +110,7 @@
           :title => t('layouts.view_tooltip'),
           :class => 'geolink llz layers'
         } %></li>
-        <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▾", :class => "menuicon"), edit_path, {
+        <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, :editor => preferred_editor },