more CSS / server (still WIP)

This commit is contained in:
Christine Slotty 2020-06-11 18:26:35 +02:00
parent 733ac5cbcc
commit fbed22c08f
42 changed files with 457 additions and 269 deletions

View File

@ -274,6 +274,8 @@ class AppController extends Controller
} }
if(isset($returnTable['details'])) { if(isset($returnTable['details'])) {
$adminErrorEntity->details = $returnTable['details']; $adminErrorEntity->details = $returnTable['details'];
} else {
$adminErrorEntity->details = __('(Leere Details)');
} }
if(!$adminErrorTable->save($adminErrorEntity)) { if(!$adminErrorTable->save($adminErrorEntity)) {
$this->Flash->error(__('Serious error, couldn\'t save to db, please write the admin: ' . $this->getAdminEmailLink())); $this->Flash->error(__('Serious error, couldn\'t save to db, please write the admin: ' . $this->getAdminEmailLink()));

View File

@ -40,8 +40,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -12,44 +12,41 @@
<li><?= $this->Html->link(__('New State User'), ['controller' => 'StateUsers', 'action' => 'add']) ?></li> <li><?= $this->Html->link(__('New State User'), ['controller' => 'StateUsers', 'action' => 'add']) ?></li>
</ul> </ul>
</nav> </nav>
<div class="adminErrors index large-9 medium-8 columns content"> <div class="content-list">
<h3><?= __('Admin Errors') ?></h3> <div class="content-list-table">
<table cellpadding="0" cellspacing="0"> <div class="row">
<thead> <div class="cell cell-dense header-cell centered c1"><?= $this->Paginator->sort('id') ?></div>
<tr> <div class="cell cell-dense header-cell c1"><?= $this->Paginator->sort('state_user_id') ?></div>
<th scope="col"><?= $this->Paginator->sort('id') ?></th> <div class="cell cell-dense header-cell c4"><?= $this->Paginator->sort('controller') ?></div>
<th scope="col"><?= $this->Paginator->sort('state_user_id') ?></th> <div class="cell cell-dense header-cell c2"><?= $this->Paginator->sort('action') ?></div>
<th scope="col"><?= $this->Paginator->sort('controller') ?></th> <div class="cell cell-dense header-cell c2"><?= $this->Paginator->sort('state') ?></div>
<th scope="col"><?= $this->Paginator->sort('action') ?></th> <div class="cell cell-dense header-cell c0"><?= $this->Paginator->sort('msg') ?></div>
<th scope="col"><?= $this->Paginator->sort('state') ?></th> <div class="cell cell-dense header-cell c3"><?= $this->Paginator->sort('details') ?></div>
<th scope="col"><?= $this->Paginator->sort('msg') ?></th> <div class="cell cell-dense header-cell c3"><?= $this->Paginator->sort('created') ?></div>
<th scope="col"><?= $this->Paginator->sort('details') ?></th> <div class="cell cell-dense header-cell c3"><?= __('Actions') ?></div>
<th scope="col"><?= $this->Paginator->sort('created') ?></th> </div>
<th scope="col" class="actions"><?= __('Actions') ?></th> <?php foreach ($adminErrors as $adminError): ?>
</tr> <div class="row">
</thead> <div class="cell cell-dense centered c1"><?= $this->Number->format($adminError->id) ?></div>
<tbody> <div class="cell cell-dense c1"><?= $adminError->has('state_user') ? $this->Html->link($adminError->state_user->id, ['controller' => 'StateUsers', 'action' => 'view', $adminError->state_user->id]) : '' ?></div>
<?php foreach ($adminErrors as $adminError): ?> <div class="cell cell-dense c4"><?= h($adminError->controller) ?></div>
<tr> <div class="cell cell-dense c2"><?= h($adminError->action) ?></div>
<td><?= $this->Number->format($adminError->id) ?></td> <div class="cell cell-dense c2"><?= h($adminError->state) ?></div>
<td><?= $adminError->has('state_user') ? $this->Html->link($adminError->state_user->id, ['controller' => 'StateUsers', 'action' => 'view', $adminError->state_user->id]) : '' ?></td> <div class="cell cell-dense c0"><?= h($adminError->msg) ?></div>
<td><?= h($adminError->controller) ?></td> <div class="cell cell-dense c3"><?= h($adminError->details) ?></div>
<td><?= h($adminError->action) ?></td> <div class="cell cell-dense c3"><?= h($adminError->created) ?></div>
<td><?= h($adminError->state) ?></td> <div class="cell cell-dense c3">
<td><?= h($adminError->msg) ?></td> <?= $this->Html->link(__('View'), ['action' => 'view', $adminError->id]) ?>
<td><?= h($adminError->details) ?></td> &nbsp;
<td><?= h($adminError->created) ?></td> <?= $this->Html->link(__('Edit'), ['action' => 'edit', $adminError->id]) ?>
<td class="actions"> &nbsp;
<?= $this->Html->link(__('View'), ['action' => 'view', $adminError->id]) ?> <?= $this->Form->postLink(__('Delete'), ['action' => 'delete', $adminError->id], ['confirm' => __('Are you sure you want to delete # {0}?', $adminError->id)]) ?>
<?= $this->Html->link(__('Edit'), ['action' => 'edit', $adminError->id]) ?> </div>
<?= $this->Form->postLink(__('Delete'), ['action' => 'delete', $adminError->id], ['confirm' => __('Are you sure you want to delete # {0}?', $adminError->id)]) ?> </div>
</td> <?php endforeach; ?>
</tr> </div>
<?php endforeach; ?> <div>
</tbody> <ul class="nav-horizontal">
</table>
<div class="paginator">
<ul class="pagination">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -53,6 +53,7 @@ $this->assign(
<div class="content-collection"> <div class="content-collection">
<div class="content-item action-button"> <div class="content-item action-button">
<i class="material-icons-outlined">redeem</i> <i class="material-icons-outlined">redeem</i>
<!-- insights / redeem -->
<?= $this->Html->link( <?= $this->Html->link(
__('viele schöpfen'), __('viele schöpfen'),
['controller' => 'TransactionCreations', 'action' => 'createMulti'], ['controller' => 'TransactionCreations', 'action' => 'createMulti'],

View File

@ -1,5 +1,5 @@
<?php <?php
$class = 'alert-primary'; $class = '';
if (!empty($params['class'])) { if (!empty($params['class'])) {
$class .= ' ' . $params['class']; $class .= ' ' . $params['class'];
} }
@ -8,6 +8,6 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
} }
?> ?>
<!--<div class="<?= h($class) ?>" onclick="this.classList.add('hidden');"><?= $message ?></div>--> <!--<div class="<?= h($class) ?>" onclick="this.classList.add('hidden');"><?= $message ?></div>-->
<div class="alert <?= h($class) ?>" onclick="this.classList.add('hidden')" role="alert"> <div class="alert <?= h($class) ?>" role="alert">
<?= $message ?> <?= $message ?>
</div> </div>

View File

@ -4,6 +4,7 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
} }
?> ?>
<!--<div class="message error" onclick="this.classList.add('hidden');"><?= $message ?></div>--> <!--<div class="message error" onclick="this.classList.add('hidden');"><?= $message ?></div>-->
<div class="alert alert-danger" role="alert" onclick="this.classList.add('hidden');"> <div class="alert alert-error" role="alert">
<i class="mdi mdi-alert-outline alert-color mdi-2x"></i> <?= $message ?> <i class="material-icons-outlined">report_problem</i>
<span><?= $message ?></span>
</div> </div>

View File

@ -5,6 +5,6 @@ if (!isset($params['escape']) || $params['escape'] !== false) {
?> ?>
<!--<div class="message success" onclick="this.classList.add('hidden')"><?= $message ?></div>--> <!--<div class="message success" onclick="this.classList.add('hidden')"><?= $message ?></div>-->
<div class="alert alert-success" onclick="this.classList.add('hidden')" role="alert"> <div class="alert alert-success" role="alert">
<b><?= __('Info:') ?></b> <?= $message ?> <b><?= __('Info:') ?></b> <?= $message ?>
</div> </div>

View File

@ -54,8 +54,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -33,21 +33,21 @@ $cakeDescription = 'Gradido';
</head> </head>
<body> <body>
<div class="content-default"> <div class="content-default">
<div class="content-container info-container"> <div class="content-container default-container">
<ul class="nav-horizontal nav-top-smaller"> <ul class="nav-horizontal nav-top-smaller">
<li><?= $this->html->link(__('Logout'), ['controller' => 'ServerUsers', 'action' => 'logout'])?></li> <li><?= $this->html->link(__('Logout'), ['controller' => 'ServerUsers', 'action' => 'logout'])?></li>
<li><a target="_blank" href="https://book.cakephp.org/3.0/">Documentation</a></li> <li><a target="_blank" href="https://book.cakephp.org/3.0/">Documentation</a></li>
<li><a target="_blank" href="https://api.cakephp.org/3.0/">API</a></li> <li><a target="_blank" href="https://api.cakephp.org/3.0/">API</a></li>
</ul> </ul>
<h1><a href=""><?= $this->fetch('title') ?></a></h1> <h1><a href=""><?= $this->fetch('title') ?></a></h1>
<?= $this->Flash->render() ?> <?= $this->Flash->render() ?>
<?= $this->fetch('content') ?> <?= $this->fetch('content') ?>
</div> </div>
<?php if(isset($timeUsed)) : ?>
<div class="bottomleft">
<?= round($timeUsed * 1000.0, 4) ?> ms
</div>
<?php endif;?>
</div> </div>
<?php if(isset($timeUsed)) : ?>
<div class="bottomleft">
<?= round($timeUsed * 1000.0, 4) ?> ms
</div>
<?php endif;?>
</body> </body>
</html> </html>

View File

@ -57,11 +57,6 @@ $GLOBALS["self"] = $this;
<div> <div>
<i class="material-icons-outlined nav-main-button">menu</i> <i class="material-icons-outlined nav-main-button">menu</i>
</div> </div>
<!-- XXX -->
<div class="flash-messages">
<?= $this->Flash->render() ?>
</div>
<!-- XXX -->
<div class="nav-vertical"> <div class="nav-vertical">
<ul> <ul>
<?= $this->element('navi'); ?> <?= $this->element('navi'); ?>
@ -70,6 +65,9 @@ $GLOBALS["self"] = $this;
</div> </div>
<div class="content"> <div class="content">
<div class="nav-content"> <div class="nav-content">
<div class="flash-messages" onclick="this.classList.add('hidden')">
<?= $this->Flash->render() ?>
</div>
<?= $this->element('navi_center'); ?> <?= $this->element('navi_center'); ?>
</div> </div>
<?php if ($this->fetch('header')): ?> <?php if ($this->fetch('header')): ?>

View File

@ -38,8 +38,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -43,8 +43,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -46,8 +46,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -41,8 +41,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -30,9 +30,9 @@ $this->assign('header', $header);
<div class="row"> <div class="row">
<div class="cell header-cell c4"><?= __('Absender') . ' / ' . ('Empfänger') ?></div> <div class="cell header-cell c4"><?= __('Absender') . ' / ' . ('Empfänger') ?></div>
<div class="cell header-cell c0"><?= __('Verwendungszweck') ?></div> <div class="cell header-cell c0"><?= __('Verwendungszweck') ?></div>
<div class="cell header-cell c2"><?= __('Datum') ?></div> <div class="cell header-cell c4"><?= __('Datum') ?></div>
<div class="cell header-cell c2"><?= __('Betrag') ?></div> <div class="cell header-cell c3"><?= __('Betrag') ?></div>
<div class="cell header-cell c1" title="<?= __('Transaktions Nr.') ?>"><?= __('Nr') ?></div> <div class="cell header-cell c2" title="<?= __('Transaktions Nr.') ?>"><?= __('Nr') ?></div>
</div> </div>
<?php foreach($transactions as $transaction): <?php foreach($transactions as $transaction):
$send = $transaction['type'] == 'send'; $send = $transaction['type'] == 'send';
@ -60,18 +60,20 @@ $this->assign('header', $header);
<?php else : ?> <?php else : ?>
<small class="tx-email"><?= $transaction['name'] ?></small> <small class="tx-email"><?= $transaction['name'] ?></small>
<?php endif; ?> <?php endif; ?>
<span class=" <?= $cellColorClass ?>"> <!-- noch ungeklärt - icon ist nicht aligned -->
<div class="cell-icon <?= $cellColorClass ?>">
<?php if($transaction['type'] == 'creation') : ?> <?php if($transaction['type'] == 'creation') : ?>
<i class="material-icons-outlined orange-color">redeem</i> <i class="material-icons-outlined orange-color">redeem</i>
<!-- insights / redeem -->
<?= __('Geschöpft')?> <?= __('Geschöpft')?>
<?php elseif($transaction['type'] == 'send') : ?> <?php elseif($transaction['type'] == 'send') : ?>
<i class="material-icons-outlined">arrow_right_alt</i> <i class="material-icons-outlined">arrow_back</i>
<?= __('Gesendet') ?> <?= __('Gesendet') ?>
<?php elseif($transaction['type'] == 'receive') : ?> <?php elseif($transaction['type'] == 'receive') : ?>
<i class="material-icons-outlined">arrow_left_alt</i> <i class="material-icons-outlined">arrow_forward</i>
<?= __('Empfangen') ?> <?= __('Empfangen') ?>
<?php endif; ?> <?php endif; ?>
</span> </div>
</div> </div>
</div> </div>
<div class="cell c0" data-toggle="tooltip" data-placement="bottom" title="<?= $transaction['memo'] ?>"> <div class="cell c0" data-toggle="tooltip" data-placement="bottom" title="<?= $transaction['memo'] ?>">
@ -81,9 +83,9 @@ $this->assign('header', $header);
<?= $transaction['memo'] ?> <?= $transaction['memo'] ?>
<?php endif;?> <?php endif;?>
</div> </div>
<div class="cell c2"><?= $transaction['date']->nice() ?></div> <div class="cell c4"><?= $transaction['date']->nice() ?></div>
<div class="cell c2"><?= $this->element('printGradido', ['number' => $balance]) ?></div> <div class="cell c3"><?= $this->element('printGradido', ['number' => $balance]) ?></div>
<div class="cell c1"> <div class="cell c2">
<?= $transaction['transaction_id'] ?> <?= $transaction['transaction_id'] ?>
</div> </div>
</div> </div>

View File

@ -48,8 +48,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -42,8 +42,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -16,11 +16,13 @@ $this->assign('title', __('Fehlermeldungen'));
?> ?>
<div class="content-list"> <div class="content-list">
<p class="content-list-title">Fehler</p> <p class="content-list-title">Fehler</p>
<div class="content-list-table error-list"> <div class="content-list-table">
<span class="header-cell">Transaktion Typ</span> <div class="row">
<span class="header-cell">Datum</span> <div class="cell header-cell c2">Transaktion Typ</div>
<span class="header-cell">Fehler</span> <div class="cell header-cell c2">Datum</div>
<span class="header-cell">Aktionen</span> <div class="cell header-cell c0">Fehler</div>
<div class="cell header-cell c1">Aktionen</div>
</div>
<?php foreach($errors as $error) : <?php foreach($errors as $error) :
$type = $transactionTypes[$error->transaction_type_id-1]; $type = $transactionTypes[$error->transaction_type_id-1];
$errorMessage = ""; $errorMessage = "";
@ -33,10 +35,17 @@ $this->assign('title', __('Fehlermeldungen'));
$errorMessage = $error->message_json; $errorMessage = $error->message_json;
} }
?> ?>
<span title="<?= $type->text ?>"><?= $type->name ?></span> <div class="row">
<span><?= $error->created ?></span> <div class="cell c3" title="<?= $type->text ?>"><?= $type->name ?></div>
<span><?= $errorMessage ?></span> <div class="cell c3"><?= $error->created ?></div>
<span><?= $this->Html->link(__('Delete'), ['action' => 'deleteForUser', $error->id], ['class' => 'grd-form-bn grd-form-bn-discard']) ?></span> <div class="cell c0"><?= $errorMessage ?></div>
<div class="cell c2">
<?= $this->Html->link(
__('Delete'),
['action' => 'deleteForUser', $error->id],
['class' => 'form-button button-cancel']
) ?></div>
</div>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
</div> </div>

View File

@ -40,8 +40,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -38,8 +38,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -44,8 +44,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -36,8 +36,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -52,8 +52,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -4,7 +4,7 @@
* @var \App\Model\Entity\StateUser $stateUser * @var \App\Model\Entity\StateUser $stateUser
*/ */
?> ?>
<nav class="large-2 medium-3 columns" id="actions-sidebar"> <nav id="actions-sidebar">
<ul class="nav-horizontal nav-smaller"> <ul class="nav-horizontal nav-smaller">
<li class="heading"><?= __('Actions') ?></li> <li class="heading"><?= __('Actions') ?></li>
<li><?= $this->Html->link(__('Edit State User'), ['action' => 'edit', $stateUser->id]) ?> </li> <li><?= $this->Html->link(__('Edit State User'), ['action' => 'edit', $stateUser->id]) ?> </li>

View File

@ -42,8 +42,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -40,8 +40,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -40,8 +40,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -42,8 +42,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -43,8 +43,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -36,8 +36,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -38,8 +38,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -41,7 +41,7 @@
<div class="cell"><?= h($transaction->received) ?></div> <div class="cell"><?= h($transaction->received) ?></div>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
<div class="paginator"> <div>
<ul class="nav-horizontal pagination"> <ul class="nav-horizontal pagination">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>

View File

@ -46,8 +46,8 @@
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>
<div class="paginator"> <div>
<ul class="pagination"> <ul class="nav-horizontal">
<?= $this->Paginator->first('<< ' . __('first')) ?> <?= $this->Paginator->first('<< ' . __('first')) ?>
<?= $this->Paginator->prev('< ' . __('previous')) ?> <?= $this->Paginator->prev('< ' . __('previous')) ?>
<?= $this->Paginator->numbers() ?> <?= $this->Paginator->numbers() ?>

View File

@ -231,6 +231,72 @@
} }
} }
/* Ende @media screen */ /* Ende @media screen */
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/* ============================================================
Screen styles for flash messages.
Datei : messages.css
Datum : 30.10.2019, 16:04:16
Autor : einhornimmond, Christine Slotty
Copyright : Gradio
============================================================*/
@media screen {
.flash-messages {
width: 30%;
position: absolute;
top: 57px;
left: 241px;
text-align: center;
}
.flash-messages .alert {
margin: 0;
padding: 1em;
vertical-align: middle;
border-radius: 5px;
}
.flash-messages .alert-success {
color: #fff !important;
background-color: #047006;
border: 1px solid #04700675;
}
.flash-messages .alert-error {
color: #fff !important;
background-color: red;
border: 1px solid rgba(255, 0, 0, 0.5);
}
.flash-messages .message {
padding: 5px;
}
.flash-messages .success {
color: #047006;
}
.flash-messages .error {
color: red;
}
.flash-messages.hidden {
display: none;
}
/* messages, update flash */
.grd-error {
color: red;
border: 1px solid rgba(255, 0, 0, 0.5);
padding: 5px;
}
.grd-info {
border: 1px dotted gray;
padding: 5px;
}
.grd-success {
padding: 5px;
color: #047006;
}
}
/* ============================================================ /* ============================================================
Navigation Navigation
@ -494,6 +560,7 @@
padding-left: 0; padding-left: 0;
margin-bottom: 0; margin-bottom: 0;
list-style: none; list-style: none;
z-index: 10;
} }
.notify { .notify {
display: block; display: block;
@ -643,14 +710,14 @@
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 500; font-weight: 500;
font-size: 1rem; font-size: 1rem;
padding-top: 6em; /*padding-top: 2em;*/
padding-right: 10em; padding-right: 10em;
} }
/* Center Navigation Top */ /* Center Navigation Top */
.nav-content { .nav-content {
position: relative;
color: #565656; color: #565656;
margin: 0 0.25em; margin: 0 0.25em;
margin-bottom: 1em;
} }
.nav-content-list { .nav-content-list {
display: flex; display: flex;
@ -679,6 +746,11 @@
.main-container { .main-container {
width: 100%; width: 100%;
} }
.default-container {
width: 90%;
margin: auto;
padding: 1em;
}
/* Generic Content */ /* Generic Content */
.content-region { .content-region {
border-bottom: 1px dashed #F5F5F5; border-bottom: 1px dashed #F5F5F5;
@ -760,26 +832,37 @@
} }
.cell { .cell {
display: flex; display: flex;
flex-wrap: wrap;
align-items: center; align-items: center;
padding: 1em 1.5em; padding: 1em 1.5em;
} }
.cell-dense {
padding: 0.1em 0.5em;
}
.centered {
justify-content: center;
}
.c0 { .c0 {
flex-grow: 5; flex-grow: 5;
} }
.c1 { .c1 {
width: 80px; min-width: 40px;
flex: 0 0 80px; flex: 0 0 40px;
} }
.c2 { .c2 {
width: 160px; min-width: 80px;
flex: 0 0 160px; flex: 0 0 80px;
} }
.c3 { .c3 {
width: 240px; min-width: 160px;
flex: 0 0 240px; flex: 0 0 160px;
} }
.c4 { .c4 {
width: 320px; min-width: 240px;
flex: 0 0 240px;
}
.c5 {
min-width: 320px;
flex: 0 0 320px; flex: 0 0 320px;
} }
.header-cell { .header-cell {
@ -826,6 +909,13 @@
font-size: 80%; font-size: 80%;
font-weight: 400; font-weight: 400;
} }
/*,
.cell-icon .material-icons-outlined */
.cell-icon {
/*noch ungeklärt - icon ist nicht aligned */
/*font-size: 1.25em;*/
vertical-align: middle;
}
/* ===================================== /* =====================================
FORM TOP CONTENT (checkTransaction) FORM TOP CONTENT (checkTransaction)
=====================================*/ =====================================*/
@ -966,11 +1056,11 @@ and open the template in the editor.
box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2); box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
} }
.form-button:hover { .form-button:hover {
color: #fff;
background-color: #034b04; background-color: #034b04;
border-color: #023f03; border-color: #023f03;
} }
.button-cancel { .button-cancel {
color: #fff !important;
background-color: #f0825f; background-color: #f0825f;
border-color: #f0825f; border-color: #f0825f;
} }
@ -1182,35 +1272,3 @@ div.grd_modal-footer {
.grd_modal-footer button:hover { .grd_modal-footer button:hover {
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
} }
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 30.10.2019, 16:04:16
Author : einhornimmond
*/
/* messages, update flash */
.grd-error {
color: red;
border: 1px solid rgba(255, 0, 0, 0.5);
padding: 5px;
}
.grd-info {
border: 1px dotted gray;
padding: 5px;
}
.grd-success {
padding: 5px;
color: #047006;
}
.flash-messages .message {
padding: 5px;
}
.flash-messages .success {
color: #047006;
}
.flash-messages .error {
color: red;
}

View File

@ -231,6 +231,72 @@
} }
} }
/* Ende @media screen */ /* Ende @media screen */
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/* ============================================================
Screen styles for flash messages.
Datei : messages.css
Datum : 30.10.2019, 16:04:16
Autor : einhornimmond, Christine Slotty
Copyright : Gradio
============================================================*/
@media screen {
.flash-messages {
width: 30%;
position: absolute;
top: 57px;
left: 241px;
text-align: center;
}
.flash-messages .alert {
margin: 0;
padding: 1em;
vertical-align: middle;
border-radius: 5px;
}
.flash-messages .alert-success {
color: #fff !important;
background-color: #047006;
border: 1px solid #04700675;
}
.flash-messages .alert-error {
color: #fff !important;
background-color: red;
border: 1px solid rgba(255, 0, 0, 0.5);
}
.flash-messages .message {
padding: 5px;
}
.flash-messages .success {
color: #047006;
}
.flash-messages .error {
color: red;
}
.flash-messages.hidden {
display: none;
}
/* messages, update flash */
.grd-error {
color: red;
border: 1px solid rgba(255, 0, 0, 0.5);
padding: 5px;
}
.grd-info {
border: 1px dotted gray;
padding: 5px;
}
.grd-success {
padding: 5px;
color: #047006;
}
}
/* ============================================================ /* ============================================================
Navigation Navigation
@ -494,6 +560,7 @@
padding-left: 0; padding-left: 0;
margin-bottom: 0; margin-bottom: 0;
list-style: none; list-style: none;
z-index: 10;
} }
.notify { .notify {
display: block; display: block;
@ -643,14 +710,14 @@
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 500; font-weight: 500;
font-size: 1rem; font-size: 1rem;
padding-top: 6em; /*padding-top: 2em;*/
padding-right: 10em; padding-right: 10em;
} }
/* Center Navigation Top */ /* Center Navigation Top */
.nav-content { .nav-content {
position: relative;
color: #565656; color: #565656;
margin: 0 0.25em; margin: 0 0.25em;
margin-bottom: 1em;
} }
.nav-content-list { .nav-content-list {
display: flex; display: flex;
@ -679,6 +746,11 @@
.main-container { .main-container {
width: 100%; width: 100%;
} }
.default-container {
width: 90%;
margin: auto;
padding: 1em;
}
/* Generic Content */ /* Generic Content */
.content-region { .content-region {
border-bottom: 1px dashed #F5F5F5; border-bottom: 1px dashed #F5F5F5;
@ -760,26 +832,37 @@
} }
.cell { .cell {
display: flex; display: flex;
flex-wrap: wrap;
align-items: center; align-items: center;
padding: 1em 1.5em; padding: 1em 1.5em;
} }
.cell-dense {
padding: 0.1em 0.5em;
}
.centered {
justify-content: center;
}
.c0 { .c0 {
flex-grow: 5; flex-grow: 5;
} }
.c1 { .c1 {
width: 80px; min-width: 40px;
flex: 0 0 80px; flex: 0 0 40px;
} }
.c2 { .c2 {
width: 160px; min-width: 80px;
flex: 0 0 160px; flex: 0 0 80px;
} }
.c3 { .c3 {
width: 240px; min-width: 160px;
flex: 0 0 240px; flex: 0 0 160px;
} }
.c4 { .c4 {
width: 320px; min-width: 240px;
flex: 0 0 240px;
}
.c5 {
min-width: 320px;
flex: 0 0 320px; flex: 0 0 320px;
} }
.header-cell { .header-cell {
@ -826,6 +909,13 @@
font-size: 80%; font-size: 80%;
font-weight: 400; font-weight: 400;
} }
/*,
.cell-icon .material-icons-outlined */
.cell-icon {
/*noch ungeklärt - icon ist nicht aligned */
/*font-size: 1.25em;*/
vertical-align: middle;
}
/* ===================================== /* =====================================
FORM TOP CONTENT (checkTransaction) FORM TOP CONTENT (checkTransaction)
=====================================*/ =====================================*/
@ -966,11 +1056,11 @@ and open the template in the editor.
box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2); box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.2);
} }
.form-button:hover { .form-button:hover {
color: #fff;
background-color: #034b04; background-color: #034b04;
border-color: #023f03; border-color: #023f03;
} }
.button-cancel { .button-cancel {
color: #fff !important;
background-color: #f0825f; background-color: #f0825f;
border-color: #f0825f; border-color: #f0825f;
} }
@ -1182,35 +1272,3 @@ div.grd_modal-footer {
.grd_modal-footer button:hover { .grd_modal-footer button:hover {
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
} }
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 30.10.2019, 16:04:16
Author : einhornimmond
*/
/* messages, update flash */
.grd-error {
color: red;
border: 1px solid rgba(255, 0, 0, 0.5);
padding: 5px;
}
.grd-info {
border: 1px dotted gray;
padding: 5px;
}
.grd-success {
padding: 5px;
color: #047006;
}
.flash-messages .message {
padding: 5px;
}
.flash-messages .success {
color: #047006;
}
.flash-messages .error {
color: red;
}

View File

@ -22,7 +22,6 @@
@menu-link-selected: #047006; @menu-link-selected: #047006;
@menu-border-color: #f2f4f5; @menu-border-color: #f2f4f5;
/* CONTENT */ /* CONTENT */
@container-background: #fff; @container-background: #fff;
@container-text: #212529; @container-text: #212529;
@ -74,15 +73,16 @@
@print-link-text: #06c; @print-link-text: #06c;
@gdt-text: #a27824; @gdt-text: #a27824;
/* NOTIFICATION */ /* NOTIFICATION */
@info-border: gray; @info-border: gray;
@success: green; @success: green;
@success-background: lightcyan; @success-background: lightcyan;
@success-background-hover: lightgreen; @success-background-hover: lightgreen;
@alert-color: #fff;
@error: red; @error: red;
@error-border: rgba(255, 0, 0, 0.5); @error-border: rgba(255, 0, 0, 0.5);
@success: #047006; @success: #047006;
@success-border: #04700675;
@alert: #ff5f66; @alert: #ff5f66;
@alert-blink: #ff5f669e; @alert-blink: #ff5f669e;
@notify: #525c5d; @notify: #525c5d;

View File

@ -0,0 +1,78 @@
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/* ============================================================
Screen styles for flash messages.
Datei : messages.css
Datum : 30.10.2019, 16:04:16
Autor : einhornimmond, Christine Slotty
Copyright : Gradio
============================================================*/
@media screen {
.flash-messages {
width: 30%;
position: absolute;
top: 57px;
left: 241px;
text-align: center;
.alert {
margin: 0;
padding: 1em;
vertical-align: middle;
border-radius: 5px;
}
.alert-success {
color: @alert-color !important;
background-color: @success;
border: 1px solid @success-border;
}
.alert-error {
color: @alert-color !important;
background-color: @error;
border: 1px solid @error-border;
}
.message {
padding: 5px;
}
.success {
color: @success;
}
.error {
color: @error;
}
}
.flash-messages.hidden {
display: none;
}
/* messages, update flash */
.grd-error {
color: @error;
border: 1px solid @error-border;
padding: 5px;
}
.grd-info {
border: 1px dotted @info-border;
padding: 5px;
}
.grd-success {
padding: 5px;
color: @success;
}
}

View File

@ -15,6 +15,7 @@
padding-left: 0; padding-left: 0;
margin-bottom: 0; margin-bottom: 0;
list-style: none; list-style: none;
z-index: 10;
} }
.notify { .notify {

View File

@ -30,8 +30,7 @@
letter-spacing: @content-letter-spacing; letter-spacing: @content-letter-spacing;
font-family: Roboto, sans-serif; font-family: Roboto, sans-serif;
font-weight: 500; font-weight: 500;
font-size: 1rem; font-size: 1rem; /*padding-top: 2em;*/
padding-top: 6em;
padding-right: 10em; padding-right: 10em;
} }
@ -44,9 +43,9 @@
/* Center Navigation Top */ /* Center Navigation Top */
.nav-content { .nav-content {
position: relative;
color: @content-nav; color: @content-nav;
margin: 0 .25em; margin: 0 .25em;
margin-bottom: 1em;
} }
.nav-content-list { .nav-content-list {
@ -70,9 +69,6 @@
margin: 1em .25em; margin: 1em .25em;
} }
.content-default .content-container {
}
/* Top Info Above Main */ /* Top Info Above Main */
.info-container { .info-container {
max-width: 70%; max-width: 70%;
@ -84,6 +80,12 @@
width: 100%; width: 100%;
} }
.default-container {
width: 90%;
margin: auto;
padding: 1em;
}
/* Generic Content */ /* Generic Content */
.content-region { .content-region {
border-bottom: 1px dashed @light; border-bottom: 1px dashed @light;

View File

@ -49,31 +49,45 @@
.cell { .cell {
display: flex; display: flex;
flex-wrap: wrap;
align-items: center; align-items: center;
padding: 1em 1.5em; padding: 1em 1.5em;
} }
.cell-dense {
padding: .1em .5em;
}
.centered {
justify-content: center;
}
.c0 { .c0 {
flex-grow: 5; flex-grow: 5;
} }
.c1 { .c1 {
width: 80px; min-width: 40px;
flex: 0 0 80px; flex: 0 0 40px;
} }
.c2 { .c2 {
width: 160px; min-width: 80px;
flex: 0 0 160px; flex: 0 0 80px;
} }
.c3 { .c3 {
width: 240px; min-width: 160px;
flex: 0 0 240px; flex: 0 0 160px;
} }
.c4 { .c4 {
width: 320px; min-width: 240px;
flex: 0 0 240px;
}
.c5 {
min-width: 320px;
flex: 0 0 320px; flex: 0 0 320px;
} }
@ -130,6 +144,16 @@
font-weight: 400; font-weight: 400;
} }
/*,
.cell-icon .material-icons-outlined */
.cell-icon {
/*noch ungeklärt - icon ist nicht aligned */
/*font-size: 1.25em;*/
vertical-align: middle;
}
/* ===================================== /* =====================================
FORM TOP CONTENT (checkTransaction) FORM TOP CONTENT (checkTransaction)
=====================================*/ =====================================*/

View File

@ -116,12 +116,12 @@ and open the template in the editor.
} }
.form-button:hover { .form-button:hover {
color: #fff;
background-color: #034b04; background-color: #034b04;
border-color: #023f03; border-color: #023f03;
} }
.button-cancel { .button-cancel {
color: #fff !important;
background-color: #f0825f; background-color: #f0825f;
border-color: #f0825f; border-color: #f0825f;
} }

View File

@ -1,43 +0,0 @@
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
and open the template in the editor.
*/
/*
Created on : 30.10.2019, 16:04:16
Author : einhornimmond
*/
/* messages, update flash */
.grd-error {
color: @error;
border: 1px solid @error-border;
padding: 5px;
}
.grd-info {
border: 1px dotted @info-border;
padding: 5px;
}
.grd-success {
padding: 5px;
color: @success;
}
.flash-messages {
.message {
padding: 5px;
}
.success {
color: @success;
}
.error {
color: @error;
}
}