From e93b239f5d1beb8046e75b901ff0ecb0bb02c638 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Fri, 18 Jan 2008 18:30:18 +0000 Subject: [PATCH] ActionItem152: changing the top bar links for login/logout into popup calls --- app/helpers/application_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9bc107f..dce60f9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -126,13 +126,13 @@ module ApplicationHelper ( link_to_myprofile( content_tag('span', _('edit profile')), {}, nil, { :id => 'link_edit_profile'} ) ), # O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado. ( link_to content_tag('span', _('Admin')), { :controller => 'admin_panel' }, :id => 'link_admin_panel' if current_user.person.is_admin?), - ( link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout'}, :id => 'link_logout'), + ( lightbox_link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout'), search_link, ] else [ #( link_to _("%s's home") % @environment.name, { :controller=>"home" }, :id=>"link_to_envhome" ), - ( link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login' }, :id => 'link_login' ), + ( lightbox_link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login_popup' }, :id => 'link_login' ), search_link, ] end.join(" ") @@ -280,7 +280,7 @@ module ApplicationHelper bt_submit = submit_tag(label, html_options.merge(:class => the_class)) - content_tag('p', bt_submit + bt_cancel, :class => 'submitline') + bt_submit + bt_cancel end def button_to_function(type, label, js_code, html_options = {}) -- libgit2 0.21.2