From 67b64fc9fdc751e4e99225f150340b5771153ec8 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 22 Jun 2022 16:56:39 -0400 Subject: [PATCH] Integrate the "All Groups" menu link into a menu panel. (CFM-174) --- app/resources/locales/en_US/menu.po | 12 ++++++++++++ app/templates/element/menuMain.php | 5 ++--- app/templates/element/menuPanel.php | 28 ++++++++++++++++++++++++++++ app/webroot/css/co-base.css | 19 ++++++++++++++++++- 4 files changed, 60 insertions(+), 4 deletions(-) diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index 5d1faae47..2376b0bf2 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -69,6 +69,18 @@ msgstr "Review and manage people in your collaboration (CO Person Records)" msgid "co.structure" msgstr "Structure" +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." + +msgid "co.structure.groups" +msgstr "Groups" + +msgid "co.structure.groups.all" +msgstr "All Groups" + msgid "co.switch" msgstr "Switch CO" diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php index 27bb61546..0a6fdbb17 100644 --- a/app/templates/element/menuMain.php +++ b/app/templates/element/menuMain.php @@ -48,11 +48,10 @@ ], [ 'permission' => 'groups', - 'controller' => 'groups', - 'action' => 'index', 'icon' => 'group', 'dropdown' => 'true', - 'label' => __d('menu', 'co.structure') + 'label' => __d('menu', 'co.structure'), + 'panel' => 'structure' ], [ 'permission' => 'configuration', diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index 53898fd6e..2b87610ef 100644 --- a/app/templates/element/menuPanel.php +++ b/app/templates/element/menuPanel.php @@ -91,6 +91,34 @@ + +

+

+ + diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 783f90986..33a3c27fa 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -521,12 +521,29 @@ body.logged-in #top-menu { background-color: transparent; border: 1px solid var(--cmg-color-lightgray-006); } -#main-menu .menu-panel-links a.menu-panel-primary-link:hover h3 { +#main-menu .menu-panel-links a.menu-panel-primary-link:hover h3 { text-decoration: underline; } #main-menu .menu-panel-primary-link-text { flex: 1; } +#main-menu ul.menu-panel-lists ul { + padding: 0; + margin-left: 1em; +} +#main-menu ul.menu-panel-lists ul li { + list-style: disc; + margin: 0.5em 0 0 0.5em; +} +#main-menu ul.menu-panel-lists ul li a { + display: inline; + padding: 0; + color: var(--cmg-color-blue-003); +} +#main-menu ul.menu-panel-lists ul li a:hover { + text-decoration: underline; + background-color: transparent; +} /* CONTENT */ #breadcrumbs { font-size: 0.9em;