X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/483b2f204e90c657dd4e545c82f2c9094bcacc83..d377e8b4f23e6bad925eb2efa904baa7e1531fa6:/app/views/layouts/_header.html.erb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 160419c5e..7e4dd96d3 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,18 +1,19 @@
 <header class="closed">
   <h1>
-    <a href="<%= root_path %>" class="geolink layers">
-      <%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %>
+    <a href="<%= root_path %>" class="geolink">
+      <picture>
+        <source srcset="<%= image_path "osm_logo.svg" %>" type="image/svg+xml">
+        <%= image_tag "osm_logo.png", :alt => t('layouts.logo.alt_text'), :class => 'logo' %>
+      </picture>
       <%= t 'layouts.project_name.h1' %>
     </a>
   </h1>
   <a href="#" id="menu-icon"></a>
   <nav class='primary'>
+    <%= content_for :header %>
     <ul>
-      <li id="view_tab" class="<%= current_page_class(root_path) %>">
-        <%= link_to t('layouts.view'), root_path, :class => 'tab geolink layers' %>
-      </li>
-      <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>
@@ -22,7 +23,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>
@@ -30,19 +31,30 @@
       <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>
   </nav>
   <nav class='secondary'>
     <ul>
-      <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="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>
-    <% 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)
@@ -54,7 +66,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>