X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/864901d1670b4695c57451ba5940cabfdcdfd635..1f7bd08f4a8a6a626a0c1d7ed60f2dcd6a6801e8:/app/views/layouts/_header.html.erb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 60a68a488..09a75d891 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,15 +1,16 @@
 <header class="closed">
   <h1>
-    <a href="<%= root_path %>" class="geolink layers">
+    <a href="<%= root_path %>" class="geolink">
       <%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %>
       <%= t 'layouts.project_name.h1' %>
     </a>
   </h1>
   <a href="#" id="menu-icon"></a>
   <nav class='primary'>
+    <%= content_for :header %>
     <ul>
-      <li id="edit_tab" class="mobile-hide dropdown <%= current_page_class(edit_path) %>">
-        <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink object",
+      <li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
+        <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink editlink",
                     :id => 'editanchor',
                     :data => { :editor => preferred_editor }
         %><a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
@@ -19,7 +20,7 @@
               <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
                           edit_path(:editor => editor),
                           :data => { :editor => editor },
-                          :class => "geolink object" %>
+                          :class => "geolink editlink" %>
             </li>
           <% end %>
         </ul>
@@ -27,7 +28,7 @@
       <li id="history_tab" class="<%= current_page_class(history_path) %>">
         <%= link_to t('layouts.history'), history_path, :class => 'tab geolink' %>
       </li>
-      <li id="export_tab" class="mobile-hide <%= current_page_class(export_path) %>">
+      <li id="export_tab" class="<%= current_page_class(export_path) %>">
         <%= link_to t('layouts.export'), export_path, :class => 'tab geolink' %>
       </li>
     </ul>
@@ -36,19 +37,21 @@
     <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="#">More <b class="caret"></b></a>
+        <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>
-    <% 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)
@@ -60,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>