This commit is contained in:
Dennis Eichhorn 2024-01-02 23:34:17 +00:00
parent 0d75e685da
commit cdccf946a7
22 changed files with 62 additions and 73 deletions

View File

@ -45,10 +45,10 @@ echo $this->data['nav']->render();
<div id="iSettings" class="tabview tab-2 url-rewrite"> <div id="iSettings" class="tabview tab-2 url-rewrite">
<div class="box"> <div class="box">
<ul class="tab-links"> <ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li> <li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label>
<li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label></li> <li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label>
<li><label for="c-tab-3"><?= $this->getHtml('Design'); ?></label></li> <li><label for="c-tab-3"><?= $this->getHtml('Design'); ?></label>
<li><label for="c-tab-5"><?= $this->getHtml('Settings'); ?></label></li> <li><label for="c-tab-5"><?= $this->getHtml('Settings'); ?></label>
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
@ -103,7 +103,7 @@ echo $this->data['nav']->render();
<i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="g-icon">info</i></i> <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="g-icon">info</i></i>
</label> </label>
<input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}"> <input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
</div> </div>
<div class="form-group"> <div class="form-group">
@ -167,7 +167,7 @@ echo $this->data['nav']->render();
<div class="form-group"> <div class="form-group">
<label for="iLogPath"><?= $this->getHtml('LogPath'); ?></label> <label for="iLogPath"><?= $this->getHtml('LogPath'); ?></label>
<input id="iLogPath" name="settings_1000000007" type="text" value="<?= $this->printHtml($generalSettings['1000000007']->content); ?>" placeholder="&#xf040; /Logs"> <input id="iLogPath" name="settings_1000000007" type="text" value="<?= $this->printHtml($generalSettings['1000000007']->content); ?>" placeholder="/Logs">
</div> </div>
</div> </div>
<div class="portlet-foot"> <div class="portlet-foot">

View File

@ -954,7 +954,7 @@ final class ApiController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response
@ -3076,7 +3076,7 @@ final class ApiController extends Controller
} }
/** /**
* Routing end-point for application behaviour. * Routing end-point for application behavior.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param ResponseAbstract $response Response * @param ResponseAbstract $response Response

View File

@ -533,10 +533,6 @@ final class BackendController extends Controller
*/ */
public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface public function viewModuleList(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
{ {
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->data['Content']->head;
$head->addAsset(AssetType::CSS, 'Modules/Admin/Theme/Backend/css/styles.css?v=1.0.0');
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Admin/Theme/Backend/modules-list'); $view->setTemplate('/Modules/Admin/Theme/Backend/modules-list');

View File

@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;
/** /**
* Permision state enum. * Permission category enum.
* *
* @package Modules\Admin\Models * @package Modules\Admin\Models
* @license OMS License 2.0 * @license OMS License 2.0

View File

@ -17,7 +17,7 @@ namespace Modules\Admin\Models;
use phpOMS\Stdlib\Base\Enum; use phpOMS\Stdlib\Base\Enum;
/** /**
* Permision state enum. * Permission category enum.
* *
* @package Modules\Admin\Models * @package Modules\Admin\Models
* @license OMS License 2.0 * @license OMS License 2.0

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Karaka * Jingga
* *
* PHP Version 8.1 * PHP Version 8.1
* *
@ -41,7 +41,7 @@ $categories = ISO639Enum::getConstants();
] ]
} }
]'><i class="g-icon">book</i></button> ]'><i class="g-icon">book</i></button>
<input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="&#xf007; Guest" data-action='[ <input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="Guest" data-action='[
{ {
"key": 1, "listener": "keyup", "action": [ "key": 1, "listener": "keyup", "action": [
{"key": 1, "type": "validate.keypress", "pressed": "!13!37!38!39!40"}, {"key": 1, "type": "validate.keypress", "pressed": "!13!37!38!39!40"},
@ -196,7 +196,7 @@ $categories = ISO639Enum::getConstants();
<section class="portlet"> <section class="portlet">
<div class="portlet-head"><?= $this->getHtml('Permissions', 'Admin', 'Backend'); ?><i class="g-icon download btn end-xs">download</i></div> <div class="portlet-head"><?= $this->getHtml('Permissions', 'Admin', 'Backend'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider"> <div class="slider">
<table id="attributeTable" class="default" <table id="attributeTable" class="default sticky"
data-tag="form" data-tag="form"
data-ui-element="tr" data-ui-element="tr"
data-add-tpl=".oms-add-tpl-attribute" data-add-tpl=".oms-add-tpl-attribute"

View File

@ -13,7 +13,7 @@
] ]
} }
]'><i class="g-icon">book</i></button> ]'><i class="g-icon">book</i></button>
<input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="&#xf007; Guest" data-action='[ <input type="text" list="<?= $this->id; ?>-datalist" id="<?= $this->id; ?>" name="receiver" placeholder="Guest" data-action='[
{ {
"key": 1, "listener": "keyup", "action": [ "key": 1, "listener": "keyup", "action": [
{"key": 1, "type": "validate.keypress", "pressed": "!13!37!38!39!40"}, {"key": 1, "type": "validate.keypress", "pressed": "!13!37!38!39!40"},

View File

@ -188,7 +188,7 @@ return ['Admin' => [
'Zip' => 'Zip.', 'Zip' => 'Zip.',
'active' => '', 'active' => '',
'available' => '', 'available' => '',
'i:LoginRetries' => 'Mængden af tilladte retries (-1 = ubegrænset)', 'i:LoginRetries' => "Mængden af \u{200b}\u{200b}tilladte retries (-1 = ubegrænset)",
'i:PasswordChangeInterval' => 'Interval, hvor passager skal ændres (-1 = aldrig)', 'i:PasswordChangeInterval' => 'Interval, hvor passager skal ændres (-1 = aldrig)',
'i:PasswordHistory' => 'Ny adgangskode skal være forskellig fra de sidste N-adgangskoder', 'i:PasswordHistory' => 'Ny adgangskode skal være forskellig fra de sidste N-adgangskoder',
'i:PasswordRegex' => 'Adgangskode krav til brugere', 'i:PasswordRegex' => 'Adgangskode krav til brugere',

View File

@ -62,11 +62,11 @@ echo $this->data['nav']->render(); ?>
<div id="iaccount-tabs" class="tabview tab-2 url-rewrite"> <div id="iaccount-tabs" class="tabview tab-2 url-rewrite">
<div class="box"> <div class="box">
<ul class="tab-links"> <ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li> <li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label>
<li><label for="c-tab-2"><?= $this->getHtml('Groups'); ?></label></li> <li><label for="c-tab-2"><?= $this->getHtml('Groups'); ?></label>
<li><label for="c-tab-3"><?= $this->getHtml('Permissions'); ?></label></li> <li><label for="c-tab-3"><?= $this->getHtml('Permissions'); ?></label>
<li><label for="c-tab-4"><?= $this->getHtml('Localization'); ?></label></li> <li><label for="c-tab-4"><?= $this->getHtml('Localization'); ?></label>
<li><label for="c-tab-5"><?= $this->getHtml('AuditLog'); ?></label></li> <li><label for="c-tab-5"><?= $this->getHtml('AuditLog'); ?></label>
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
@ -189,7 +189,7 @@ echo $this->data['nav']->render(); ?>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Groups'); ?><i class="g-icon download btn end-xs">download</i></div> <div class="portlet-head"><?= $this->getHtml('Groups'); ?><i class="g-icon download btn end-xs">download</i></div>
<table id="groupTable" class="default"> <table id="groupTable" class="default sticky">
<thead> <thead>
<tr> <tr>
<td> <td>
@ -333,7 +333,7 @@ echo $this->data['nav']->render(); ?>
<div class="portlet"> <div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div> <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider"> <div class="slider">
<table id="permissionTable" class="default" <table id="permissionTable" class="default sticky"
data-tag="form" data-tag="form"
data-ui-element="tr" data-ui-element="tr"
data-add-tpl=".oms-add-tpl-permission" data-add-tpl=".oms-add-tpl-permission"

View File

@ -38,10 +38,10 @@ echo $this->data['nav']->render(); ?>
<div id="igroup-tabs" class="tabview tab-2 url-rewrite"> <div id="igroup-tabs" class="tabview tab-2 url-rewrite">
<div class="box"> <div class="box">
<ul class="tab-links"> <ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li> <li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label>
<li><label for="c-tab-2"><?= $this->getHtml('Accounts'); ?></label></li> <li><label for="c-tab-2"><?= $this->getHtml('Accounts'); ?></label>
<li><label for="c-tab-3"><?= $this->getHtml('Permissions'); ?></label></li> <li><label for="c-tab-3"><?= $this->getHtml('Permissions'); ?></label>
<li><label for="c-tab-4"><?= $this->getHtml('AuditLog'); ?></label></li> <li><label for="c-tab-4"><?= $this->getHtml('AuditLog'); ?></label>
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
@ -59,7 +59,7 @@ echo $this->data['nav']->render(); ?>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iGname"><?= $this->getHtml('Name'); ?></label> <label for="iGname"><?= $this->getHtml('Name'); ?></label>
<input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" placeholder="&#xf0c0; Guest" value="<?= $this->printHtml($group->name); ?>"> <input id="iGname" name="name" type="text" spellcheck="false" autocomplete="off" placeholder="Guest" value="<?= $this->printHtml($group->name); ?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="iGstatus"><?= $this->getHtml('Status'); ?></label> <label for="iGstatus"><?= $this->getHtml('Status'); ?></label>
@ -117,7 +117,7 @@ echo $this->data['nav']->render(); ?>
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Accounts'); ?><i class="g-icon download btn end-xs">download</i></div> <div class="portlet-head"><?= $this->getHtml('Accounts'); ?><i class="g-icon download btn end-xs">download</i></div>
<table id="accountTable" class="default" <table id="accountTable" class="default sticky"
data-tag="form" data-tag="form"
data-ui-element="tr" data-ui-element="tr"
data-add-tpl=".oms-add-tpl-account" data-add-tpl=".oms-add-tpl-account"
@ -282,7 +282,7 @@ echo $this->data['nav']->render(); ?>
<div class="portlet"> <div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div> <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider"> <div class="slider">
<table id="permissionTable" class="default" <table id="permissionTable" class="default sticky"
data-tag="form" data-tag="form"
data-ui-element="tr" data-ui-element="tr"
data-add-tpl=".oms-add-tpl-permission" data-add-tpl=".oms-add-tpl-permission"

View File

@ -48,9 +48,6 @@ if (isset($installed[$id])) {
<tr> <tr>
<td><?= $this->getHtml('Website'); ?> <td><?= $this->getHtml('Website'); ?>
<td><?= $this->printHtml($modules[$id]->get()['creator']['website']); ?> <td><?= $this->printHtml($modules[$id]->get()['creator']['website']); ?>
<tr>
<td><?= $this->getHtml('Description'); ?>
<td><?= $this->printHtml($modules[$id]->get()['description']); ?>
</table> </table>
</div> </div>
<div class="portlet-foot"> <div class="portlet-foot">

View File

@ -29,7 +29,6 @@ $tableView->baseUri = 'admin/module/list';
$tableView->exportUri = '{/api}admin/module/list/export'; $tableView->exportUri = '{/api}admin/module/list/export';
$tableView->setObjects($modules); $tableView->setObjects($modules);
?> ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <div class="portlet">

View File

@ -31,7 +31,7 @@ echo $this->data['nav']->render();
<div class="portlet"> <div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div> <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
<div class="slider"> <div class="slider">
<table class="default"> <table class="default sticky">
<colgroup> <colgroup>
<col style="width: 75px"> <col style="width: 75px">
<col style="width: 150px"> <col style="width: 150px">

View File

@ -43,10 +43,10 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<div class="tabview tab-2 url-rewrite"> <div class="tabview tab-2 url-rewrite">
<div class="box"> <div class="box">
<ul class="tab-links"> <ul class="tab-links">
<li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label></li> <li><label for="c-tab-1"><?= $this->getHtml('General'); ?></label>
<li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label></li> <li><label for="c-tab-2"><?= $this->getHtml('Localization'); ?></label>
<li><label for="c-tab-3"><?= $this->getHtml('Settings'); ?></label></li> <li><label for="c-tab-3"><?= $this->getHtml('Settings'); ?></label>
<li><label for="c-tab-4"><?= $this->getHtml('Design'); ?></label></li> <li><label for="c-tab-4"><?= $this->getHtml('Design'); ?></label>
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
@ -82,7 +82,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="g-icon">info</i></i> <i class="tooltip" data-tooltip="<?= $this->getHtml('i:PasswordRegex'); ?>"><i class="g-icon">info</i></i>
</label> </label>
<input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="&#xf023; ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}"> <input id="iPassword" name="settings_1000000001" type="text" value="<?= $this->printHtml($generalSettings['1000000001']->content); ?>" placeholder="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&;:\(\)\[\]=\{\}\+\-])[A-Za-z\d$@$!%*?&;:\(\)\[\]=\{\}\+\-]{8,}">
</div> </div>
<div class="form-group"> <div class="form-group">
@ -146,7 +146,7 @@ $l11n = $this->getData('defaultlocalization') ?? new NullLocalization();
<div class="form-group"> <div class="form-group">
<label for="iLogPath"><?= $this->getHtml('LogPath'); ?></label> <label for="iLogPath"><?= $this->getHtml('LogPath'); ?></label>
<input id="iLogPath" name="settings_1000000007" type="text" value="<?= $this->printHtml($generalSettings['1000000007']->content); ?>" placeholder="&#xf040; /Logs"> <input id="iLogPath" name="settings_1000000007" type="text" value="<?= $this->printHtml($generalSettings['1000000007']->content); ?>" placeholder="/Logs">
</div> </div>
</div> </div>
<div class="portlet-foot"> <div class="portlet-foot">

View File

@ -1,4 +1,4 @@
<?php <?php declare(strict_types=1);
echo 'Use "/admin/encryption/change -old {old_hash} -new {new_hash}" to change the encryption' echo 'Use "/admin/encryption/change -old {old_hash} -new {new_hash}" to change the encryption'
, "\n\n" , "\n\n"

View File

@ -14,7 +14,6 @@
"name": "Jingga", "name": "Jingga",
"website": "jingga.app" "website": "jingga.app"
}, },
"description": "The administration module.",
"directory": "Admin", "directory": "Admin",
"dependencies": {}, "dependencies": {},
"providing": { "providing": {

View File

@ -4,7 +4,7 @@
* *
* PHP Version 8.1 * PHP Version 8.1
* *
* @package Karaka * @package Jingga
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 2.0 * @license OMS License 2.0
* @version 1.0.0 * @version 1.0.0

View File

@ -15,8 +15,6 @@ declare(strict_types=1);
namespace Modules\Admin\tests\Models; namespace Modules\Admin\tests\Models;
use Modules\Admin\Models\DataChange; use Modules\Admin\Models\DataChange;
use phpOMS\Application\ApplicationStatus;
use phpOMS\Application\ApplicationType;
/** /**
* @testdox Modules\Admin\tests\Models\DataChangeTest: DataChange model * @testdox Modules\Admin\tests\Models\DataChangeTest: DataChange model