IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-19 11:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix js

Browse Source
This commit is contained in:
Dario Rekowski on RockPI 2020-06-24 06:04:16 +00:00
parent 6da10a155f
commit dcc22445dd
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Controller/AppController.php
View File

@ -240,6 +240,7 @@ class AppController extends Controller
} else { } else {
$this->Flash->error(__('Konto ist nicht aktiviert!')); $this->Flash->error(__('Konto ist nicht aktiviert!'));
} }
//die(json_encode($json));
return $this->redirect($this->loginServerUrl . 'account/', 303); return $this->redirect($this->loginServerUrl . 'account/', 303);
} }
} }

2
src/Controller/StateBalancesController.php
View File

@ -177,7 +177,7 @@ class StateBalancesController extends AppController
public function overviewGdt() public function overviewGdt()
{ {
$startTime = microtime(true); $startTime = microtime(true);
$this->viewBuilder()->setLayout('frontend'); $this->viewBuilder()->setLayout('frontend_ripple');
$session = $this->getRequest()->getSession(); $session = $this->getRequest()->getSession();
$result = $this->requestLogin(); $result = $this->requestLogin();
if ($result !== true) { if ($result !== true) {

2
src/Template/Layout/frontend_ripple.ctp
View File

@ -32,9 +32,9 @@ $GLOBALS["self"] = $this;
<?= $this->fetch('title') ?> <?= $this->fetch('title') ?>
</title> </title>
<?= $this->Html->meta('icon') ?> <?= $this->Html->meta('icon') ?>
<!--<?= $this->Html->css(['main.css']) ?>-->
<?= $this->Html->css(['rippleUI/style.css', 'materialdesignicons.min.css']) ?> <?= $this->Html->css(['rippleUI/style.css', 'materialdesignicons.min.css']) ?>
<?= $this->Html->script(['basic']) ?> <?= $this->Html->script(['basic']) ?>
<!--<?= $this->Html->css(['main.css']) ?>-->
<?= $this->fetch('meta') ?> <?= $this->fetch('meta') ?>
<?= $this->fetch('css') ?> <?= $this->fetch('css') ?>
<?= $this->fetch('script') ?> <?= $this->fetch('script') ?>

4
src/Template/StateBalances/overview.ctp
View File

@ -124,7 +124,9 @@ $this->assign('header', $header);
g_transactionExecutionCount = newCount; g_transactionExecutionCount = newCount;
location.reload(); location.reload();
//updateTransactionExecutingDisplay(g_transactionExecutionCount); //updateTransactionExecutingDisplay(g_transactionExecutionCount);
} } else {
setTimeout(checkTransactionExecuting, 100);
}
} }
}, },
// error // error