Remove SOTM advert

[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 368e3fc20648953323c491520ff88ed0fcde12a1..9bf39d9b9343d63d65407d6e5d843abefda711e5 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -6,7 +6,7 @@
       <%= link_to(image_tag("osm_logo.png", :size => "16x16", :border => 0, :alt => t('layouts.logo.alt_text')), :controller => 'site', :action => 'index') %>
       <h1><%= t 'layouts.project_name.h1' %></h1>
     </div>
-    <div id="content">
+    <div id="content" class="<%= params[:controller] %>_<%= params[:action] %>">
       <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
 
       <%= yield %>
@@ -28,17 +28,18 @@
     <div>
       <ul id="tabnav">
         <%
-        viewclass = ''
-        editclass = ''
-        historyclass = ''
-        exportclass = ''
+        viewclass = 'geolink llz layers'
+        editclass = 'geolink llz object minzoom13 disabled'
+        historyclass = 'geolink bbox minzoom11'
+        exportclass = 'geolink llz layers'
         traceclass = ''
-        viewclass = 'active' if params['controller'] == 'site' and params['action'] == 'index' 
-        editclass = 'active' if params['controller'] == 'site' and params['action'] == 'edit' 
-        historyclass = 'active' if params['controller'] == 'changeset' and params['action'] == 'list' 
-        exportclass = 'active' if params['controller'] == 'site' and params['action'] == 'export'
-        traceclass = 'active' if params['controller'] == 'trace'
-        diaryclass = 'active' if params['controller'] == 'diary_entry'
+        diaryclass = ''
+        viewclass += ' active' if params['controller'] == 'site' and params['action'] == 'index' 
+        editclass += ' active' if params['controller'] == 'site' and params['action'] == 'edit' 
+        historyclass += ' active' if params['controller'] == 'changeset' and params['action'] == 'list' 
+        exportclass += ' active' if params['controller'] == 'site' and params['action'] == 'export'
+        traceclass += ' active' if params['controller'] == 'trace'
+        diaryclass += ' active' if params['controller'] == 'diary_entry'
         %>
         <li><%= link_to t('layouts.view'), {:controller => 'site', :action => 'index'}, {:id => 'viewanchor', :title => t('layouts.view_tooltip'), :class => viewclass} %></li>
         <li><%= link_to t('layouts.edit') + '&nbsp;&#x25be;', {:controller => 'site', :action => 'edit'}, {:id => 'editanchor', :title => t('javascripts.site.edit_tooltip'), :class => editclass} %></li>
@@ -53,16 +54,16 @@
       </ul>
     </div>
 
-    <div id="editmenu">
+    <div id="editmenu" class="menu">
       <ul>
         <% Editors::ALL_EDITORS.each do |editor| %>
-          <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor'} %></li>
+          <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")), {:controller => 'site', :action => 'edit', :editor => editor}, {:id => editor + 'anchor', :class => "geolink llz object"} %></li>
         <% end %>
       </ul>
     </div>
 
     <script type="text/javascript">
-      createMenu("editanchor", "editmenu", 1000);
+      createMenu("editanchor", "editmenu", 1000, "left");
     </script>
 
     <div id="left">
@@ -75,6 +76,8 @@
         </center>
       </div>
 
+      <%= yield :optionals %>
+
       <% unless @user %>
       <div id="intro">
         <p>
@@ -85,7 +88,8 @@
         </p>
         <p>
         <%= t 'layouts.intro_3', 
-              :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"), 
+              :ucl => link_to(t('layouts.intro_3_ucl'), "http://www.vr.ucl.ac.uk"),
+              :ic => link_to(t('layouts.intro_3_ic'), "http://www.imperial.ac.uk/"),
               :bytemark => link_to(t('layouts.intro_3_bytemark'), "http://www.bytemark.co.uk"),
               :partners => link_to(t('layouts.intro_3_partners'), t('layouts.intro_3_partners_url')) %>
         </p>
@@ -119,17 +123,14 @@
         </ul>
       </div>
 
-      <div id="sotm">
-        <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm2011'), :title => t('layouts.sotm2011'), :border => "0"), "http://stateofthemap.org/register-now/" %>
-      </div>
-
-      <%= yield :optionals %>
-
       <center>
         <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>
       </center>
     </div>
+    <% if defined?(PIWIK_LOCATION) and defined?(PIWIK_SITE) -%>
+    <%= render :partial => "layouts/piwik" %>
+    <% end -%>
   </body>
 </html>