Download as
Browse Code »

Commit e93b239f5d1beb8046e75b901ff0ecb0bb02c638

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

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,13 +126,13 @@ module ApplicationHelper
126 ( link_to_myprofile( content_tag('span', _('edit profile')), {}, nil, { :id => 'link_edit_profile'} ) ), 126 ( link_to_myprofile( content_tag('span', _('edit profile')), {}, nil, { :id => 'link_edit_profile'} ) ),
127 # O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado. 127 # O ID icon_accessibility tambem tem que aparcer e testei o link nao ta funcionado.
128 ( link_to content_tag('span', _('Admin')), { :controller => 'admin_panel' }, :id => 'link_admin_panel' if current_user.person.is_admin?), 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 search_link, 130 search_link,
131 ] 131 ]
132 else 132 else
133 [ 133 [
134 #( link_to _("%s's home") % @environment.name, { :controller=>"home" }, :id=>"link_to_envhome" ), 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 search_link, 136 search_link,
137 ] 137 ]
138 end.join(" ") 138 end.join(" ")
@@ -280,7 +280,7 @@ module ApplicationHelper @@ -280,7 +280,7 @@ module ApplicationHelper
280 280
281 bt_submit = submit_tag(label, html_options.merge(:class => the_class)) 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 end 284 end
285 285
286 def button_to_function(type, label, js_code, html_options = {}) 286 def button_to_function(type, label, js_code, html_options = {})