X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d414ffc61a0f6505f1d06e89e8668fa5b49d607e..24b4538f8fef9f97098a1dfd82ff56bd61103c96:/app/views/layouts/_header.html.erb?ds=sidebyside

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index f1eab38ae..946f95feb 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,75 +1,107 @@
-<header>
+<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"></source>
+        <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :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="dropdown <%= current_page_class(edit_path) %>">
-      <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink 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 object" %>
-          </li>
-        <% end %>
-      </ul>
-      </li><li id="history_tab" class="<%= current_page_class(browse_changesets_path) %>">
-        <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink' %>
-      </li><li id="export_tab" class="<%= current_page_class(export_path) %>">
+      <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 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>
+      <% if current_user and ( current_user.administrator? or current_user.moderator? ) %>
+        <li class="compact-hide <%= current_page_class(issues_path) %>">
+          <%= link_to issues_path(:status => 'open') do %>
+            <%= t('layouts.issues') %>
+            <%= open_issues_count %>
+          <% end -%>
+        </li>
+      <% end %>
+      <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">
+          <% if can? :index, Issue %>
+            <li class="<%= current_page_class(issues_path) %>">
+              <%= link_to issues_path(:status => 'open') do %>
+                <%= open_issues_count %>
+                <%= t('layouts.issues') %>
+              <% end -%>
+            </li>
+          <% end %>
+          <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(copyright_path) %>"><%= link_to t('layouts.copyright'), copyright_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>
+      </li>
     </ul>
-    <% if @user %>
-      <div class='dropdown user-menu'>
+    <% if current_user && current_user.id %>
+      <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(current_user, :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'><%= current_user.display_name %></span>
+          <b class="caret"></b></span>
         </a>
         <ul class='dropdown-menu'>
           <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') %>
+            <%= link_to inbox_messages_path do %>
+              <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
+              <%= t('users.show.my messages') %>
             <% end %>
           </li>
           <li>
-            <%= link_to t('user.view.my profile'), user_path(:display_name => @user.display_name) %>
+            <%= link_to t('users.show.my profile'), user_path(current_user) %>
           </li>
           <li>
-            <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+            <%= link_to t('users.show.my settings'), :controller => 'users', :action => 'account', :display_name => current_user.display_name %>
           </li>
           <li class="divider"></li>
           <li>
             <%= yield :greeting %>
           </li>
           <li>
-            <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath) %>
+            <%= link_to t('layouts.logout'), logout_path(:session => session.id, :referer => request.fullpath) %>
           </li>
         </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>