Remove tables from trace upload form

[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 1d23aba0d9a625e1b2055b21d7e94cb499faad47..542bcca2adac2e659f284d7f30eadfb07f0ded1e 100644 (file)
--- 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>
           :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 %>
       </div>
       <%= yield :optionals %>
       <% unless @user %>


@@ -38,11 +38,6 @@
         <p><%= t 'layouts.osm_read_only' %></p>
       </div>
       <% end %>
         <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>
       <ul id="left_menu" class="left_menu">
         <li>
           <h4><%= t'layouts.help' %></h4>


@@ -70,8 +65,23 @@
         </li>
         <%= yield :left_menu %>
       </ul>
         </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">
       <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',
       </a>
       <div class='sidebar-copy'>
         <p class='deemphasize'><%= t 'layouts.partners_html',