From 4762b4ac24c5fb1bcef32f7089536a7d64f55a88 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 15 Oct 2014 11:00:34 -0400 Subject: [PATCH] FIX: on completion of external auth, window.close may fail because of iOS Safari bug. Prompt user to manually close the window. --- .../omniauth_callbacks/complete.html.erb | 27 ++++++++++++++++--- config/locales/server.en.yml | 1 + 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb index 08257bb3803..d2198018a85 100644 --- a/app/views/users/omniauth_callbacks/complete.html.erb +++ b/app/views/users/omniauth_callbacks/complete.html.erb @@ -1,9 +1,30 @@ + - - + + <%= SiteSetting.title %> + + + + + + +
+

<%=t "login.close_window" %>

+ - +
+ diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index de41b2fe903..19f4bf2397a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1107,6 +1107,7 @@ en: new_registrations_disabled: "New account registrations are not allowed at this time." password_too_long: "Passwords are limited to 200 characters." missing_user_field: "You have not completed all the user fields" + close_window: "Authentication is complete. Close this window to continue." user: no_accounts_associated: "No accounts associated"