adjust manage key templates for propper layout in flow and wave theme

This commit is contained in:
Daniel Seifert 2022-11-02 10:19:05 +01:00
parent ce4dcb49cb
commit 28035cca52
Signed by: DanielS
GPG Key ID: 8A7C4C6ED1915C6F
5 changed files with 62 additions and 58 deletions

View File

@ -18,7 +18,8 @@ $aLang = array(
'WEBAUTHN_INPUT_HELP' => 'Bitte mit Hardwareschlüssel authentisieren.',
'WEBAUTHN_CANCEL_LOGIN' => 'Anmeldung abbrechen',
'D3_WEBAUTHN_BREADCRUMB' => 'Passwortloses Anmelden',
'D3_WEBAUTHN_CONF_BROWSER_REQUEST' => 'Bitte die Anfrage des Browsers bestätigen:',
'D3_WEBAUTHN_CONFIRMATION' => 'Bestätigung erforderlich',
'D3_WEBAUTHN_CONF_BROWSER_REQUEST' => 'Bitte die Anfrage des Browsers bestätigen.',
'D3_WEBAUTHN_CANCEL' => 'Abbrechen',
'D3_WEBAUTHN_DELETE' => 'Löschen',
'D3_WEBAUTHN_DELETE_CONFIRM' => 'Soll der Schlüssel wirklich gelöscht werden?',

View File

@ -104,14 +104,14 @@
<input type="hidden" name="fnc" value="requestNewCredential">
<input type="hidden" name="oxid" value="[{$oxid}]">
[{block name="user_d3user_totp_registerform"}]
<label for="credentialname">
[{oxmultilang ident="D3_WEBAUTHN_KEYNAME"}]
</label>
<p class="card-text">
<label for="credentialname">
[{oxmultilang ident="D3_WEBAUTHN_KEYNAME" suffix="COLON"}]
</label>
<input id="credentialname" type="text" name="credenialname" [{$readonly}]>
</p>
<p class="card-text">
<button type="submit" [{$readonly}] class="btn btn-primary btn-success">
<button type="submit" [{$readonly}] class="btn btn-primary btn-success btn-sm">
[{oxmultilang ident="D3_WEBAUTHN_ADDKEY"}]
</button>
</p>
@ -127,26 +127,26 @@
<div class="card-header">
[{oxmultilang ident="D3_WEBAUTHN_REGISTEREDKEYS"}]
</div>
<div class="card-body">
[{assign var="list" value=$oView->getCredentialList($oxid)}]
[{if $list|@count}]
<ul class="list-group list-group-flush">
[{foreach from=$list item="credential"}]
<li class="list-group-item">
[{$credential->getName()}]
<a onclick="deleteItem('[{$credential->getId()}]'); return false;" href="#" class="btn btn-danger btn-sm">
<span class="glyphicon glyphicon-pencil"></span>
[{oxmultilang ident="D3WEBAUTHN_DELETE"}]
</a>
</li>
[{/foreach}]
</ul>
[{else}]
[{assign var="list" value=$oView->getCredentialList($oxid)}]
[{if $list|@count}]
<ul class="list-group list-group-flush list-unstyled">
[{foreach from=$list item="credential"}]
<li class="list-group-item" style="line-height: 2em; background: none">
[{$credential->getName()}]
<a onclick="deleteItem('[{$credential->getId()}]'); return false;" href="#" class="btn btn-danger btn-sm float-right">
<span class="glyphicon glyphicon-pencil"></span>
[{oxmultilang ident="D3WEBAUTHN_DELETE"}]
</a>
</li>
[{/foreach}]
</ul>
[{else}]
<div class="card-body">
<div class="card-text">
[{oxmultilang ident="D3WEBAUTHN_CANCELNOKEYREGISTERED"}]
</div>
[{/if}]
</div>
</div>
[{/if}]
[{/block}]
</div>
</div>

View File

@ -28,15 +28,18 @@
[{if $pageType === 'requestnew'}]
<div class="container-fluid">
<div class="row justify-content-center">
<div class="col-6">
<div class="[{*wave*}]col-6[{*/wave*}] [{*flow*}]col-xs-6 col-xs-offset-3[{*/flow*}]">
[{include file="js_create.tpl"}]
<div class="card">
<div class="card-body">
<p class="card-text">
<div class="[{*wave*}]card[{*/wave*}] [{*flow*}]panel panel-default[{*/flow*}]">
<div class="[{*wave*}]card-header[{*/wave*}] [{*flow*}]panel-heading[{*/flow*}]">
[{oxmultilang ident="D3_WEBAUTHN_CONFIRMATION"}]
</div>
<div class="[{*wave*}]card-body[{*/wave*}] [{*flow*}]panel-body[{*/flow*}]">
<p class="[{*wave*}]card-text[{*/wave*}]">
[{oxmultilang ident="D3_WEBAUTHN_CONF_BROWSER_REQUEST"}]
</p>
<button onclick="document.getElementById('webauthn').submit();">[{oxmultilang ident="D3_WEBAUTHN_CANCEL"}]</button>
<button onclick="document.getElementById('webauthn').submit();" class="btn btn-danger btn-sm [{*wave*}]float-right[{*/wave*}] [{*flow*}]pull-right[{*/flow*}]">[{oxmultilang ident="D3_WEBAUTHN_CANCEL"}]</button>
</div>
</div>
@ -59,25 +62,25 @@
<div class="container-fluid">
<div class="row">
<div class="col-12 col-lg-6 contentbox">
<div class="card">
<div class="[{*wave*}]col-12[{*/wave*}] [{*flow*}]col-xs-12[{*/flow*}] col-lg-6 contentbox">
<div class="[{*wave*}]card[{*/wave*}] [{*flow*}]panel panel-default[{*/flow*}]">
[{block name="user_d3user_totp_registernew"}]
<div class="card-header">
<div class="[{*wave*}]card-header[{*/wave*}] [{*flow*}]panel-heading[{*/flow*}]">
[{oxmultilang ident="D3_WEBAUTHN_ACC_REGISTERNEW"}]
</div>
<div class="card-body">
<div class="[{*wave*}]card-body[{*/wave*}] [{*flow*}]panel-body[{*/flow*}]">
<form name="newcred" id="newcred" action="[{$oViewConf->getSelfLink()}]" method="post">
[{$oViewConf->getHiddenSid()}]
<input type="hidden" name="cl" value="[{$oView->getClassName()}]">
<input type="hidden" name="fnc" value="requestNewCredential">
<input type="hidden" name="oxid" value="[{$oxid}]">
[{block name="user_d3user_totp_registerform"}]
<label for="credentialname">[{oxmultilang ident="D3_WEBAUTHN_KEYNAME"}]</label>
<p class="card-text">
<p class="[{*wave*}]card-text[{*/wave*}]">
<label for="credentialname">[{oxmultilang ident="D3_WEBAUTHN_KEYNAME" suffix="COLON"}]</label>
<input id="credentialname" type="text" name="credenialname" [{$readonly}]>
</p>
<p class="card-text">
<button type="submit" [{$readonly}] class="btn btn-primary btn-success">
<p class="[{*wave*}]card-text[{*/wave*}]">
<button type="submit" [{$readonly}] class="btn btn-primary btn-success btn-sm">
[{oxmultilang ident="D3_WEBAUTHN_ACC_ADDKEY"}]
</button>
</p>
@ -88,31 +91,31 @@
</div>
</div>
<div class="col-12 col-lg-6 contentbox">
<div class="card">
<div class="[{*wave*}]card[{*/wave*}] [{*flow*}]panel panel-default[{*/flow*}]">
[{block name="user_d3user_totp_form2"}]
<div class="card-header">
<div class="[{*wave*}]card-header[{*/wave*}] [{*flow*}]panel-heading[{*/flow*}]">
[{oxmultilang ident="D3_WEBAUTHN_ACC_REGISTEREDKEYS"}]
</div>
<div class="card-body">
[{assign var="list" value=$oView->getCredentialList()}]
[{if $list|@count}]
<ul class="list-group list-group-flush">
[{foreach from=$list item="credential"}]
<li class="list-group-item">
[{$credential->getName()}]
<a onclick="deleteItem('[{$credential->getId()}]'); return false;" href="#" class="btn btn-danger btn-sm">
<span class="glyphicon glyphicon-pencil"></span>
[{oxmultilang ident="D3_WEBAUTHN_DELETE"}]
</a>
</li>
[{/foreach}]
</ul>
[{else}]
<div class="card-text">
[{assign var="list" value=$oView->getCredentialList()}]
[{if $list|@count}]
<ul class="list-group list-group-flush">
[{foreach from=$list item="credential"}]
<li class="list-group-item" style="line-height: 2em">
[{$credential->getName()}]
<a onclick="deleteItem('[{$credential->getId()}]'); return false;" href="#" class="btn btn-danger btn-sm [{*wave*}]float-right[{*/wave*}] [{*flow*}]pull-right[{*/flow*}]">
<span class="glyphicon glyphicon-pencil"></span>
[{oxmultilang ident="D3_WEBAUTHN_DELETE"}]
</a>
</li>
[{/foreach}]
</ul>
[{else}]
<div class="[{*wave*}]card-body[{*/wave*}] [{*flow*}]panel-body[{*/flow*}]">
<div class="[{*wave*}]card-text[{*/wave*}]">
[{oxmultilang ident="D3_WEBAUTHN_NOKEYREGISTERED"}]
</div>
[{/if}]
</div>
</div>
[{/if}]
[{/block}]
</div>
</div>

View File

@ -28,7 +28,7 @@
<input type="hidden" name="cl" value="[{$oView->getPreviousClass()}]">
[{$navFormParams}]
<button class="btn btn_cancel btn-outline-danger" type="submit">
<button class="btn btn_cancel btn-outline-danger btn-sm" type="submit">
[{oxmultilang ident="WEBAUTHN_CANCEL_LOGIN"}]
</button>
</form>

View File

@ -210,8 +210,8 @@ class Events
private static function createSeoUrl()
{
$query = "INSERT INTO `oxseo` (`OXOBJECTID`, `OXIDENT`, `OXSHOPID`, `OXLANG`, `OXSTDURL`, `OXSEOURL`, `OXTYPE`, `OXFIXED`, `OXEXPIRED`, `OXPARAMS`, `OXTIMESTAMP`) VALUES
('ff57646b47249ee33c6b672741ac371a', 'be07f06fe03a4d5d7936f2eac5e3a87b', 1, 1, 'index.php?cl=d3_account_webauthn', 'en/key-authintication/', 'static', 0, 0, '', NOW()),
('ff57646b47249ee33c6b672741ac371a', '220a1af77362196789eeed4741dda184', 1, 0, 'index.php?cl=d3_account_webauthn', 'key-authentisierung/', 'static', 0, 0, '', NOW());";
('ff57646b47249ee33c6b672741ac371a', 'be07f06fe03a4d5d7936f2eac5e3a87b', 1, 1, 'index.php?cl=d3_account_webauthn', 'en/key-authentication/', 'static', 0, 0, '', NOW()),
('ff57646b47249ee33c6b672741ac371a', '220a1af77362196789eeed4741dda184', 1, 0, 'index.php?cl=d3_account_webauthn', 'sicherheitsschluessel/', 'static', 0, 0, '', NOW());";
DatabaseProvider::getDb()->execute($query);
}