From 42bab2bd2557d1eefa1a76a5649dd66a7efc4a9f Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Sat, 12 Nov 2022 23:10:54 +0100 Subject: [PATCH] layout admin panel --- .../views/admin/de/d3totp_lang.php | 1 + .../views/admin/en/d3totp_lang.php | 1 + .../views/admin/tpl/d3user_totp.tpl | 336 ++++++------------ 3 files changed, 116 insertions(+), 222 deletions(-) diff --git a/src/Application/views/admin/de/d3totp_lang.php b/src/Application/views/admin/de/d3totp_lang.php index b9c196d..d85d205 100644 --- a/src/Application/views/admin/de/d3totp_lang.php +++ b/src/Application/views/admin/de/d3totp_lang.php @@ -41,6 +41,7 @@ $aLang = [ 'D3_TOTP_REGISTERDELETE_DESC' => 'Um die Registrierung zu ändern, löschen Sie diese bitte vorerst. Sie können sofort im Anschluss eine neue Registrierung anlegen.
Wenn Sie die Registrierung löschen, ist das Konto nicht mehr durch die Zwei-Faktor-Authentisierung geschützt.', 'D3_TOTP_REGISTERDELETED' => 'Die Registrierung wurde gelöscht.', + 'D3_TOTP_CONFIRMATION' => 'Bestätigung', 'D3_TOTP_BACKUPCODES' => 'Backupcodes', 'D3_TOTP_BACKUPCODES_DESC' => 'Mit diesen Backupcodes können Sie sich anmelden, wenn die Generierung des Einmalpasswortes nicht möglich ist (z.B. Gerät verloren oder neu installiert). Sie können dann die Einstellungen zur Verwendung der 2-Faktor-Authentisierung ändern oder einen neuen Zugang erstellen. Speichern Sie sich diese Codes bitte in diesem Moment sicher ab. Nach Verlassen dieser Seite können diese Codes nicht erneut angezeigt werden.', 'D3_TOTP_AVAILBACKUPCODECOUNT' => 'noch %1$s Backupcode(s) verfügbar', diff --git a/src/Application/views/admin/en/d3totp_lang.php b/src/Application/views/admin/en/d3totp_lang.php index 807e9c2..714a87a 100644 --- a/src/Application/views/admin/en/d3totp_lang.php +++ b/src/Application/views/admin/en/d3totp_lang.php @@ -41,6 +41,7 @@ $aLang = [ 'D3_TOTP_REGISTERDELETE_DESC' => 'To change the registration, please delete it. You can then immediately create a new registration.
If you delete the registration, the account is no longer protected by the two-factor authentication.', 'D3_TOTP_REGISTERDELETED' => 'The registration has been deleted.', + 'D3_TOTP_CONFIRMATION' => 'confirmation', 'D3_TOTP_BACKUPCODES' => 'backup codes', 'D3_TOTP_BACKUPCODES_DESC' => 'You can use these backup codes to log on if it is not possible to generate the one-time password (e.g. device lost or newly installed). You can then change the settings to use 2-factor authentication or create a new 2FA login. Please save these codes safely at this moment. After leaving this page, these codes cannot be displayed again.', 'D3_TOTP_AVAILBACKUPCODECOUNT' => '%1$s backup code(s) still available', diff --git a/src/Application/views/admin/tpl/d3user_totp.tpl b/src/Application/views/admin/tpl/d3user_totp.tpl index b0fa1f9..999662b 100644 --- a/src/Application/views/admin/tpl/d3user_totp.tpl +++ b/src/Application/views/admin/tpl/d3user_totp.tpl @@ -67,232 +67,124 @@ [{/if}] [{if $oxid && $oxid != '-1'}] -
-
-
-
- [{block name="user_d3user_totp_form1"}] - [{if false == $totp->getId()}] -
- [{oxmultilang ident="D3_TOTP_REGISTERNEW"}] -
-
- [{oxmultilang ident="D3_TOTP_QRCODE"}] - - [{$totp->getQrCodeElement()}] - [{oxinputhelp ident="D3_TOTP_QRCODE_HELP"}] -
- [{elseif $force2FA}] -
- [{oxmultilang ident="D3_TOTP_ADMINBACKEND"}] -
-
- -
- [{else}] -
- [{oxmultilang ident="D3_TOTP_REGISTEREXIST"}] -
-
-
-
- [{oxmultilang ident="D3_TOTP_REGISTERDELETE_DESC"}] -
-
- -
-
-
- [{/if}] -[{*****}] - [{/block}] +
+
+
+
+ [{block name="user_d3user_totp_form1"}] + [{if false == $totp->getId()}] +
+ [{oxmultilang ident="D3_TOTP_REGISTERNEW"}] +
+
+
+
+ [{oxmultilang ident="D3_TOTP_QRCODE" suffix="COLON"}] +
+
+ [{$totp->getQrCodeElement()}] + [{oxinputhelp ident="D3_TOTP_QRCODE_HELP"}] +
+
+
+ [{elseif $force2FA}] +
+ [{oxmultilang ident="D3_TOTP_ADMINBACKEND"}] +
+
+ +
+ [{else}] +
+ [{oxmultilang ident="D3_TOTP_REGISTEREXIST"}] +
+
+
+
+ [{oxmultilang ident="D3_TOTP_REGISTERDELETE_DESC"}] +
+
+ +
+
+
+
+ [{/if}] + [{/block}] +
-
-
-
- [{block name="user_d3user_totp_form2"}] - [{if false == $totp->getId()}] -
- [{oxmultilang ident="D3_TOTP_BACKUPCODES"}] - Bestaetigung -
-
- - - [{oxinputhelp ident="D3_TOTP_SECRET_HELP"}] - - - - [{oxinputhelp ident="D3_TOTP_CURROTP_HELP"}] - - -
- [{else}] -
- [{oxmultilang ident="D3_TOTP_BACKUPCODES"}] -
-
- [{if $oView->getBackupCodes()}] - - - -
-
- - - - [{else}] - - - [{oxmultilang ident="D3_TOTP_AVAILBACKUPCODECOUNT" args=$oView->getAvailableBackupCodeCount()}] - - - - - [{oxmultilang ident="D3_TOTP_AVAILBACKUPCODECOUNT_DESC"}] - - - [{/if}] -
- [{/if}] - [{/block}] +
+
+ [{block name="user_d3user_totp_form2"}] + [{if false == $totp->getId()}] +
+ [{oxmultilang ident="D3_TOTP_CONFIRMATION"}] +
+
+
+
+ +
+
+ + [{oxinputhelp ident="D3_TOTP_SECRET_HELP"}] +
+
+
+
+ +
+
+ + [{oxinputhelp ident="D3_TOTP_CURROTP_HELP"}] +
+
+
+
+
+ +
+
+
+ [{else}] +
+ [{oxmultilang ident="D3_TOTP_BACKUPCODES"}] +
+
+ [{if $oView->getBackupCodes()}] +
+
+ +
+
+ +
+
+ [{else}] +
+
+ [{oxmultilang ident="D3_TOTP_AVAILBACKUPCODECOUNT" args=$oView->getAvailableBackupCodeCount()}] +
+
+ [{oxmultilang ident="D3_TOTP_AVAILBACKUPCODECOUNT_DESC"}] +
+
+ [{/if}] +
+ [{/if}] + [{/block}] +
-
- - - -[{*** - -**}] - - - - -
- - [{block name="user_d3user_totp_form1"}] - [{if false == $totp->getId()}] - - - - - - - - [{elseif $force2FA}] - - - - - - - [{else}] - - - - - - - - - - [{/if}] - - [{/block}] -
-

[{oxmultilang ident="D3_TOTP_REGISTERNEW"}]

-
- [{oxmultilang ident="D3_TOTP_QRCODE"}]  - - [{$totp->getQrCodeElement()}] - [{oxinputhelp ident="D3_TOTP_QRCODE_HELP"}] -
-

[{oxmultilang ident="D3_TOTP_ADMINBACKEND"}]

-
- - -
-

[{oxmultilang ident="D3_TOTP_REGISTEREXIST"}]

-
- [{oxmultilang ident="D3_TOTP_REGISTERDELETE_DESC"}] -


- -
- 		- - [{block name="user_d3user_totp_form2"}] - [{if false == $totp->getId()}] - - - - - - - - - - - - - - - - [{else}] - - - - [{if $oView->getBackupCodes()}] - - - - [{else}] - - - - - - - [{/if}] - [{/if}] - - [{/block}] -
-

 

-
- - - - [{oxinputhelp ident="D3_TOTP_SECRET_HELP"}] -
- - - - [{oxinputhelp ident="D3_TOTP_CURROTP_HELP"}] -


- -
-

[{oxmultilang ident="D3_TOTP_BACKUPCODES"}]

-
- -
-
- -
- [{oxmultilang ident="D3_TOTP_AVAILBACKUPCODECOUNT" args=$oView->getAvailableBackupCodeCount()}] -
- [{oxmultilang ident="D3_TOTP_AVAILBACKUPCODECOUNT_DESC"}] -
-
[{/if}]