Merge remote-tracking branch 'upstream/pull/2009'

[rails.git] / app / views / layouts / _header.html.erb

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 050d8a0817669702257c76c62c958ea89110c23a..946f95febf22f23aee9ba1391a70c2ab247be514 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -39,7 +39,12 @@
   <nav class='secondary'>
     <ul>
       <% if current_user and ( current_user.administrator? or current_user.moderator? ) %>
-        <li class="compact-hide <%= current_page_class(issues_path) %>"><%= link_to t('layouts.issues'), issues_path(:status => 'open') %></li>
+        <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>
@@ -49,6 +54,14 @@
       <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>
@@ -69,14 +82,14 @@
           <li>
             <%= link_to inbox_messages_path do %>
               <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
-              <%= t('user.view.my messages') %>
+              <%= t('users.show.my messages') %>
             <% end %>
           </li>
           <li>
-            <%= link_to t('user.view.my profile'), user_path(:display_name => current_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 => current_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>