Download as
Browse Code »

Commit f3a7648d3946f25d0fc69b55404de5d5ea27470b

Authored by AntonioTerceiro
1 parent 7dcab529
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem152: logging in and out with popups 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1212 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 26 additions and 0 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @f3a7648
... ... @@ -26,6 +26,14 @@ class AccountController < PublicController
26 26 end
27 27 end
28 28  
  29 + def logout_popup
  30 + render :action => 'logout_popup', :layout => false
  31 + end
  32 +
  33 + def login_popup
  34 + render :action => 'login', :layout => false
  35 + end
  36 +
29 37 # action to register an user to the application
30 38 def signup
31 39 begin
... ...
app/views/account/logout_popup.rhtml 0 → 100644
  Diff comments   View file @f3a7648
... ... @@ -0,0 +1,6 @@
  1 +<p><%= _('Are you sure?') %></p>
  2 +
  3 +<% button_bar do %>
  4 + <%= button :ok, _('Yes, I want to logout'), { :controller => 'account', :action => 'logout' } %>
  5 + <%= lightbox_close_button _('No, I want to stay logged in.') %>
  6 +<% end %>
... ...
test/functional/account_controller_test.rb
  Diff comments   View file @f3a7648
... ... @@ -234,6 +234,18 @@ class AccountControllerTest &lt; Test::Unit::TestCase
234 234 assert !User.find(user.id).authenticated?('onepass')
235 235 end
236 236  
  237 + should 'display login popup' do
  238 + get :login_popup
  239 + assert_template 'login'
  240 + assert_no_tag :tag => "body" # e.g. no layout
  241 + end
  242 +
  243 + should 'display logout popup' do
  244 + get :logout_popup
  245 + assert_template 'logout_popup'
  246 + assert_no_tag :tag => "body" # e.g. no layout
  247 + end
  248 +
237 249 protected
238 250 def create_user(options = {})
239 251 post :signup, :user => { :login => 'quire', :email => 'quire@example.com',
... ...