X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e9c6e57bcccc2a47bde53670d4effa4a5827a295..9a9b045372a6f48420a9a6dacfde52c34ab7abce:/app/views/layouts/_header.html.erb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 35cc0578c..09a75d891 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,4 +1,4 @@
-<div id="header" class="closed">
+<header class="closed">
   <h1>
     <a href="<%= root_path %>" class="geolink">
       <%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %>
@@ -6,7 +6,7 @@
     </a>
   </h1>
   <a href="#" id="menu-icon"></a>
-  <div class='nav primary'>
+  <nav class='primary'>
     <%= content_for :header %>
     <ul>
       <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
@@ -32,24 +32,26 @@
         <%= link_to t('layouts.export'), export_path, :class => 'tab geolink' %>
       </li>
     </ul>
-  </div>
-  <div class='nav secondary'>
-    <ul class="compact-hide">
-      <li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
-      <li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
-      <li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
-      <li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
+  </nav>
+  <nav class='secondary'>
+    <ul>
+      <li class="compact-hide <%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
+      <li class="compact-hide <%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
+      <li class="compact-hide <%= current_page_class(copyright_path) %>"><%= link_to t('layouts.copyright'), copyright_path %></li>
+      <li class="compact-hide <%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
+      <li class="compact-hide <%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
+      <li id="compact-secondary-nav" class="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t 'layouts.more' %> <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+          <li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
+          <li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
+          <li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
+          <li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
+          <li class="<%= current_page_class(copyright_path) %>"><%= link_to t('layouts.copyright'), copyright_path %></li>
+        </ul>
+      </li>
     </ul>
-    <div id="compact-secondary-nav" class="dropdown">
-      <a class="dropdown-toggle" data-toggle="dropdown" href="#">More <b class="caret"></b></a>
-      <ul class="dropdown-menu">
-        <li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
-        <li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
-        <li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
-        <li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
-      </ul>
-    </div>
-    <% if @user %>
+    <% if @user && @user.id %>
       <div class='dropdown user-menu logged-in'>
         <a class='dropdown-toggle' data-toggle='dropdown' href="#">
           <%= user_thumbnail_tiny(@user, :size => 25, :width => 25, :height => 25)
@@ -61,7 +63,7 @@
           <li>
             <%= link_to inbox_path(:display_name => @user.display_name) do %>
               <span class='count-number'><%= number_with_delimiter(@user.new_messages.size) %></span>
-              <%= t('message.inbox.my_inbox') %>
+              <%= t('user.view.my messages') %>
             <% end %>
           </li>
           <li>
@@ -85,5 +87,5 @@
         <li><%= link_to t('layouts.sign_up'), user_new_path %></li>
       </ul>
     <% end %>
-  </div>
-</div>
+  </nav>
+</header>