cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

chg: [layout] Modernized general UI - WiP

pull/72/head
mokaddem 2021-09-13 13:04:54 +02:00
parent e16a83eddd
commit 0c2c402aa2
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/element/genericElements/Form/genericForm.php
View File

@ -98,7 +98,7 @@
'body' => sprintf( 'body' => sprintf(
'%s%s%s%s%s%s', '%s%s%s%s%s%s',
empty($data['description']) ? '' : sprintf( empty($data['description']) ? '' : sprintf(
'<div class="pb-2">%s</div>', '<div class="pb-2 font-weight-light">%s</div>',
$data['description'] $data['description']
), ),
$ajaxFlashMessage, $ajaxFlashMessage,
@ -135,16 +135,16 @@
); );
} else { } else {
echo sprintf( echo sprintf(
'%s<h2>%s</h2>%s%s%s%s%s%s%s%s%s', '%s<h2 class="font-weight-light">%s</h2>%s%s%s%s%s%s%s%s%s',
empty($ajax) ? '<div class="col-8">' : '', empty($ajax) ? '<div class="col-8">' : '',
empty($data['title']) ? sprintf('%s %s', $actionName, $modelName) : h($data['title']), empty($data['title']) ? sprintf('%s %s', $actionName, $modelName) : h($data['title']),
$formCreate, $formCreate,
$ajaxFlashMessage, $ajaxFlashMessage,
empty($data['description']) ? '' : sprintf( empty($data['description']) ? '' : sprintf(
'<div class="pb-3">%s</div>', '<div class="pb-3 font-weight-light">%s</div>',
$data['description'] $data['description']
), ),
$fieldsString, sprintf('<div class="sub-container">%s</div>', $fieldsString),
empty($metaTemplateString) ? '' : $this->element( empty($metaTemplateString) ? '' : $this->element(
'genericElements/accordion_scaffold', [ 'genericElements/accordion_scaffold', [
'body' => $metaTemplateString, 'body' => $metaTemplateString,

4
templates/element/genericElements/IndexTable/index_table.php
View File

@ -19,11 +19,11 @@
$tableRandomValue = Cake\Utility\Security::randomString(8); $tableRandomValue = Cake\Utility\Security::randomString(8);
echo '<div id="table-container-' . h($tableRandomValue) . '">'; echo '<div id="table-container-' . h($tableRandomValue) . '">';
if (!empty($data['title'])) { if (!empty($data['title'])) {
echo sprintf('<h2>%s</h2>', h($data['title'])); echo sprintf('<h2 class="font-weight-light">%s</h2>', h($data['title']));
} }
if (!empty($data['description'])) { if (!empty($data['description'])) {
echo sprintf( echo sprintf(
'<div>%s</div>', '<div class="font-weight-light">%s</div>',
empty($data['description']) ? '' : h($data['description']) empty($data['description']) ? '' : h($data['description'])
); );
} }

6
templates/element/genericElements/SingleViews/single_view.php
View File

@ -111,10 +111,10 @@
$title; $title;
echo sprintf( echo sprintf(
"<div id=\"single-view-table-container-%s\"> "<div id=\"single-view-table-container-%s\">
<h2>%s</h2> <h2 class=\"font-weight-light\">%s</h2>
%s%s %s%s
<div class=\"px-3\"> <div class=\"px-3 col-sm-8 sub-container\">
<table id=\"single-view-table-%s\" class=\"table table-striped col-sm-8\">%s</table> <table id=\"single-view-table-%s\" class=\"table table-striped\">%s</table>
</div> </div>
<div id=\"metaTemplates\" class=\"col-lg-8 px-0\">%s</div> <div id=\"metaTemplates\" class=\"col-lg-8 px-0\">%s</div>
<div id=\"accordion\">%s</div> <div id=\"accordion\">%s</div>

5
templates/element/layouts/header/header-breadcrumb.php
View File

@ -15,7 +15,7 @@
'<nav class="header-breadcrumb d-xl-block d-none"{{attrs}}><ol class="">{{content}}</ol></nav>' '<nav class="header-breadcrumb d-xl-block d-none"{{attrs}}><ol class="">{{content}}</ol></nav>'
), ),
'item' => sprintf( 'item' => sprintf(
'<li class="header-breadcrumb-item"{{attrs}}><i class="{{icon}} mr-1"></i><a href="{{url}}"{{innerAttrs}}>{{title}}</a></li>{{separator}}', '<li class="header-breadcrumb-item"{{attrs}}><i class="{{icon}} mr-1"></i><a class="{{linkClass}}" href="{{url}}"{{innerAttrs}}>{{title}}</a></li>{{separator}}',
empty($darkMode) ? 'light' : 'dark' empty($darkMode) ? 'light' : 'dark'
), ),
'itemWithoutLink' => '<li class="header-breadcrumb-item"{{attrs}}><span{{innerAttrs}}>{{title}}</span></li>{{separator}}', 'itemWithoutLink' => '<li class="header-breadcrumb-item"{{attrs}}><span{{innerAttrs}}>{{title}}</span></li>{{separator}}',
@ -23,7 +23,7 @@
]); ]);
if (!empty($breadcrumb)) { if (!empty($breadcrumb)) {
foreach ($breadcrumb as $entry) { foreach ($breadcrumb as $i => $entry) {
if (!empty($entry['textGetter'])) { if (!empty($entry['textGetter'])) {
$entry['label'] = Cake\Utility\Hash::get($entity, $entry['textGetter']); $entry['label'] = Cake\Utility\Hash::get($entity, $entry['textGetter']);
} }
@ -33,6 +33,7 @@
$this->Breadcrumbs->add(h($entry['label']), Router::url($entry['url']), [ $this->Breadcrumbs->add(h($entry['label']), Router::url($entry['url']), [
'title' => h($entry['label']), 'title' => h($entry['label']),
'templateVars' => [ 'templateVars' => [
'linkClass' => $i == 0 ? 'font-weight-light' : '',
'icon' => !empty($entry['icon']) ? $this->FontAwesome->getClass(h($entry['icon'])) : '' 'icon' => !empty($entry['icon']) ? $this->FontAwesome->getClass(h($entry['icon'])) : ''
] ]
]); ]);

6
webroot/css/layout.css
View File

@ -14,7 +14,7 @@ body {
.sub-container { .sub-container {
background-color: white; background-color: white;
padding: 0.5rem; padding: 0.75rem;
border-radius: 0.25rem; border-radius: 0.25rem;
margin-top: 0.75rem; margin-top: 0.75rem;
margin-bottom: 1rem; margin-bottom: 1rem;
@ -100,7 +100,7 @@ main.content {
left: 0; left: 0;
transition: width .05s linear; transition: width .05s linear;
transform:translateZ(0) scale(1,1); transform:translateZ(0) scale(1,1);
z-index:1041; z-index:1039;
} }
.sidebar.expanded, .sidebar:hover { .sidebar.expanded, .sidebar:hover {
@ -112,7 +112,7 @@ main.content {
} }
.sidebar ~ main.content:after { .sidebar ~ main.content:after {
z-index: 1040; z-index: 1038;
content: ' '; content: ' ';
transition: opacity 0.5s; transition: opacity 0.5s;
position: fixed; position: fixed;