From 59489b86df33eca2dd1f978acc598758f50d4056 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Fri, 24 Sep 2010 19:48:49 -0300 Subject: [PATCH] Removing invented %{} 'markup' from links --- app/helpers/application_helper.rb | 4 ++-- app/views/blocks/login_block.rhtml | 6 +++--- app/views/shared/user_menu.rhtml | 14 +++++++------- public/javascripts/application.js | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b481e91..b166145 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1140,10 +1140,10 @@ module ApplicationHelper end def usermenu_logged_in - (_('Welcome, %s') % link_to('%{login}', '/%{login}', :id => "homepage-link", :title => _('Go to your homepage'))) + + (_('Welcome, %s') % link_to('{login}', '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) + usermenu_from_environment_features + link_to('' + _('Administration') + '', { :controller => 'admin_panel', :action => 'index' }, :id => "controlpanel", :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') + - link_to('' + _('Control panel') + '', '/myprofile/%{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) + + link_to('' + _('Control panel') + '', '/myprofile/{login}', :id => "controlpanel", :title => _("Configure your personal account and content")) + link_to('' + _('Logout') + '', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system")) end diff --git a/app/views/blocks/login_block.rhtml b/app/views/blocks/login_block.rhtml index 25c639d..c1a3bb9 100644 --- a/app/views/blocks/login_block.rhtml +++ b/app/views/blocks/login_block.rhtml @@ -1,8 +1,8 @@