Make iD default editor

[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 d36681d97e5734d670899414ad8b30f41e353dd2..a0e894e462c315e834dd193ae01fea1a4b403f54 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -1,19 +1,19 @@
  <!DOCTYPE html>
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= I18n.locale %>" lang="<%= I18n.locale %>" dir="<%= dir %>">
    <%= 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", :alt => t('layouts.logo.alt_text')), root_path) %>
-      <h1><%= t 'layouts.project_name.h1' %></h1>
-    </div>
-        <div id="left">
+  <body class="<%= body_class %>">
+    <h1 id="small-title">
+      <%= image_tag "osm_logo.png", :size => "16x16", :alt => t('layouts.logo.alt_text') %>
+      <%= t 'layouts.project_name.h1' %>
+    </h1>
+    <div id="left">
        <div id="logo">
          <%= link_to(image_tag("osm_logo.png",
            :size => "120x120",
            :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,18 +38,12 @@
          <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>
              <li><%= link_to(t('layouts.help_centre'), t('layouts.help_url'), :title => t('layouts.help_title')) %></li>
              <li><%= link_to(t('layouts.documentation'), t('layouts.wiki_url'), :title => t('layouts.documentation_title')) %></li>
-            <li><%= link_to t('layouts.copyright'), copyright_path %></li>
            </ul>
          </li>
          <li>
@@ -63,15 +57,37 @@
            </ul>
          </li>
          <li>
-          <h4><%= link_to t('layouts.gps_traces'), traces_path, {
-            :id => 'traceanchor',
-            :title => t('layouts.gps_traces_tooltip')
-          } %></h4>
+          <h4><%= t'layouts.data' %></h4>
+          <ul>
+            <li><%= link_to t('layouts.copyright'), copyright_path %></li>
+          </ul>
+          <ul>
+            <li><%= link_to t('layouts.export_data'), export_path %></li>
+          </ul>
+          <ul>
+            <li><%= link_to t('layouts.gps_traces'), traces_path %></li>
+          </ul>
          </li>
          <%= yield :left_menu %>
        </ul>
+      <div class='ad-container inner11'>
+        <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 class='icon donate'></span>
+        <span><%= h(t('layouts.make_a_donation.text')) %></span>
        </a>
        <div class='sidebar-copy'>
          <p class='deemphasize'><%= t 'layouts.partners_html',
@@ -100,7 +116,7 @@
            :title => t('layouts.view_tooltip'),
            :class => 'geolink llz layers'
          } %></li>
-        <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "â\96¾", :class => "menuicon"), edit_path, {
+        <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "â\96¼", :class => "menuicon"), edit_path, {
            :id => 'editanchor',
            :title => t('javascripts.site.edit_tooltip'),
            :data => { :minzoom => 13, :editor => preferred_editor },
@@ -112,12 +128,6 @@
            :title => t('javascripts.site.history_tooltip'),
            :class => 'geolink bbox'
          } %></li>
-        <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">