From ac1fc55f649107116a6b3ec3f370292f0d20a819 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Sun, 9 Feb 2025 18:39:57 -0500
Subject: [PATCH 1/2] Add status and timestamp to Petition enrollment steps.
 Move Enrollment Flows to a more prominent position in the People menu panel. 
 (CFM-422)

---
 app/resources/locales/en_US/menu.po |  3 +++
 app/templates/Petitions/fields.inc  | 38 ++++++++++++++++++++---------
 app/templates/element/menuPanel.php | 35 ++++++++++++++------------
 app/webroot/css/co-base.css         |  3 +++
 4 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po
index 5d8995a1..75c56d4e 100644
--- a/app/resources/locales/en_US/menu.po
+++ b/app/resources/locales/en_US/menu.po
@@ -114,6 +114,9 @@ msgstr "Pending Enrollments"
 msgid "co.people.enrollments.pending.desc"
 msgstr "See and manage pending enrollments"
 
+msgid "co.people.enrollment.flows.desc"
+msgstr "Bring new People into your population interactively"
+
 msgid "co.people.external.source.records"
 msgstr "External Source Records"
 
diff --git a/app/templates/Petitions/fields.inc b/app/templates/Petitions/fields.inc
index 774b6f0a..f350aab0 100644
--- a/app/templates/Petitions/fields.inc
+++ b/app/templates/Petitions/fields.inc
@@ -260,18 +260,32 @@ if (!empty($vv_obj?->petitioner_person?->id)) {
         </div>
       </div>
       <div class="field-info">
-        <div class="petition-step-info"><?= !empty($result) ? $result[0]->comment : '' ?></div>
-        <button class="cm-toggle nospin petition-step-toggle collapsed"
-                type="button"
-                data-bs-toggle="collapse"
-                aria-label="<?= __d('information','petition.step.toggle.details') ?>"      
-                aria-expanded="false"
-                aria-controls="collapse-box-<?= $step->id ?>"
-                data-bs-target="#collapse-box-<?= $step->id ?>">
-          <em class="material-symbols-outlined petition-step-collapse-icon" aria-hidden="true">
-            arrow_drop_down
-          </em>
-        </button>
+        <div class="petition-step-info">
+          <?= !empty($result) ? $result[0]->comment : '' ?>
+        </div>
+        <div class="petition-step-meta">
+          <span class="petition-step-modified">
+            <?= __d('field','modified') . ' ' . $step->modified ?>
+          </span>
+          <?php
+            $stepStatusClass = 'petition-step-status badge ';
+            $stepStatusClass .= ($step->status == 'A' ? ' bg-outline-secondary primary' : 'bg-danger');
+          ?>
+          <span class="<?= $stepStatusClass ?>">
+            <?= __d('enumeration', 'SuspendableStatusEnum.' . $step->status) ?>
+          </span>
+          <button class="cm-toggle nospin petition-step-toggle collapsed"
+                  type="button"
+                  data-bs-toggle="collapse"
+                  aria-label="<?= __d('information','petition.step.toggle.details') ?>"      
+                  aria-expanded="false"
+                  aria-controls="collapse-box-<?= $step->id ?>"
+                  data-bs-target="#collapse-box-<?= $step->id ?>">
+            <em class="material-symbols-outlined petition-step-collapse-icon" aria-hidden="true">
+              arrow_drop_down
+            </em>
+          </button>
+        </div>
       </div>
     </div>
     <div id="collapse-box-<?= $step->id ?>" class="petition-attrs collapse">
diff --git a/app/templates/element/menuPanel.php b/app/templates/element/menuPanel.php
index 19638241..3988d8cb 100644
--- a/app/templates/element/menuPanel.php
+++ b/app/templates/element/menuPanel.php
@@ -69,6 +69,25 @@
             </div>
           </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-primary-link">
+            <div class="material-symbols-outlined" aria-hidden="true">subscriptions</div>
+            <div class="menu-panel-primary-link-text">
+              <h3><?= __d('controller', 'EnrollmentFlows', [99]) ?></h3>
+              <div class="menu-panel-link-desc"><?= __d('menu','co.people.enrollment.flows.desc') ?></div>
+            </div>
+          </a>
+        </li>
       </ul>
       
       <?php /* XXX These sidepanel links are disabled until needed, but we will leave them in the code to 
@@ -84,22 +103,6 @@
           <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-symbols" 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-symbols-outlined" 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-symbols" aria-hidden="true">access_alarm</em> Expiration Policies</a></li>
             <li><a href="#"><em class="material-symbols" aria-hidden="true">developer_board</em> Extended Attributes</a></li>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 5f73e189..59f461b8 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -2137,6 +2137,9 @@ ul.form-list li.petition-enrollee-items .petition-inline-value,
 ul.form-list li.petition-enrollee-items .petition-inline-value a {
   font-family: var(--cmg-font-semibold);
 }
+.petition-step-modified {
+  margin-right: 1em;
+}
 .petition-attrs {
   padding: 0;
 }

From 7d79e21c97f09cc060ee0693fde3e339ebccb991 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Mon, 10 Feb 2025 11:33:59 -0500
Subject: [PATCH 2/2] Simplify timestamp on the Petition's Enrollment Step row
 (CFM-422)

---
 app/templates/Petitions/fields.inc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/templates/Petitions/fields.inc b/app/templates/Petitions/fields.inc
index f350aab0..78d64075 100644
--- a/app/templates/Petitions/fields.inc
+++ b/app/templates/Petitions/fields.inc
@@ -265,14 +265,7 @@ if (!empty($vv_obj?->petitioner_person?->id)) {
         </div>
         <div class="petition-step-meta">
           <span class="petition-step-modified">
-            <?= __d('field','modified') . ' ' . $step->modified ?>
-          </span>
-          <?php
-            $stepStatusClass = 'petition-step-status badge ';
-            $stepStatusClass .= ($step->status == 'A' ? ' bg-outline-secondary primary' : 'bg-danger');
-          ?>
-          <span class="<?= $stepStatusClass ?>">
-            <?= __d('enumeration', 'SuspendableStatusEnum.' . $step->status) ?>
+            <?= $step->modified ?>
           </span>
           <button class="cm-toggle nospin petition-step-toggle collapsed"
                   type="button"