From 25ce149c289cf1a8da1367c4334892ee1b673d00 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Tue, 6 Dec 2022 13:45:27 -0700 Subject: [PATCH 1/4] Add config menu panel (CFM-224/CFM-90) --- app/templates/element/menuMain.php | 3 +- app/templates/element/menuPanel.php | 64 ++++++++++++++++++++++++++++- app/webroot/css/co-base.css | 28 ++++++++++++- app/webroot/css/co-responsive.css | 9 +++- 4 files changed, 99 insertions(+), 5 deletions(-) diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php index 0a6fdbb17..a2c3ac922 100644 --- a/app/templates/element/menuMain.php +++ b/app/templates/element/menuMain.php @@ -82,7 +82,8 @@ 'controller' => 'dashboards', 'action' => 'configuration', 'icon' => 'settings', - 'label' => __d('menu', 'co.configuration') + 'label' => __d('menu', 'co.configuration'), + 'panel' => 'config' ] ]; diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index 2b87610ef..87d2a2357 100644 --- a/app/templates/element/menuPanel.php +++ b/app/templates/element/menuPanel.php @@ -95,7 +95,7 @@

-
+ +

Configuration

+
+ + +
+
+ + + +
+ diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 4a40bdb29..2b11cdc6f 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -513,7 +513,31 @@ ul.form-list li.alert-banner .co-alert { #main-menu .menu-panel-primary-link-text { flex: 1; } -#main-menu ul.menu-panel-lists ul { +#main-menu ul.menu-panel-links ul li a { + padding: 0.5em 1em; + margin: 0; + color: var(--cmg-color-blue-001); + display: flex; + gap: 0.5em; + align-items: center; + line-height: 1.4em; +} +#main-menu .menu-panel-links .material-icons, #main-menu .menu-panel-links .material-icons-outlined { + font-size: 1.2em; + display: inline; + color: var(--cmg-color-gray-002); +} +.menu-panel-links-desc { + margin-top: 0.5em; + font-size: 0.9em; +} +.menu-panel .AZ-switch.form-check { + position: absolute; + right: 6em; + top: 2em; + font-size: 1.1em; +} +/*#main-menu ul.menu-panel-lists ul { padding: 0; margin-left: 1em; } @@ -529,7 +553,7 @@ ul.form-list li.alert-banner .co-alert { #main-menu ul.menu-panel-lists ul li a:hover { text-decoration: underline; background-color: transparent; -} +}*/ /* CONTENT */ #breadcrumbs { font-size: 0.9em; diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css index 470c99c0a..6872381f2 100644 --- a/app/webroot/css/co-responsive.css +++ b/app/webroot/css/co-responsive.css @@ -246,12 +246,19 @@ .menu-panel { left: calc(100% + 1px); padding: 1rem 1.5rem; - width: 60vw; + width: 80vw; + min-height: 520px; border-right: 1px solid var(--cmg-color-lightgray-006); border-bottom: 1px solid var(--cmg-color-lightgray-006); } .menu-panel-content { display: flex; + gap: 4em; + justify-content: left; + margin-top: 1.5em; + } + .menu-panel-links { + flex: 1; } /* GENERAL */ .table-container { From a3253714b94a326302bc1662d747ede4dfc46715 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 7 Dec 2022 12:41:11 -0700 Subject: [PATCH 2/4] Update person menu panel (CFM-224) --- app/resources/locales/en_US/menu.po | 6 + app/templates/element/javascript.php | 8 +- app/templates/element/menuMain.php | 6 +- app/templates/element/menuPanel.php | 229 +++++++++++++++++++++------ app/webroot/css/co-base.css | 34 ++-- app/webroot/css/co-responsive.css | 5 + 6 files changed, 219 insertions(+), 69 deletions(-) diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index f8884c6bc..c00938635 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -87,3 +87,9 @@ msgstr "All Groups" msgid "co.switch" msgstr "Switch CO" +msgid "related.configurations" +msgstr "Related Configurations" + +msgid "related.links" +msgstr "Related Links" + diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php index 3482c912d..a4f55cd3e 100644 --- a/app/templates/element/javascript.php +++ b/app/templates/element/javascript.php @@ -42,7 +42,13 @@ }); $('.menu-panel-toggle').click(function() { - $(this).next('.menu-panel').toggleClass('visible'); + panel = $(this).next('.menu-panel'); + if($(panel).hasClass('visible')) { + $(panel).removeClass('visible'); + } else { + $('.menu-panel').removeClass('visible'); + $(panel).addClass('visible'); + } }); $('.menu-panel-close').click(function() { diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php index a2c3ac922..9c8335921 100644 --- a/app/templates/element/menuMain.php +++ b/app/templates/element/menuMain.php @@ -39,12 +39,10 @@ $menuItems = [ [ 'permission' => 'people', - 'controller' => 'people', - 'action' => 'index', 'icon' => 'person', 'dropdown' => 'true', - 'label' => __d('menu', 'co.people') //, - //'panel' => 'people' // XXX Uncomment this panel setting to enable panel menus + 'label' => __d('menu', 'co.people'), + 'panel' => 'people' ], [ 'permission' => 'groups', diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index 87d2a2357..af51c263b 100644 --- a/app/templates/element/menuPanel.php +++ b/app/templates/element/menuPanel.php @@ -25,11 +25,11 @@ * @license Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) */ ?> -
+ + + 1): // More than one CO is available, so present the switch button ?>
Html->link(' ' . __d('menu','co.switch'), diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 8fac0f754..61dff50f5 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -216,8 +216,6 @@ body.cos.select #top-bar { z-index: 100; } #top-menu ul { - display: flex; - column-gap: 2em; list-style: none; margin: 0; padding: 0; @@ -272,9 +270,6 @@ body.cos.select #top-bar { float: left; font-size: 5em; } -#user-panel ul { - padding-left: 2em; -} #user-panel .co-info-topbox { background-color: var(--cmg-color-lightgray-004); margin-top: 2em; @@ -328,6 +323,13 @@ body.cos.select #top-bar { display: block; padding: 1em; } +#user-panel-user-settings { + float: right; + margin: 0 1rem 1rem 0; +} +#user-panel-user-settings .dropdown-divider { + margin: 0 0 0.25rem; +} /* LOGIN & LOGOUT */ #login { display: inline-block; @@ -564,6 +566,12 @@ ul.form-list li.alert-banner .co-alert { text-decoration: underline; background-color: transparent; } +#main-menu .menu-panel-common-items { + margin-top: 1rem; +} +#main-menu .menu-panel-common-items li { + list-style: disc; +} /* CONTENT */ #breadcrumbs { font-size: 0.9em; diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css index 52c15a3d0..91a1ab780 100644 --- a/app/webroot/css/co-responsive.css +++ b/app/webroot/css/co-responsive.css @@ -264,6 +264,7 @@ padding: 0 2em 1em 3em; margin-top: 0.5em; border-left: 1px solid var(--cmg-color-lightgray-006); + max-width: 30%; } /* GENERAL */ .table-container { From 969323199fa6f14f5678b2872942e152ab1fdcd8 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Tue, 7 Feb 2023 10:00:32 -0500 Subject: [PATCH 4/4] Enable and update menuPanels (CFM-224/CFM-90) --- app/resources/locales/en_US/menu.po | 43 ++++- app/templates/Dashboards/configuration.php | 16 +- app/templates/element/menuMain.php | 24 +-- app/templates/element/menuPanel.php | 175 ++++++++++++--------- app/webroot/css/co-base.css | 35 +++-- app/webroot/css/co-responsive.css | 13 +- 6 files changed, 186 insertions(+), 120 deletions(-) diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index ecde046f7..39f264a9a 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -28,17 +28,50 @@ msgid "co.Attributes" msgstr "Attributes" msgid "co.configuration" -msgstr "Config" +msgstr "Configuration" + +msgid "co.configuration.panel.az" +msgstr "A-Z Listing" + +msgid "co.configuration.panel.title" +msgstr "Configuration" + +msgid "co.configuration.panel.personalization" +msgstr "Personalization" + +msgid "co.configuration.panel.personalization.desc" +msgstr "Dashboards, custom text, and theming" + +msgid "co.configuration.panel.platform" +msgstr "Platform-Wide Settings" + +msgid "co.configuration.panel.platform.desc" +msgstr "These configurations are found only in the COmanage CO" + +msgid "co.configuration.panel.setup" +msgstr "CO Setup" + +msgid "co.configuration.panel.setup.desc" +msgstr "Settings for the current CO" msgid "co.connections" msgstr "Connections" -msgid "co.lifecycle" -msgstr "Lifecycle" +msgid "co.connections.panel.title" +msgstr "Connections" + +msgid "co.connections.panel.desc" +msgstr "Connections to external services: upstream inputs and downstream outputs" msgid "co.operations" msgstr "Operations" +msgid "co.operations.panel.title" +msgstr "Operations" + +msgid "co.operations.panel.desc" +msgstr "Operational activities" + msgid "co.groups" msgstr "Groups" @@ -61,7 +94,7 @@ msgid "co.people.panel.title" msgstr "People" msgid "co.people.panel.desc" -msgstr "COmanage Registry is a registry for people. This section contains the basic building blocks for modeling and managing people in COmanage." +msgstr "Model and manage people in COmanage Registry" msgid "co.people.population" msgstr "My Population" @@ -88,7 +121,7 @@ msgid "co.structure.panel.title" msgstr "Structure" msgid "co.structure.panel.desc" -msgstr "COmanage registry provides structures for modeling and managing your organization, including COUs, Groups, and Departments." +msgstr "Groupings for your population" msgid "co.structure.groups" msgstr "Groups" diff --git a/app/templates/Dashboards/configuration.php b/app/templates/Dashboards/configuration.php index 726f9b73c..e7ab5bec9 100644 --- a/app/templates/Dashboards/configuration.php +++ b/app/templates/Dashboards/configuration.php @@ -25,9 +25,16 @@ * @license Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) */ ?> + +
+
+

+
+
+
-
    +
      $cfg): ?>
    -
    -
      +
        $cfg): ?>
- +
+ +
\ No newline at end of file diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php index 9c8335921..db18e2c74 100644 --- a/app/templates/element/menuMain.php +++ b/app/templates/element/menuMain.php @@ -40,45 +40,29 @@ [ 'permission' => 'people', 'icon' => 'person', - 'dropdown' => 'true', 'label' => __d('menu', 'co.people'), 'panel' => 'people' ], [ 'permission' => 'groups', 'icon' => 'group', - 'dropdown' => 'true', 'label' => __d('menu', 'co.structure'), 'panel' => 'structure' ], [ 'permission' => 'configuration', - 'controller' => 'dashboards', - 'action' => 'configuration', 'icon' => 'cached', - 'dropdown' => 'true', - 'label' => __d('menu', 'co.lifecycle') + 'label' => __d('menu', 'co.connections'), + 'panel' => 'connections' ], [ 'permission' => 'configuration', - 'controller' => 'dashboards', - 'action' => 'configuration', - 'icon' => 'hub', - 'dropdown' => 'true', - 'label' => __d('menu', 'co.connections') - ], - [ - 'permission' => 'configuration', - 'controller' => 'dashboards', - 'action' => 'configuration', 'icon' => 'play_circle_outline', - 'dropdown' => 'true', - 'label' => __d('menu', 'co.operations') + 'label' => __d('menu', 'co.operations'), + 'panel' => 'operations' ], [ 'permission' => 'configuration', - 'controller' => 'dashboards', - 'action' => 'configuration', 'icon' => 'settings', 'label' => __d('menu', 'co.configuration'), 'panel' => 'config' diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index 050bae4ed..86bb80205 100644 --- a/app/templates/element/menuPanel.php +++ b/app/templates/element/menuPanel.php @@ -50,6 +50,8 @@
+ Url->build( @@ -69,63 +71,28 @@
- - - Url->build( - ['plugin' => null, - 'controller' => 'people', - 'action' => 'index', - '?' => [ - 'co_id' => $vv_cur_co->id - ]] - ); - ?> - -
-

-
-
- - - */ ?> - + */ ?>
+ - + */ + ?>
@@ -174,6 +141,8 @@ + @@ -192,34 +161,95 @@ + */ ?>
-

- -

+ +

+

+
+ + +
+ + +

+

+
+ + +
+ -

Configuration

-
- - +

+
+ Html->link( + __d('menu','co.configuration.panel.az'), + [ + 'plugin' => null, + 'controller' => 'dashboards', + 'action' => 'configuration', + '?' => [ + 'co_id' => $vv_cur_co->id + ] + ] + ); + ?>
+ id == 1): ?> + [ + 'icon' => 'home', + 'controller' => 'cos', + 'action' => 'index' + ], + __d('controller', 'Plugins', [99]) => [ + 'icon' => 'electrical_services', + 'controller' => 'plugins', + 'action' => 'index' + ] + ]; + ?> + +
+
+ +
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 61dff50f5..02adf08bc 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -484,6 +484,17 @@ ul.form-list li.alert-banner .co-alert { -webkit-box-shadow: 5px 5px 8px 0px var(--cmg-color-lightgray-003); box-shadow: 5px 5px 8px 0px var(--cmg-color-lightgray-003); } +#main-menu .menu-panel a { + color: var(--cmg-color-blue-001); +} +#main-menu .menu-panel li a:hover, +#main-menu .menu-panel li a:focus { + background-color: transparent !important; +} +#main-menu .menu-panel li a:hover .menu-panel-link-text, +#main-menu .menu-panel li a:focus .menu-panel-link-text { + text-decoration: underline; +} .menu-panel.visible { display: block; } @@ -518,7 +529,6 @@ ul.form-list li.alert-banner .co-alert { #main-menu ul.menu-panel-links ul li a { padding: 0.5em 1em; margin: 0; - color: var(--cmg-color-blue-001); display: flex; gap: 0.5em; align-items: center; @@ -545,12 +555,18 @@ ul.form-list li.alert-banner .co-alert { margin-top: 0.5em; font-size: 0.9em; } -.menu-panel .AZ-switch.form-check { +.menu-panel-link-desc { + color: var(--cmg-color-gray-001); +} +.menu-panel .az-link { position: absolute; right: 6em; top: 2em; font-size: 1.1em; } +#main-menu .az-link a { + padding: 0; +} .menu-panel-sidepanel { padding: 0 1em 2em 1.25em; } @@ -560,11 +576,6 @@ ul.form-list li.alert-banner .co-alert { #main-menu .menu-panel-sidepanel ul li a { display: inline; padding: 0; - color: var(--cmg-color-blue-002); -} -#main-menu .menu-panel-sidepanel ul li a:hover { - text-decoration: underline; - background-color: transparent; } #main-menu .menu-panel-common-items { margin-top: 1rem; @@ -825,20 +836,24 @@ ul.form-list li.alert-banner .co-alert { margin-right: 0.5em; } /* CO CONFIGURATION DASHBOARD */ -#configuration-menu { +.config-menu { list-style: none; padding: 0; } -#configuration-menu a { +.config-menu a { display: inline-block; padding: 0.5em; text-indent: -0.9em; padding-left: 2em; } -#configuration-menu a .material-icons { +.config-menu a .material-icons { color: var(--cmg-color-gray-001); margin-right: 0.5em; } +#platform-menu { + border-bottom: 1px solid var(--cmg-color-lightgray-006); + padding-bottom: 1em; +} /* INDEX ACTION COMMAND MENUS */ a.action-menu-toggle { padding: 0.5rem; diff --git a/app/webroot/css/co-responsive.css b/app/webroot/css/co-responsive.css index 91a1ab780..29232fe20 100644 --- a/app/webroot/css/co-responsive.css +++ b/app/webroot/css/co-responsive.css @@ -264,7 +264,12 @@ padding: 0 2em 1em 3em; margin-top: 0.5em; border-left: 1px solid var(--cmg-color-lightgray-006); - max-width: 30%; + width: 30%; + } + .menu-panel .comanage-version { + position: absolute; + bottom: 2rem; + margin: 0; } /* GENERAL */ .table-container { @@ -313,10 +318,12 @@ padding: 0 0.5em; } /* CO CONFIGURATION DASHBOARD */ - #configuration-menu { + .config-menu { column-count: 3; column-gap: 1em; - margin-bottom: 4em; + } + .comanage-version { + margin-top: 4em; } /* INDEX ACTION ROW MENUS */ .field-actions .dropdown-menu {