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

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index c4f2ebad6..35cc0578c 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,50 +1,61 @@
-<header>
+<div id="header" class="closed">
   <h1>
-    <a href="<% root_path %>" class="geolink llz 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>
-  <nav class='primary'>
+  <a href="#" id="menu-icon"></a>
+  <div class='nav primary'>
+    <%= content_for :header %>
     <ul>
-      <li id="view_tab">
-        <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
-      </li><li id="edit_tab" class="dropdown">
-      <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink llz object",
-                  :id => 'editanchor',
-                  :data => { :editor => preferred_editor }
-      %><a class='dropdown-toggle' data-toggle='dropdown' href='#'><b class="caret"></b></a>
-      <ul class='dropdown-menu'>
-        <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
-          <li>
-            <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
-                        edit_path(:editor => editor),
-                        :data => { :editor => editor },
-                        :class => "geolink llz object" %>
-          </li>
-        <% end %>
-      </ul>
-      </li><li id="history_tab">
-        <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink llz' %>
-      </li><li id="export_tab">
-        <%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %>
+      <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>
+        <ul class='dropdown-menu'>
+          <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
+            <li>
+              <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
+                          edit_path(:editor => editor),
+                          :data => { :editor => editor },
+                          :class => "geolink editlink" %>
+            </li>
+          <% end %>
+        </ul>
+      </li>
+      <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="<%= current_page_class(export_path) %>">
+        <%= link_to t('layouts.export'), export_path, :class => 'tab geolink' %>
       </li>
     </ul>
-  </nav>
-  <nav class='secondary'>
-    <ul>
-      <li><%= link_to t('layouts.gps_traces'), traces_path %></li>
-      <li><%= link_to t('layouts.user_diaries'), diary_path %></li>
-      <li><%= link_to t('layouts.help'), help_path %></li>
-      <li><%= link_to t('layouts.about'), about_path %></li>
+  </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>
     </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 %>
-      <div class='dropdown user-menu'>
+      <div class='dropdown user-menu logged-in'>
         <a class='dropdown-toggle' data-toggle='dropdown' href="#">
-          <%= user_thumbnail_tiny(@user, :size => 20, :width => 20, :height => 20)
+          <%= user_thumbnail_tiny(@user, :size => 25, :width => 25, :height => 25)
           %><%= render :partial => 'layouts/inbox'
-        %><span class='username'><%= @user.display_name %></span>
-          <b class="caret"></b>
+        %><span class="user-button"><span class='username'><%= @user.display_name %></span>
+          <b class="caret"></b></span>
         </a>
         <ul class='dropdown-menu'>
           <li>
@@ -69,10 +80,10 @@
         </ul>
       </div>
     <% else %>
-      <ul class="user-menu">
+      <ul class="user-menu clearfix">
         <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath) %></li>
         <li><%= link_to t('layouts.sign_up'), user_new_path %></li>
       </ul>
     <% end %>
-  </nav>
-</header>
+  </div>
+</div>