Adjust header layout for user menu

[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 97bf062036dce8c615df6aed8fd29575fd8016a3..8239c8c2d7bdb0c7981654cb35b124dec13495a1 100644 (file)
--- a/app/views/layouts/site.html.erb
+++ b/app/views/layouts/site.html.erb
@@ -39,13 +39,6 @@
       </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>
-          </ul>
-        </li>
         <li>
           <h4><%= t'layouts.community' %></h4>
           <ul>
@@ -70,18 +63,6 @@
         </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/'}].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='icon donate'></span>
         <span><%= h(t('layouts.make_a_donation.text')) %></span>
@@ -96,24 +77,32 @@
       </div>
     </div>
     <div id='top-bar'>
-      <% if @user and @user.id %>
-        <%= render :partial => "layouts/user_menu" %>
-      <% else %>
-        <ul class='secondary-actions' id='greeting'>
-          <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
-          <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+      <nav class='primary'>
+        <ul>
+          <li id="view_tab">
+            <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
+          </li><li id="edit_tab">
+            <%= render :partial => 'layouts/edit_menu',
+                       :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+          </li><li id="history_tab">
+            <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+          </li>
         </ul>
-      <% end %>
-      <ul id="tabnav">
-        <li id="view_tab">
-          <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
-        </li><li id="edit_tab">
-          <%= render :partial => 'layouts/edit_menu',
-                     :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
-        </li><li id="history_tab">
-          <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
-        </li>
-      </ul>
+      </nav>
+      <nav class='secondary'>
+        <% if @user and @user.id %>
+          <ul>
+            <li><%= link_to t('layouts.help'), help_path %></li>
+          </ul>
+          <%= render :partial => "layouts/user_menu" %>
+        <% else %>
+          <ul class="secondary-actions">
+            <li><%= link_to t('layouts.help'), help_path %></li>
+            <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
+            <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+          </ul>
+        <% end %>
+      </nav>
     </div>
     <div class="wrapper">
       <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>