Download as
Browse Code »

Commit e93b239f5d1beb8046e75b901ff0ecb0bb02c638

Authored by AntonioTerceiro
1 parent c0a9c8ff
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

ActionItem152: changing the top bar links for login/logout into popup calls 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1222 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @e93b239
... ... @@ -126,13 +126,13 @@ module ApplicationHelper
126 126 ( link_to_myprofile( content_tag('span', _('edit profile')), {}, nil, { :id => 'link_edit_profile'} ) ),
127 127 # O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado.
128 128 ( link_to content_tag('span', _('Admin')), { :controller => 'admin_panel' }, :id => 'link_admin_panel' if current_user.person.is_admin?),
129   - ( link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout'}, :id => 'link_logout'),
  129 + ( lightbox_link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout_popup'}, :id => 'link_logout'),
130 130 search_link,
131 131 ]
132 132 else
133 133 [
134 134 #( link_to _("%s's home") % @environment.name, { :controller=>"home" }, :id=>"link_to_envhome" ),
135   - ( link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login' }, :id => 'link_login' ),
  135 + ( lightbox_link_to content_tag('span', _('Login')), { :controller => 'account', :action => 'login_popup' }, :id => 'link_login' ),
136 136 search_link,
137 137 ]
138 138 end.join(" ")
... ... @@ -280,7 +280,7 @@ module ApplicationHelper
280 280  
281 281 bt_submit = submit_tag(label, html_options.merge(:class => the_class))
282 282  
283   - content_tag('p', bt_submit + bt_cancel, :class => 'submitline')
  283 + bt_submit + bt_cancel
284 284 end
285 285  
286 286 def button_to_function(type, label, js_code, html_options = {})
... ...