diff options
| -rw-r--r-- | Zotlabs/Module/Regate.php | 28 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 11 | ||||
| -rw-r--r-- | view/tpl/regate_post.tpl | 16 |
3 files changed, 40 insertions, 15 deletions
diff --git a/Zotlabs/Module/Regate.php b/Zotlabs/Module/Regate.php index 84f78e066..99e20c719 100644 --- a/Zotlabs/Module/Regate.php +++ b/Zotlabs/Module/Regate.php @@ -258,15 +258,15 @@ class Regate extends \Zotlabs\Web\Controller { if ($_SESSION['zar']['delayed']) { $o = replace_macros(get_markup_template('regate_pre.tpl'), [ - '$title' => t('Registration validation'), + '$title' => t('Registration verification'), '$now' => $nowfmt, '$id' => $_SESSION['zar']['id'], '$pin' => $_SESSION['zar']['pin'], '$regdelay' => $_SESSION['zar']['regdelay'], '$regexpire' => $_SESSION['zar']['regexpire'], '$strings' => [ - t('Hold on, you can start validation in'), - t('Please remember your validation token for ID'), + t('Hold on, you can start verification in'), + t('Please remember your verification token for ID'), t('Token validity') ] ]); @@ -306,14 +306,14 @@ class Regate extends \Zotlabs\Web\Controller { $resend = ($r['reg_didx'] == 'e') ? t('Resend') : false; // is still only instance admins intervention required? - if ( $r['reg_flags'] == ACCOUNT_PENDING ) { + if ($r['reg_flags'] == ACCOUNT_PENDING) { $o = replace_macros(get_markup_template('regate_post.tpl'), [ '$title' => t('Registration status'), - '$pin' => $did2, - '$infos' => [ + '$id' => $did2, + '$strings' => [ t('Verification successful!'), - t('Your login ID'), - t('After your account has been approved by our admin you will be able to login with your ID and your provided password.') + t('Your login ID is'), + t('After your account has been approved by our administrator you will be able to login with your login ID and your provided password.') ] ]); } @@ -349,8 +349,8 @@ class Regate extends \Zotlabs\Web\Controller { if ( $r['reg_startup'] <= $now && $r['reg_expires'] >= $now) { $o = replace_macros(get_markup_template('regate.tpl'), [ '$form_security_token' => get_form_security_token("regate"), - '$title' => t('Registration validation'), - '$desc' => t('Please enter your validation token for ID'), + '$title' => t('Registration verification'), + '$desc' => t('Please enter your verification token for ID'), '$id' => $did2, // we might consider to not provide $pin if a registration delay is configured // and the pin turns out to be readable by bots @@ -360,7 +360,7 @@ class Regate extends \Zotlabs\Web\Controller { '$atform' => $atform, '$resend' => $resend, '$submit' => t('Submit'), - '$acpin' => [ 'acpin', t('Validation token'),'','' ] + '$acpin' => [ 'acpin', t('Verification token'),'','' ] ]); } else { @@ -378,13 +378,13 @@ class Regate extends \Zotlabs\Web\Controller { } $o = replace_macros(get_markup_template('regate_pre.tpl'), [ - '$title' => t('Registration validation'), + '$title' => t('Registration verification'), '$now' => $nowfmt, '$id' => $did2, '$countdown' => datetime_convert('UTC', 'UTC', $r['reg_startup'], 'c'), '$strings' => [ - t('Hold on, you can start validation in'), - t('You will require the validation token for ID') + t('Hold on, you can start verification in'), + t('You will require the verification token for ID') ] ]); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 7e7f33d8e..8b336ff6d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1328,6 +1328,14 @@ img.mail-conv-sender-photo { border-bottom: 3px solid $comment_item_colour; } +.section-content-success-wrapper { + padding: 21px 10px; + color: #155724; + background-color: #d4edda; + border-bottom: 3px solid $comment_item_colour; + text-align: center; +} + .section-content-info-wrapper { padding: 21px 10px; color: #0c5460; @@ -1351,7 +1359,8 @@ img.mail-conv-sender-photo { border-bottom: 3px solid $comment_item_colour; text-align: center; } - +.section-content-tools-wrapper .section-content-success-wrapper, +.section-content-wrapper .section-content-success-wrapper, .section-content-tools-wrapper .section-content-info-wrapper, .section-content-wrapper .section-content-info-wrapper, .section-content-tools-wrapper .section-content-warning-wrapper, diff --git a/view/tpl/regate_post.tpl b/view/tpl/regate_post.tpl new file mode 100644 index 000000000..eccea9084 --- /dev/null +++ b/view/tpl/regate_post.tpl @@ -0,0 +1,16 @@ +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h2>{{$title}}</h2> + </div> + <div class="section-content-wrapper"> + <div class="section-content-success-wrapper"> + <div class="h3"><i class="fa fa-check"></i> {{$strings.0}}</div> + </div> + <div class="section-content-warning-wrapper"> + {{$strings.2}} + </div> + <div class="section-content-info-wrapper"> + <div class="h3">{{$strings.1}} {{$id}}</div> + </div> + </div> +</div> |