diff --git a/src/Controller/Component/ACLComponent.php b/src/Controller/Component/ACLComponent.php index a1f06ea..cfbaa69 100644 --- a/src/Controller/Component/ACLComponent.php +++ b/src/Controller/Component/ACLComponent.php @@ -11,6 +11,7 @@ use Cake\ORM\TableRegistry; use Cake\Core\Configure; use Cake\Core\Configure\Engine\PhpConfig; use Cake\Utility\Inflector; +use Cake\Routing\Router; class ACLComponent extends Component { @@ -458,6 +459,7 @@ class ACLComponent extends Component 'ContactDB' => [ 'Individuals' => [ 'label' => __('Individuals'), + 'icon' => 'address-book', 'url' => '/individuals/index', 'children' => [ 'index' => [ @@ -493,6 +495,7 @@ class ACLComponent extends Component ], 'Organisations' => [ 'label' => __('Organisations'), + 'icon' => 'building', 'url' => '/organisations/index', 'children' => [ 'index' => [ @@ -528,6 +531,7 @@ class ACLComponent extends Component ], 'EncryptionKeys' => [ 'label' => __('Encryption keys'), + 'icon' => 'key', 'url' => '/encryptionKeys/index', 'children' => [ 'index' => [ @@ -552,6 +556,7 @@ class ACLComponent extends Component 'Trust Circles' => [ 'SharingGroups' => [ 'label' => __('Sharing Groups'), + 'icon' => 'user-friends', 'url' => '/sharingGroups/index', 'children' => [ 'index' => [ @@ -583,6 +588,7 @@ class ACLComponent extends Component 'Sync' => [ 'Broods' => [ 'label' => __('Broods'), + 'icon' => 'network-wired', 'url' => '/broods/index', 'children' => [ 'index' => [ @@ -620,6 +626,7 @@ class ACLComponent extends Component 'Administration' => [ 'Roles' => [ 'label' => __('Roles'), + 'icon' => 'id-badge', 'url' => '/roles/index', 'children' => [ 'index' => [ @@ -655,6 +662,7 @@ class ACLComponent extends Component ], 'Users' => [ 'label' => __('Users'), + 'icon' => 'users', 'url' => '/users/index', 'children' => [ 'index' => [ @@ -690,6 +698,7 @@ class ACLComponent extends Component ], 'Inbox' => [ 'label' => __('Inbox'), + 'icon' => 'inbox', 'url' => '/inbox/index', 'children' => [ 'index' => [ @@ -722,6 +731,7 @@ class ACLComponent extends Component ], 'Outbox' => [ 'label' => __('Outbox'), + 'icon' => 'inbox', 'url' => '/outbox/index', 'children' => [ 'index' => [ @@ -751,6 +761,7 @@ class ACLComponent extends Component ], 'MetaTemplates' => [ 'label' => __('Meta Field Templates'), + 'icon' => 'object-group', 'url' => '/metaTemplates/index', 'children' => [ 'index' => [ @@ -781,6 +792,7 @@ class ACLComponent extends Component ], 'LocalTools' => [ 'label' => __('Local Tools'), + 'icon' => 'tools', 'url' => '/localTools/index', 'children' => [ 'index' => [ @@ -810,6 +822,7 @@ class ACLComponent extends Component 'Instance' => [ __('Instance'), 'url' => '/instance/home', + 'icon' => 'database', 'children' => [ 'migration' => [ 'url' => '/instance/migrationIndex', @@ -821,6 +834,7 @@ class ACLComponent extends Component 'Cerebrate' => [ 'Roles' => [ 'label' => __('Roles'), + 'icon' => 'id-badge', 'url' => '/roles/index', 'children' => [ 'index' => [ @@ -845,6 +859,7 @@ class ACLComponent extends Component 'Instance' => [ __('Instance'), 'url' => '/instance/home', + 'icon' => 'home', 'children' => [ 'home' => [ 'url' => '/instance/home', @@ -854,6 +869,7 @@ class ACLComponent extends Component ], 'Users' => [ __('My Profile'), + 'icon' => 'user-circle', 'children' => [ 'View My Profile' => [ 'url' => '/users/view', @@ -872,6 +888,7 @@ class ACLComponent extends Component 'Open' => [ 'Organisations' => [ 'label' => __('Organisations'), + 'icon' => 'buildings', 'url' => '/open/organisations/index', 'children' => [ 'index' => [ @@ -883,6 +900,7 @@ class ACLComponent extends Component ], 'Individuals' => [ 'label' => __('Individuals'), + 'icon' => 'address-book', 'url' => '/open/individuals/index', 'children' => [ 'index' => [ diff --git a/templates/element/genericElements/side_menu_scaffold.php b/templates/element/genericElements/side_menu_scaffold.php index 9e8eab5..42fc595 100644 --- a/templates/element/genericElements/side_menu_scaffold.php +++ b/templates/element/genericElements/side_menu_scaffold.php @@ -1,4 +1,5 @@ +
+ Logo +
+
+ Breadcrumb +
+
+ right +
+ diff --git a/templates/element/layouts/sidebar.php b/templates/element/layouts/sidebar.php new file mode 100644 index 0000000..2f19ac0 --- /dev/null +++ b/templates/element/layouts/sidebar.php @@ -0,0 +1,17 @@ + diff --git a/templates/element/layouts/sidebar/category.php b/templates/element/layouts/sidebar/category.php new file mode 100644 index 0000000..7c2be88 --- /dev/null +++ b/templates/element/layouts/sidebar/category.php @@ -0,0 +1,4 @@ +
  • + +
    +
  • diff --git a/templates/element/layouts/sidebar/entry.php b/templates/element/layouts/sidebar/entry.php new file mode 100644 index 0000000..5f068ce --- /dev/null +++ b/templates/element/layouts/sidebar/entry.php @@ -0,0 +1,44 @@ + 'level 1', + 'children' => [ + 'Level 2' => [ + 'label' => 'level 2', + 'children' => [ + 'Level 3' => [ + 'label' => 'level 3', + ] + ] + ] + ] + ] + ]; + } + if (!empty($children)) { + $url = "#{$seed}"; + } else { + $url = $parent['url'] ?? '#'; + } +?> + + +
  • + + + + + + element('layouts/sidebar/sub-menu', [ + 'seed' => $seed, + 'children' => $children, + ]); + ?> + +
  • + \ No newline at end of file diff --git a/templates/element/layouts/sidebar/sub-menu.php b/templates/element/layouts/sidebar/sub-menu.php new file mode 100644 index 0000000..2f80fcf --- /dev/null +++ b/templates/element/layouts/sidebar/sub-menu.php @@ -0,0 +1,12 @@ + + + diff --git a/templates/layout/default.php b/templates/layout/default.php index ec75df0..e87ff9d 100644 --- a/templates/layout/default.php +++ b/templates/layout/default.php @@ -35,6 +35,7 @@ $cakeDescription = 'Cerebrate'; ?> Html->css('main.css') ?> Html->css('font-awesome') ?> + Html->css('layout.css') ?> Html->script('jquery-3.5.1.min.js') ?> Html->script('popper.min.js') ?> Html->script('bootstrap.bundle.js') ?> @@ -48,27 +49,25 @@ $cakeDescription = 'Cerebrate'; Html->meta('favicon.ico', '/img/favicon.ico', ['type' => 'icon']); ?> -
    - element('header') ?> -
    -
    -
    -
    - -
    -
    element('side_menu', ['minimal' => 1]) ?>
    - Flash->render() ?> - fetch('content') ?> -
    -
    +
    + + -
    +
    +
    + Flash->render() ?> + fetch('content') ?> +
    +
    +
    + diff --git a/webroot/css/layout.css b/webroot/css/layout.css new file mode 100644 index 0000000..e1ec44a --- /dev/null +++ b/webroot/css/layout.css @@ -0,0 +1,196 @@ +/* layout */ +:root { + --navbar-height: 60px; + --sidebar-width: 230px; +} + +.main-wrapper { + min-height: 100%; + padding-top: var(--navbar-height); +} + +.top-navbar { + position: fixed; + top: 0; + left: 0; + right: 0; + padding: 0; + margin-bottom: 0; +} + +.content { + position: relative; + left: 0; + margin-left: var(--sidebar-width); + min-height: 100%; + background: red; +} + +.sidebar { + height: 100%; + margin-top: var(--navbar-height); + position: fixed; + top: 0; + bottom: 0; + width: var(--sidebar-width); + left: 0; +} + +.left-navbar { +} + +.center-navbar { + display: flex; + flex: 1 1 auto; + line-height: var(--navbar-height); + padding: 0 20px; +} + +.right-navbar { + display: flex; + flex: 0 0 auto; + padding-right: 20px; +} + +/* sidebar */ +.sidebar-wrapper { + width: 100%; + height: 100%; +} + +.sidebar-scroll { + position: relative; + height: 100%; + width: 100%; + overflow: hidden; +} + +.sidebar-content { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + padding-top: 10px; +} + +ul.sidebar-elements { + margin: 0; + padding: 0; +} + +/* sidebar entry */ +ul.sidebar-elements > li { + list-style: none; +} + +li.parent { + +} + +ul.sidebar-elements li > a.sidebar-link { + display: block; + padding: 0 20px; + line-height: 35px; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + text-decoration: none; + color: unset; +} + +ul.sidebar-elements > li > a.sidebar-link:hover { + background-color: #f0f0f0; +} + +ul.sidebar-elements > li > a.sidebar-link > * { + text-align: center; + vertical-align: middle; +} + +ul.sidebar-elements > li > a.sidebar-link > i.sidebar-icon { + margin-right: 10px; + font-size: 19px; + min-width: 19px; + line-height: 19px; +} + +ul.sidebar-elements > li > a.sidebar-link > span.text { + line-height: 40px; + white-space: nowrap; +} + +/* sidebar sub-menu */ +ul.sidebar-elements li.parent > a.sidebar-link::before { + content: "\f0d7"; + float: right; + font-family: 'Font Awesome 5 Free'; + font-weight: 900; + font-size: 1rem; + color: #bbb; +} + +ul.sidebar-elements li.parent > a.sidebar-link:not(.collapsed)::before { + content: "\f0d8"; +} + +ul.sidebar-elements > li ul { + padding: 10px 0; + list-style: none; + line-height: 20px; +} + +ul.sidebar-elements > li ul li > a.sidebar-link { + font-size: 0.9rem; + padding-left: 35px; + padding-right: 17px; +} + +ul.sidebar-elements > li ul li > a.sidebar-link:hover { + background-color: #e0e0e0; +} + +ul.sidebar-elements > li ul li > ul > li > a.sidebar-link { + font-size: 0.85rem; + padding-left: 50px; + padding-right: 14px; +} + +ul.sidebar-elements > li ul li > ul > li > ul > li > a.sidebar-link { + font-size: 0.8rem; + padding-left: 65px; + padding-right: 11px; +} + +ul.sidebar-elements > li ul li > ul > li > ul > li > ul > li > a.sidebar-link { + font-size: 0.78rem; + padding-left: 80px; + padding-right: 8px; +} + +/* sidebar category */ +ul.sidebar-elements > li.category { + padding: 15px 20px 0; + line-height: 30px; + display: flex; +} + +ul.sidebar-elements > li.category > span.category-label { + text-transform: uppercase; + font-size: 0.75rem; + font-weight: 600; + display: flex; + margin-right: 15px; +} + +ul.sidebar-elements > li.category > span.category-divider { + flex: 1 0 0%; + display: flex; + align-items: center; +} + +ul.sidebar-elements > li.category > span.category-divider > hr { + margin: 0; + height: 1px; + flex: 1 0 auto; +} \ No newline at end of file diff --git a/webroot/css/main.css b/webroot/css/main.css index bcf6c0e..4c2820a 100644 --- a/webroot/css/main.css +++ b/webroot/css/main.css @@ -17,7 +17,7 @@ color:black; } -.sidebar {} +/* .sidebar {} .side-bar-ul { top: 70px; @@ -87,7 +87,7 @@ .side-bar-ul>.sidebar-brand a:hover { color: #fff; background: none; -} +} */ @media(min-width:768px) { #wrapper {