Download as
Browse Code »

Commit 5eb77a86125855c2ec8f16f1964a4782d598d7f3

Authored by Daniela Feitosa
1 parent 8557d3d2
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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,7 +1121,7 @@ module ApplicationHelper
1121 1121
1122 (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) + 1122 (_('Welcome, %s') % link_to('<i></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
1123 render_environment_features(:usermenu) + 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 manage_enterprises.to_s + 1125 manage_enterprises.to_s +
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")) + 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 pending_tasks_count + 1127 pending_tasks_count +
features/profile_domain.feature
  Diff comments   View file @5eb77a8
@@ -69,4 +69,4 @@ Feature: domain for profile @@ -69,4 +69,4 @@ Feature: domain for profile
69 Scenario: Compose link to administration with environment domain 69 Scenario: Compose link to administration with environment domain
70 Given I am logged in as "joaosilva" 70 Given I am logged in as "joaosilva"
71 When I visit "/" and wait 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"