Download as
Browse Code »

Commit 5eb77a86125855c2ec8f16f1964a4782d598d7f3

Authored by Daniela Feitosa
1 parent 8557d3d2
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Fixing admin link 

(ActionItem2016)
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @5eb77a8
... ... @@ -1121,7 +1121,7 @@ module ApplicationHelper
1121 1121  
1122 1122 (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
1123 1123 render_environment_features(:usermenu) +
1124   - link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', { :host => @environment.default_hostname, :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
  1124 + link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
1125 1125 manage_enterprises.to_s +
1126 1126 link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) +
1127 1127 pending_tasks_count +
... ...
features/profile_domain.feature
  Diff comments   View file @5eb77a8
... ... @@ -69,4 +69,4 @@ Feature: domain for profile
69 69 Scenario: Compose link to administration with environment domain
70 70 Given I am logged in as "joaosilva"
71 71 When I visit "/" and wait
72   - Then I should see "Administration" linking to "http://127.0.0.1:3001/admin"
  72 + Then I should see "Administration" linking to "http://127.0.0.1/admin"
... ...