Download as
Browse Code »

Commit f619be458f482b0e9159d6cbdd2151f950cdde14

Authored by Antonio Terceiro
1 parent f73c8033
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Only show the "admin" link for admins 

(ActionItem1608)
Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
app/views/layouts/application-ng.rhtml
  Diff comments   View file @f619be4
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 <div id="user"> 44 <div id="user">
45 <span class='logged-in' style='display: none;'> 45 <span class='logged-in' style='display: none;'>
46 <%= _('Welcome, %s.') % link_to('<i></i><strong>%{login}</strong>', '/%{login}', :id => "homepage-link", :title => _('Go to your homepage')) %> 46 <%= _('Welcome, %s.') % link_to('<i></i><strong>%{login}</strong>', '/%{login}', :id => "homepage-link", :title => _('Go to your homepage')) %>
47 - <%= link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link') %> 47 + <%= link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') %>
48 <%= link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/%{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) %> 48 <%= link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', '/myprofile/%{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) %>
49 <%= link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) %> 49 <%= link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) %>
50 </span> 50 </span>
public/javascripts/application.js
  Diff comments   View file @f619be4
@@ -446,6 +446,9 @@ jQuery(function($) { @@ -446,6 +446,9 @@ jQuery(function($) {
446 }); 446 });
447 var html = $(this).html().replace('%{login}', data.login).replace('%{month}', data.since_month).replace('%{year}', data.since_year); 447 var html = $(this).html().replace('%{login}', data.login).replace('%{month}', data.since_month).replace('%{year}', data.since_year);
448 $(this).html(html).fadeIn(); 448 $(this).html(html).fadeIn();
  449 + if (data.is_admin) {
  450 + $('#user .admin-link').show();
  451 + }
449 }); 452 });
450 } else { 453 } else {
451 // not logged in 454 // not logged in