Merge pull request #14 from njs50/master

Add site setting to allow full screen login
This commit is contained in:
David Taylor 2018-07-27 11:19:46 +01:00 committed by GitHub
commit 34c34d462e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View File

@ -19,4 +19,4 @@ en:
oauth2_authorize_options: "When authorizing request these options" oauth2_authorize_options: "When authorizing request these options"
oauth2_scope: "When authorizing request this scope" oauth2_scope: "When authorizing request this scope"
oauth2_button_title: "The text for the OAuth2 button" oauth2_button_title: "The text for the OAuth2 button"
oauth2_full_screen_login: "Use main browser window instead of popup for login"

View File

@ -34,3 +34,6 @@ login:
oauth2_button_title: oauth2_button_title:
default: 'with OAuth2' default: 'with OAuth2'
client: true client: true
oauth2_full_screen_login:
default: false
client: true

View File

@ -149,7 +149,9 @@ end
auth_provider title_setting: "oauth2_button_title", auth_provider title_setting: "oauth2_button_title",
enabled_setting: "oauth2_enabled", enabled_setting: "oauth2_enabled",
authenticator: OAuth2BasicAuthenticator.new('oauth2_basic'), authenticator: OAuth2BasicAuthenticator.new('oauth2_basic'),
message: "OAuth2" message: "OAuth2",
full_screen_login_setting: "oauth2_full_screen_login"
register_css <<CSS register_css <<CSS