Download as
Browse Code »

Commit 07025bff403eb57e050b6174976409cd971a7e82

Authored by MoisesMachado
1 parent 77bc8e2c
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem114: fixed the links of the shortcuts in the top 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@815 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 15 additions and 11 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @07025bf
@@ -128,6 +128,20 @@ module ApplicationHelper @@ -128,6 +128,20 @@ module ApplicationHelper
128 end[0] 128 end[0]
129 end 129 end
130 130
  131 + def shortcut_header_links
  132 + if logged_in?
  133 + [ accessibility_link,
  134 + ( link_to_homepage( content_tag('span', _('My account')) ) ),
  135 + ( link_to( _('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?),
  136 + ( link_to content_tag('span', _('Logout')), :controller => 'account', :action => 'logout', :method => 'post'),
  137 + ]
  138 + else
  139 + [ accessibility_link,
  140 + ( link_to content_tag('span', _('Login')), :controller => 'account', :action => 'login'),
  141 + ]
  142 + end
  143 + end
  144 +
131 def header 145 def header
132 login_or_register_or_logout 146 login_or_register_or_logout
133 end 147 end
app/views/layouts/application.rhtml
  Diff comments   View file @07025bf
@@ -33,17 +33,7 @@ @@ -33,17 +33,7 @@
33 <div id='top_bar' class='category<%= category_color %>'> 33 <div id='top_bar' class='category<%= category_color %>'>
34 <div id='accessibility_menu'> 34 <div id='accessibility_menu'>
35 <a href='#content'><span><%= _('Go Content') %></span></a> 35 <a href='#content'><span><%= _('Go Content') %></span></a>
36 - <%=  
37 - if logged_in?  
38 - ( accessibility_link ) + " " +  
39 - ( link_to_homepage((content_tag('span', _('My account'))))) + " " +  
40 - ( link_to(_('Admin'), { :controller => 'admin_panel' }) if current_user.person.is_admin?) + " " +  
41 - (link_to (content_tag('span', _('Logout'))), { :controller => 'account', :action => 'logout'}, :method => 'post')  
42 - else  
43 - ( accessibility_link ) + " " +  
44 - (link_to (content_tag('span', _('Login'))), :controller => 'account', :action => 'login')  
45 - end  
46 - %> 36 + <%= shortcut_header_links %>
47 </div><!-- accessibility_menu --> 37 </div><!-- accessibility_menu -->
48 <div id='path_category'> 38 <div id='path_category'>
49 <% if @category %> 39 <% if @category %>