diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-23 14:29:38 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-23 14:30:06 -0400 |
| commit | af6a4b21614c602ae8fe5323fab2b384c6ad5393 (patch) | |
| tree | 28c8c1c7343fdccd7dbcd47a9908f995f8ae63a5 | |
| parent | 2fc4be1a31e44f30ea96914bf657e4e7b2236760 (diff) | |
| download | forums-af6a4b21614c602ae8fe5323fab2b384c6ad5393.tar forums-af6a4b21614c602ae8fe5323fab2b384c6ad5393.tar.gz forums-af6a4b21614c602ae8fe5323fab2b384c6ad5393.tar.bz2 forums-af6a4b21614c602ae8fe5323fab2b384c6ad5393.tar.xz forums-af6a4b21614c602ae8fe5323fab2b384c6ad5393.zip | |
[feature/oauth] Clean up the OAuth ACP template
PHPBB3-11673
| -rw-r--r-- | phpBB/adm/style/auth_provider_oauth.html | 6 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/adm/style/auth_provider_oauth.html b/phpBB/adm/style/auth_provider_oauth.html index 87f8716c5e..25e40ff596 100644 --- a/phpBB/adm/style/auth_provider_oauth.html +++ b/phpBB/adm/style/auth_provider_oauth.html @@ -1,14 +1,16 @@ <h2>{L_AUTH_PROVIDER_OAUTH_TITLE}</h2> +<p>{L_AUTH_PROVIDER_OAUTH_EXPLAIN}</p> + <!-- BEGIN oauth_services --> <fieldset> <legend>{oauth_services.ACTUAL_NAME}</legend> <dl> - <dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_KEY_EXPLAIN}</span></dt> + <dt><label for="oauth_service_{oauth_services.NAME}_key">{L_AUTH_PROVIDER_OAUTH_KEY}{L_COLON}</label></dt> <dd><input type="text" id="oauth_service_{oauth_services.NAME}_key" size="40" name="config[auth_oauth_{oauth_services.NAME}_key]" value="{oauth_services.KEY}" /></dd> </dl> <dl> - <dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label><br /><span>{L_AUTH_PROVIDER_OAUTH_SECRET_EXPLAIN}</span></dt> + <dt><label for="oauth_service_{oauth_services.NAME}_secret">{L_AUTH_PROVIDER_OAUTH_SECRET}{L_COLON}</label></dt> <dd><input type="text" id="oauth_service_{oauth_services.NAME}_secret" size="40" name="config[auth_oauth_{oauth_services.NAME}_secret]" value="{oauth_services.SECRET}" /></dd> </dl> </fieldset> diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 892d3f61fe..553cd1a6eb 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -394,14 +394,13 @@ $lang = array_merge($lang, array( 'AUTH_METHOD' => 'Select an authentication method', + 'AUTH_PROVIDER_OAUTH_EXPLAIN' => 'Each OAuth provider requires a unique secret and key in order to authenticate with the external server.<br />These should be supplied by the OAuth service when you register your website with them and should be entered exactly as provided to you.<br />Any service that does not have both a key and a secret entered here will not be available for use by the forum users.', 'AUTH_PROVIDER_OAUTH_KEY' => 'Key', - 'AUTH_PROVIDER_OAUTH_KEY_EXPLAIN' => '', 'AUTH_PROVIDER_OAUTH_SERVICE_BITLY' => 'Bitly', 'AUTH_PROVIDER_OAUTH_SERVICE_FACEBOOK' => 'Facebook', 'AUTH_PROVIDER_OAUTH_SERVICE_GOOGLE' => 'Google', 'AUTH_PROVIDER_OAUTH_TITLE' => 'OAuth', 'AUTH_PROVIDER_OAUTH_SECRET' => 'Secret', - 'AUTH_PROVIDER_OAUTH_SECRET_EXPLAIN' => '', 'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username. Apache authentication can only be used with mod_php (not with a CGI version) and safe_mode disabled.', |