From 088b91c14e513de83dc4598b1a9827c254d8c1a4 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Tue, 7 Feb 2023 10:07:45 -0500 Subject: [PATCH] Enable and update menuPanels (CFM-224/CFM-90) (#66) * Add config menu panel (CFM-224/CFM-90) * Update person menu panel (CFM-224) * Update Person and Structure menu panels; add Settings drop-down to User Panel. (CFM-224) * Enable and update menuPanels (CFM-224/CFM-90) --- app/resources/locales/en_US/menu.po | 61 ++++- app/templates/Dashboards/configuration.php | 16 +- app/templates/element/javascript.php | 15 +- app/templates/element/menuMain.php | 33 +-- app/templates/element/menuPanel.php | 287 ++++++++++++++++++--- app/templates/element/menuTop.php | 13 + app/webroot/css/co-base.css | 95 +++++-- app/webroot/css/co-responsive.css | 26 +- 8 files changed, 451 insertions(+), 95 deletions(-) diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index f8884c6bc..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" @@ -72,11 +105,23 @@ msgstr "Review and manage people in your collaboration (CO Person Records)" msgid "co.structure" msgstr "Structure" +msgid "co.structure.cous.desc" +msgstr "Collaborative Organizational Units (COUs) are the primary structural objects used to allow delegation of person management within a CO. COUs attach to a Person Role and imply specific Group memberships." + +msgid "co.structure.depts.desc" +msgstr "Departments represent entities within a CO or COU and can store telephone numbers, email addresses, URLs, identifiers, and sets of people." + +msgid "co.structure.groups.desc" +msgstr "Groups attach to a Person. By default, any CO Person can create a new CO Group." + +msgid "co.structure.orgs.desc" +msgstr "Organizations are like Departments but represent entities external to the CO." + 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" @@ -87,3 +132,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/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) */ ?> + +
+
+

+
+
+
-
- +
+ +
\ No newline at end of file diff --git a/app/templates/element/javascript.php b/app/templates/element/javascript.php index 3482c912d..2a5b6eacc 100644 --- a/app/templates/element/javascript.php +++ b/app/templates/element/javascript.php @@ -31,7 +31,12 @@ $(function() { // Focus any designated form element $('.focusFirst').focus(); - + + // USER PANEL + $('#user-panel-user-settings').click(function(e) { + e.stopPropagation(); + }); + // DESKTOP MENU DRAWER BEHAVIOR $('#co-menu-collapse').click(function(){ $('#navigation-drawer').toggleClass('closed'); @@ -42,7 +47,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 0a6fdbb17..db18e2c74 100644 --- a/app/templates/element/menuMain.php +++ b/app/templates/element/menuMain.php @@ -39,50 +39,33 @@ $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', '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') + 'label' => __d('menu', 'co.configuration'), + 'panel' => 'config' ] ]; diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index 2b87610ef..86bb80205 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) */ ?> -
+