D3Public
/
webauthn
8
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Application/translations/de/d3webauthn_lang.php
View File

@ -18,7 +18,8 @@ $aLang = array(
'WEBAUTHN_INPUT_HELP' => 'Bitte mit Hardwareschlüssel authentisieren.', 'WEBAUTHN_INPUT_HELP' => 'Bitte mit Hardwareschlüssel authentisieren.',
'WEBAUTHN_CANCEL_LOGIN' => 'Anmeldung abbrechen', 'WEBAUTHN_CANCEL_LOGIN' => 'Anmeldung abbrechen',
'D3_WEBAUTHN_BREADCRUMB' => 'Passwortloses Anmelden', '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_CANCEL' => 'Abbrechen',
'D3_WEBAUTHN_DELETE' => 'Löschen', 'D3_WEBAUTHN_DELETE' => 'Löschen',
'D3_WEBAUTHN_DELETE_CONFIRM' => 'Soll der Schlüssel wirklich gelöscht werden?', 'D3_WEBAUTHN_DELETE_CONFIRM' => 'Soll der Schlüssel wirklich gelöscht werden?',

42
src/Application/views/admin/tpl/d3user_webauthn.tpl
View File

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

69
src/Application/views/tpl/d3_account_webauthn.tpl
View File

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

2
src/Application/views/tpl/d3webauthnlogin.tpl
View File

@ -28,7 +28,7 @@
<input type="hidden" name="cl" value="[{$oView->getPreviousClass()}]"> <input type="hidden" name="cl" value="[{$oView->getPreviousClass()}]">
[{$navFormParams}] [{$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"}] [{oxmultilang ident="WEBAUTHN_CANCEL_LOGIN"}]
</button> </button>
</form> </form>

4
src/Setup/Events.php
View File

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