Makes logged-in username in topbar linking to (#2291).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2109 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0e02e56924f0a64c811830caeba79648cf027dff..cb0233fd64e963e8a53bca8f5f1d420f9d7de78f 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -47,8 +47,8 @@ module ApplicationHelper
   end
 
   # Display a link to user's account page
-  def link_to_user(user)
-    (user && !user.anonymous?) ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
+  def link_to_user(user, options={})
+    (user && !user.anonymous?) ? link_to(user.name(options[:format]), :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
   end
 
   def link_to_issue(issue, options={})

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 8cdfcb8e66ef7618a51fa6223a6154d964fbfbec..b146d615ed7957628edc5eedaee8bb981b52f563 100644 (file)
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -24,7 +24,7 @@
     <div id="account">
         <%= render_menu :account_menu -%>
     </div>
-    <%= content_tag('div', "#{l(:label_logged_as)} #{User.current.login}", :id => 'loggedas') if User.current.logged? %>
+    <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => 'loggedas') if User.current.logged? %>
     <%= render_menu :top_menu -%>
 </div>