diff options
| -rw-r--r-- | Zotlabs/Module/Settings/Account.php | 1 | ||||
| -rw-r--r-- | Zotlabs/Module/Settings/Multifactor.php | 11 | ||||
| -rw-r--r-- | view/tpl/settings_account.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/totp_setup.tpl | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/Zotlabs/Module/Settings/Account.php b/Zotlabs/Module/Settings/Account.php index 5e1fb176e..85e7c793f 100644 --- a/Zotlabs/Module/Settings/Account.php +++ b/Zotlabs/Module/Settings/Account.php @@ -105,6 +105,7 @@ class Account { '$password1' => array('npassword', t('Enter New Password'), '', ''), '$password2' => array('confirm', t('Confirm New Password'), '', t('Leave password fields blank unless changing')), '$submit' => t('Submit'), + '$mfa' => t('Multi-Factor Authentication'), '$email' => array('email', t('DId2 or Email Address:'), $email, '', '', $attremail), '$email_hidden' => (($attremail) ? $email : ''), '$removeme' => t('Remove Account'), diff --git a/Zotlabs/Module/Settings/Multifactor.php b/Zotlabs/Module/Settings/Multifactor.php index 5ac47be09..191055e2c 100644 --- a/Zotlabs/Module/Settings/Multifactor.php +++ b/Zotlabs/Module/Settings/Multifactor.php @@ -51,10 +51,9 @@ class Multifactor { return replace_macros(get_markup_template('totp_setup.tpl'), [ '$form_security_token' => get_form_security_token("settings_mfa"), - '$title' => t(' Account Multifactor Settings'), - '$totp_setup_text' => t('Multi-Factor Authentication Setup'), - '$secret_text' => t('This is your generated secret. It may be used in some cases if the QR image cannot be read. Please save it.'), - '$test_title' => t('Please enter the code from your authenticator'), + '$title' => t('Account Multi-Factor Authentication'), + '$secret_text' => t('This is your generated secret. It may be used in some cases if the QR image cannot be read. Please store it in a safe place.'), + '$test_title' => t('Please enter the code from your authenticator app'), '$test_title_sub' => t('You will only be able to enable MFA if the test passes'), '$qrcode' => (new QRCode())->render($uri), '$uri' => $uri, @@ -63,9 +62,9 @@ class Multifactor { '$test_fail' => t("Incorrect code."), '$enable_mfa' => [ 'enable_mfa', - t('Enable Multi-factor Authentication'), + t('Enable Multi-Factor Authentication'), AConfig::Get($account['account_id'], 'system', 'mfa_enabled'), - '', + t('Logging in will require you to be in possession of your smartphone with an authenticator app'), [t('No'), t('Yes')] ], '$submit' => t('Submit'), diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index b0076f380..0280b2962 100644 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -17,7 +17,7 @@ <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> - <a href="/settings/multifactor" class="btn btn-outline-success">Configure MFA</a> + <a href="/settings/multifactor" class="btn btn-outline-success">{{$mfa}}</a> </div> {{$account_settings}} </div> diff --git a/view/tpl/totp_setup.tpl b/view/tpl/totp_setup.tpl index 4139e3552..2ee79fae9 100644 --- a/view/tpl/totp_setup.tpl +++ b/view/tpl/totp_setup.tpl @@ -6,7 +6,7 @@ {{if $secret}} <div class="section-content-info-wrapper"> <div>{{$secret_text}}</div> - <div><strong>{{$secret}}</strong></div> + <div><strong class="text-break">{{$secret}}</strong></div> </div> {{/if}} <img src="{{$qrcode}}" alt="{{$uri}}" title="{{$uri}}"> @@ -17,7 +17,7 @@ <input type="text" id="totp_test" class="form-control" onfocus="totp_clear_code()"/> <small class="text-muted">{{$test_title_sub}}</small> </div> - <button id="otp-test-submit" type="submit" name="submit" class="btn btn-primary" onclick="totp_test_code(); return false;"> + <button id="otp-test-submit" type="submit" name="submit" class="btn btn-outline-primary" onclick="totp_test_code(); return false;"> {{$test}} </button> <div class=""> |