On hover, change border to a subtle darker orange, increase strokeWidth

[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 3187d0b27f6ee7b029716d9f9810bdc43685e623..cd3dfd46883e7d10b6f48516642d930c6c1eacaa 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -38,8 +38,13 @@
   </nav>
   <nav class='secondary'>
     <ul>
   </nav>
   <nav class='secondary'>
     <ul>

-      <% if @user and @user.administrator? %>
-        <li class="compact-hide <%= current_page_class(issues_path) %>"><%= link_to t('layouts.issues'), issues_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>
       <% 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">
       <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 current_user and ( current_user.administrator? or current_user.moderator? ) %>
+            <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(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>


@@ -57,33 +70,33 @@
         </ul>
       </li>
     </ul>
         </ul>
       </li>
     </ul>

-    <% if @user && @user.id %>
+    <% if current_user && current_user.id %>

       <div class='dropdown user-menu logged-in'>
         <a class='dropdown-toggle' data-toggle='dropdown' href="#">
       <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(current_user, :width => 25, :height => 25)

           %><%= render :partial => 'layouts/inbox'
           %><%= render :partial => 'layouts/inbox'

-        %><span class="user-button"><span class='username'><%= @user.display_name %></span>
+        %><span class="user-button"><span class='username'><%= current_user.display_name %></span>

           <b class="caret"></b></span>
         </a>
         <ul class='dropdown-menu'>
           <li>
           <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('user.view.my messages') %>
+            <%= link_to inbox_messages_path do %>
+              <span class='count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
+              <%= t('user.show.my messages') %>

             <% end %>
           </li>
           <li>
             <% end %>
           </li>
           <li>

-            <%= link_to t('user.view.my profile'), user_path(:display_name => @user.display_name) %>
+            <%= link_to t('user.show.my profile'), user_path(current_user) %>

           </li>
           <li>
           </li>
           <li>

-            <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+            <%= link_to t('user.show.my settings'), :controller => 'user', :action => 'account', :display_name => current_user.display_name %>

           </li>
           <li class="divider"></li>
           <li>
             <%= yield :greeting %>
           </li>
           <li>
           </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>
           </li>
         </ul>
       </div>