diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 828e98e..8945828 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -112,14 +112,21 @@ module ApplicationHelper def shortcut_header_links if logged_in? [ - ( link_to_myprofile( content_tag('span', _('My profile')), {}, nil, { :id => 'link_go_home'} ) ), + ( link_to_homepage 'Photo'+ current_user.login, + current_user.login, :id=>"link_go_home" ), + ( link_to_myprofile( content_tag('span', _('edit profile')), {}, nil, { :id => 'link_edit_profile'} ) ), # O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado. ( link_to content_tag('span', _('Admin')), { :controller => 'admin_panel' }, :id => 'link_admin_panel' if current_user.person.is_admin?), ( link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout'}, :id => 'link_logout'), + 'Search' ] else - [ + [ + ( link_to _("%s's home") % @environment.name, { :controller=>"home" }, :id=>"link_to_envhome" ), ( link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login' }, :id => 'link_login' ), + 'Search' ] end.join(" ") end diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index cc6f2c0..ecaa7d7 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -24,6 +24,9 @@ + <% unless flash[:notice].nil? %>
@@ -54,14 +57,8 @@ prepareMenu('navigation_bar', { timeout: 5 }); - -
<%= shortcut_header_links %> - Search
diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml index c15560d..7d90408 100644 --- a/app/views/shared/categories_menu.rhtml +++ b/app/views/shared/categories_menu.rhtml @@ -1,5 +1,5 @@