From 58b9c271499e70e76af9fd6495e418175050ff61 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Tue, 7 Oct 2025 14:36:47 -0400 Subject: [PATCH 1/5] Include latest features on the menu panels (NOJIRA) --- app/resources/locales/en_US/menu.po | 6 + app/templates/element/menuPanel.php | 219 ++++++++++++++++++++-------- app/webroot/css/co-base.css | 35 ++++- 3 files changed, 193 insertions(+), 67 deletions(-) diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index 32b0468eb..76405d7c5 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -93,6 +93,9 @@ msgstr "Groups" msgid "co.operations" msgstr "Operations" +msgid "co.operations.authentication.events.desc" +msgstr "Review login attempts" + msgid "co.operations.panel.title" msgstr "Operations" @@ -102,6 +105,9 @@ msgstr "Operational activities" msgid "co.operations.jobs.desc" msgstr "Manage this CO's asynchronous process queue" +msgid "co.operations.notifications.desc" +msgstr "View CO notifications" + msgid "co.operations.reports.desc" msgstr "Create, view, and export reports" diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index f88fede5d..e595159de 100644 --- a/app/templates/element/menuPanel.php +++ b/app/templates/element/menuPanel.php @@ -89,43 +89,48 @@ - - -
- - */ - ?> +
@@ -218,7 +223,7 @@ ); ?> - +

@@ -243,6 +248,24 @@
+
    +
  • + Url->build( + ['plugin' => null, + 'controller' => 'ext_identity_source_records', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ]] + ); + ?> + + +
    +     +
    • +
  • +

    + +

      -
    • - Url->build( - ['plugin' => null, - 'controller' => 'ext_identity_source_records', - 'action' => 'index', - '?' => [ - 'co_id' => $vv_cur_co->id - ]] - ); - ?> - - -
      -       -
    • Url->build( @@ -294,9 +304,9 @@ ]] ); ?> - + -
      +
    @@ -311,14 +321,14 @@
    • Url->build( - ['plugin' => null, - 'controller' => 'jobs', - 'action' => 'index', - '?' => [ - 'co_id' => $vv_cur_co->id - ]] - ); + $menuUrl = $this->Url->build([ + 'plugin' => null, + 'controller' => 'jobs', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ] + ]); ?> @@ -328,28 +338,44 @@
    • - Url->build( - ['plugin' => null, - 'controller' => 'reports', - 'action' => 'index', - '?' => [ - 'co_id' => $vv_cur_co->id - ]] - ); + $menuUrl = $this->Url->build([ + 'plugin' => null, + 'controller' => 'notifications', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ] + ]); ?> - +
    -

    -
    +

    +
    - */ ?> + id == 1): ?> +
  • + Url->build([ + 'plugin' => null, + 'controller' => 'authentication_events', + 'action' => 'index', + 'platform' => true + ]); + ?> + + +
    +

    +
    +
    +     +
    • +
    @@ -368,6 +394,11 @@ 'icon' => 'electrical_services', 'controller' => 'plugins', 'action' => 'index' + ], + __d('controller', 'TrafficDetours', [99]) => [ + 'icon' => 'fork_right', + 'controller' => 'traffic_detours', + 'action' => 'index' ] ]; ?> @@ -380,7 +411,7 @@
  • ' . $cfg['icon'] . '' - . '' . $label . ''; + . '' . $label . ''; print $this->Html->link( $linkContent, ['plugin' => null, @@ -416,6 +447,22 @@
    • +
  • + Url->build([ + 'plugin' => null, + 'controller' => 'apis', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ] + ]); + ?> + + + + +
  • Url->build( @@ -432,14 +479,60 @@
    • +
  • + Url->build([ + 'plugin' => null, + 'controller' => 'authenticators', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ] + ]); + ?> + + + + +
    • Data Filters
  • External Identity Sources
    • -
  • Pipelines
    • -
  • Plugins
  • Services
  • Terms and Conditions
    • */ ?> +
  • + Url->build( + ['plugin' => null, + 'controller' => 'identifier_assignments', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ]] + ); + ?> + + +
    +     +
    • +
  • + Url->build( + ['plugin' => null, + 'controller' => 'servers', + 'action' => 'index', + '?' => [ + 'co_id' => $vv_cur_co->id + ]] + ); + ?> + + +
    +     +
  • Url->build( diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index aeda2d9e6..47f42ea52 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -600,14 +600,18 @@ ul.form-list li.alert-banner .co-alert { padding: 0; font-weight: 500; } +#main-menu .menu-panel-links > li { + border: 1px solid var(--cmg-color-body-bg); +} +#main-menu .menu-panel-links > li:hover { + border: 1px solid var(--cmg-color-bg-006); +} #main-menu a.menu-panel-primary-link { display: flex; align-items: center; - border: 1px solid var(--cmg-color-body-bg); } #main-menu .menu-panel-links a.menu-panel-primary-link:hover { background-color: transparent; - border: 1px solid var(--cmg-color-bg-006); } #main-menu .menu-panel-links a.menu-panel-primary-link:hover h3 { text-decoration: underline; @@ -647,16 +651,39 @@ ul.form-list li.alert-banner .co-alert { .menu-panel-link-desc { color: var(--cmg-color-body-txt); } +#main-menu ul.menu-panel-links li:has(.menu-panel-submenu) a.menu-panel-primary-link { + padding: 0.5em 1em 0 1em; +} +#main-menu ul.menu-panel-submenu { + padding: 0; + margin: 0 0 0 4.5em; +} +#main-menu ul.menu-panel-links ul.menu-panel-submenu li a { + gap: 0.25em; + padding: 0.5em; + width: max-content; +} +#main-menu .menu-panel-submenu .material-symbols, +#main-menu .menu-panel-submenu .material-symbols-outlined { + margin: 0; + font-size: 1em; +} .menu-panel-sidepanel { padding: 0 1em 2em 1.25em; } #main-menu .menu-panel-sidepanel h3 { margin-bottom: 0.5em; } -#main-menu a.menu-panel-secondary-link { +#main-menu #menu-panel-config li, +#main-menu #menu-panel-config li:hover, +#main-menu .menu-panel-sidepanel li, +#main-menu .menu-panel-sidepanel li:hover { + border: none; +} +#main-menu .menu-panel-sidepanel a { display: flex !important; align-items: center; - padding: 0; + padding: 0 !important; } #main-menu .menu-panel-common-items { margin-top: 1rem; From a9afcf94ecb2b2aa87f9883347dcb809f83c7314 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 8 Oct 2025 08:57:03 -0400 Subject: [PATCH 2/5] Improve platform-notice dark-mode color (NOJIRA) --- app/webroot/css/co-color.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/webroot/css/co-color.css b/app/webroot/css/co-color.css index 333727517..fd9e38c52 100644 --- a/app/webroot/css/co-color.css +++ b/app/webroot/css/co-color.css @@ -149,10 +149,10 @@ html.dark-mode { /* Highlights: Alerts, Notices, and Badges */ --cmg-color-highlight-001: #bc6262; /* forms: required and error icons (red) */ - --cmg-color-highlight-002: #242400; /* forms: focused input (yellow) */ + --cmg-color-highlight-002: #242400; /* forms: focused input (yellow) */ --cmg-color-highlight-003: #0B3556; /* alert: info text color (blue) */ - --cmg-color-highlight-004: #d4ecff; /* search bar active (blue) */ + --cmg-color-highlight-004: #22222a; /* search bar active (blue) */ --cmg-color-highlight-005: #ccc; /* badge light (light gray) */ --cmg-color-highlight-006: #97BF97; /* alert: success (green) */ From 843703bccc995e229d5c0719bb8ec889ee43437e Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 8 Oct 2025 09:10:27 -0400 Subject: [PATCH 3/5] Improve menu-panel submenu (NOJIRA) --- app/templates/element/menuPanel.php | 1 - app/webroot/css/co-base.css | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index e595159de..266fe5b1e 100644 --- a/app/templates/element/menuPanel.php +++ b/app/templates/element/menuPanel.php @@ -261,7 +261,6 @@ ); ?> -
    • diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css index 47f42ea52..3c92d465f 100644 --- a/app/webroot/css/co-base.css +++ b/app/webroot/css/co-base.css @@ -656,12 +656,12 @@ ul.form-list li.alert-banner .co-alert { } #main-menu ul.menu-panel-submenu { padding: 0; - margin: 0 0 0 4.5em; + margin: 0 0 0 4.65em; } #main-menu ul.menu-panel-links ul.menu-panel-submenu li a { gap: 0.25em; padding: 0.5em; - width: max-content; + width: fit-content; } #main-menu .menu-panel-submenu .material-symbols, #main-menu .menu-panel-submenu .material-symbols-outlined { From cfd4720713d1762cc52db1d0d4c1af49de5d7b8d Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 9 Oct 2025 09:21:10 -0400 Subject: [PATCH 4/5] Improve tests for COmanange CO (CFM-218) --- app/templates/ApiUsers/columns.inc | 2 +- app/templates/element/menuPanel.php | 4 ++-- app/templates/layout/default.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/ApiUsers/columns.inc b/app/templates/ApiUsers/columns.inc index f38cd7c1c..8fd2e4db4 100644 --- a/app/templates/ApiUsers/columns.inc +++ b/app/templates/ApiUsers/columns.inc @@ -26,7 +26,7 @@ */ // Output advisory banner when co=1 -if($vv_cur_co->id == 1) { +if($vv_cur_co->isCOmanageCO()) { $banners = [ __d('information','api.cmp') ]; diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index 266fe5b1e..c88d72e87 100644 --- a/app/templates/element/menuPanel.php +++ b/app/templates/element/menuPanel.php @@ -356,7 +356,7 @@
    - id == 1): ?> + isCOmanageCO()): ?>
  • Url->build([ @@ -381,7 +381,7 @@

    - id == 1): ?> + isCOmanageCO()): ?> [ diff --git a/app/templates/layout/default.php b/app/templates/layout/default.php index 22d583ea1..8c92ccb1e 100644 --- a/app/templates/layout/default.php +++ b/app/templates/layout/default.php @@ -118,7 +118,7 @@ // add hints that we're in the platform-level (COmanage) CO $isPlatformCO = false; - if(!empty($vv_cur_co) && ($vv_cur_co->id == 1) && !($vv_controller == 'Cos' && $vv_action == 'select')) { + if(!empty($vv_cur_co) && ($vv_cur_co->isCOmanageCO()) && !($vv_controller == 'Cos' && $vv_action == 'select')) { $isPlatformCO = true; $bodyClasses .= ' platform-co'; } From 8d323ac07b544b946d0b0010a6b382ccef13d821 Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Thu, 9 Oct 2025 09:47:53 -0400 Subject: [PATCH 5/5] De-emphasize "Authentication Events" in panel menus (CFM-218) --- app/resources/locales/en_US/menu.po | 3 ++ app/templates/element/menuPanel.php | 45 +++++++++++++++++------------ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index 76405d7c5..caf73c689 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -231,6 +231,9 @@ msgstr "my canvas" msgid "registries" msgstr "Available {0} Registries" +msgid "related.artifacts" +msgstr "Related Artifacts" + msgid "related.configurations" msgstr "Related Configurations" diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php index c88d72e87..5b6c66297 100644 --- a/app/templates/element/menuPanel.php +++ b/app/templates/element/menuPanel.php @@ -356,26 +356,33 @@
    • - isCOmanageCO()): ?> -
  • - Url->build([ - 'plugin' => null, - 'controller' => 'authentication_events', - 'action' => 'index', - 'platform' => true - ]); - ?> - - -
    -

    -
    -
    -     -
    • - + + isCOmanageCO()): ?> +
    +

    + +

    +
    +
      +
    • + Url->build([ + 'plugin' => null, + 'controller' => 'authentication_events', + 'action' => 'index', + 'platform' => true + ]); + ?> + + +
      +       +
      • +
    +
    +
    +