Merge branch 'master' into moderation

[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 a8811c6c9c39ff27842ba803faef9aa651fb5036..cd18e79dfc22401f74b4c569f88fc28e76542fff 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -38,6 +38,9 @@
   </nav>
   <nav class='secondary'>
     <ul>
+      <% if @user and ( @user.administrator? or @user.moderator? ) %>
+        <li class="compact-hide <%= current_page_class(issues_path) %>"><b><%= link_to t('layouts.reports'), issues_path %></b></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>
@@ -57,7 +60,7 @@
     <% 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)
+          <%= user_thumbnail_tiny(@user, :width => 25, :height => 25)
           %><%= render :partial => 'layouts/inbox'
         %><span class="user-button"><span class='username'><%= @user.display_name %></span>
           <b class="caret"></b></span>
@@ -80,7 +83,7 @@
             <%= 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>