From ea9cc59733c465b28fce066129f944cdd738b662 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Fri, 8 Mar 2024 11:33:47 -0500
Subject: [PATCH] Add main-menu navigation for Petitions and Enrollments
 (CFM-31)

---
 app/resources/locales/en_US/menu.po         |  2 +-
 app/src/Controller/DashboardsController.php |  2 +-
 app/templates/element/menuPanel.php         | 44 ++++++++++++++-------
 app/webroot/css/co-base.css                 |  5 ++-
 4 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po
index 72e4011aa..bed987561 100644
--- a/app/resources/locales/en_US/menu.po
+++ b/app/resources/locales/en_US/menu.po
@@ -112,7 +112,7 @@ msgid "co.people.enrollments.pending"
 msgstr "Pending Enrollments"
 
 msgid "co.people.enrollments.pending.desc"
-msgstr "See and manage in-progress enrollments (CO Petitions)"
+msgstr "See and manage pending enrollments"
 
 msgid "co.people.external.source.records"
 msgstr "External Source Records"
diff --git a/app/src/Controller/DashboardsController.php b/app/src/Controller/DashboardsController.php
index 263ab6db6..c43f07f30 100644
--- a/app/src/Controller/DashboardsController.php
+++ b/app/src/Controller/DashboardsController.php
@@ -201,7 +201,7 @@ public function configuration() {
         'action'        => 'index'
       ],
       __d('controller', 'Petitions', [99]) => [
-        'icon'          => 'receipt_long',
+        'icon'          => 'pending_actions',
         'controller'    => 'petitions',
         'action'        => 'index'
       ]
diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php
index d4065b255..7c31fa666 100644
--- a/app/templates/element/menuPanel.php
+++ b/app/templates/element/menuPanel.php
@@ -50,13 +50,11 @@
             </div>
           </a>
         </li>
-        <?php 
-          /* XXX Enable highlighted menu items as needed:
         <li>
           <?php
             $menuUrl = $this->Url->build(
               ['plugin'       => null,
-               'controller'   => 'people',
+               'controller'   => 'petitions',
                'action'       => 'index',
                '?'            => [
                  'co_id' => $vv_cur_co->id
@@ -66,12 +64,11 @@
           <a href="<?= $menuUrl ?>" class="menu-panel-primary-link">
             <div class="material-icons-outlined" aria-hidden="true">pending_actions</div>
             <div class="menu-panel-primary-link-text">
-              <h3><?= __d('menu','co.people.enrollments.pending') ?></h3>
+              <h3><?= __d('controller', 'Petitions', [99]) ?></h3>
               <div class="menu-panel-link-desc"><?= __d('menu','co.people.enrollments.pending.desc') ?></div>
             </div>
           </a>
         </li>
-        */ ?>
       </ul>
       
       <?php /* XXX These sidepanel links are disabled until needed, but we will leave them in the code to 
@@ -86,8 +83,24 @@
         <div class="menu-panel-sidepanel-content">
           <ul class="menu-panel-links menu-panel-links-inner">
             <?php /* Placeholders below. Replace with real links and text replacement:
-            <li><a href="#"><em class="material-icons" aria-hidden="true">lock</em> Authenticators</a></li>
-            <li><a href="#"><em class="material-icons" aria-hidden="true">forward</em> Enrollment Flows</a></li>
+            <li><a href="#"><em class="material-icons" aria-hidden="true">lock</em> Authenticators</a></li> */ ?>
+            <li>
+              <?php
+                $menuUrl = $this->Url->build(
+                  ['plugin'       => null,
+                   'controller'   => 'enrollment_flows',
+                   'action'       => 'index',
+                   '?'            => [
+                     'co_id' => $vv_cur_co->id
+                   ]]
+                );
+              ?>
+              <a href="<?= $menuUrl ?>" class="menu-panel-secondary-link">
+                <div class="material-icons" aria-hidden="true">subscriptions</div>
+                <div class="menu-panel-secondary-link-title"><?= __d('controller', 'EnrollmentFlows', [99]) ?></div>
+              </a>
+            </li>
+            <?php /*
             <li><a href="#"><em class="material-icons" aria-hidden="true">access_alarm</em> Expiration Policies</a></li>
             <li><a href="#"><em class="material-icons" aria-hidden="true">developer_board</em> Extended Attributes</a></li>
             */ ?>
@@ -102,7 +115,10 @@
                    ]]
                 );
               ?>
-              <a href="<?= $menuUrl ?>"><em class="material-icons" aria-hidden="true">badge</em> <?= __d('controller', 'IdentifierAssignments', [99]) ?></a>
+              <a href="<?= $menuUrl ?>" class="menu-panel-secondary-link">
+                <div class="material-icons" aria-hidden="true">badge</div>
+                <div class="menu-panel-secondary-link-title"><?= __d('controller', 'IdentifierAssignments', [99]) ?></div>
+              </a>
             </li>
             <?php /*
             <li><a href="#"><em class="material-icons" aria-hidden="true">check_circle</em> Identifier Validators</a></li>
@@ -259,9 +275,9 @@
                    ]]
                 );
               ?>
-              <a href="<?= $menuUrl ?>" class="nospin">
-                <em class="material-icons" aria-hidden="true">assignment</em> 
-                <?= __d('controller','ExtIdentitySourceRecords', [99]) ?>
+              <a href="<?= $menuUrl ?>" class="menu-panel-secondary-link">
+                <div class="material-icons" aria-hidden="true">assignment</div>
+                <div class="menu-panel-secondary-link-title"><?= __d('controller','ExtIdentitySourceRecords', [99]) ?></div>
               </a>
             </li>
             <li>
@@ -275,9 +291,9 @@
                    ]]
                 );
               ?>
-              <a href="<?= $menuUrl ?>" class="nospin">
-                <em class="material-icons" aria-hidden="true">computer</em>
-                <?= __d('controller','Servers', [2]) ?>
+              <a href="<?= $menuUrl ?>" class="menu-panel-secondary-link">
+                <div class="material-icons" aria-hidden="true">computer</div>
+                <div class="menu-panel-secondary-link-title"><?= __d('controller','Servers', [2]) ?></div>
               </a>
             </li>
           </ul>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 6c5d48340..7759efe9c 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -618,8 +618,9 @@ ul.form-list li.alert-banner .co-alert {
 #main-menu .menu-panel-sidepanel h3 {
   margin-bottom: 0.5em;
 }
-#main-menu .menu-panel-sidepanel ul li a {
-  display: inline;
+#main-menu a.menu-panel-secondary-link {
+  display: flex !important;
+  align-items: center;
   padding: 0;
 }
 #main-menu .menu-panel-common-items {