From 2413542edf1fc33084c7cda6650b154d722f7657 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Thu, 12 Jan 2023 17:13:05 -0500
Subject: [PATCH] Ensure flash messages are available on all pages. (CO-2229)

---
 app/templates/Matchgrids/configure.php | 66 +++++++++++++++-----------
 app/templates/Matchgrids/delete.php    |  2 +-
 app/templates/Matchgrids/manage.php    | 11 +++++
 app/templates/Matchgrids/pending.php   | 13 ++++-
 app/templates/Matchgrids/reconcile.php |  2 +-
 app/templates/Matchgrids/select.php    |  2 +-
 app/templates/Standard/index.php       | 14 +++---
 app/webroot/css/co-base.css            |  4 +-
 app/webroot/css/co-color.css           |  4 +-
 9 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/app/templates/Matchgrids/configure.php b/app/templates/Matchgrids/configure.php
index f874093a2..b60485e26 100644
--- a/app/templates/Matchgrids/configure.php
+++ b/app/templates/Matchgrids/configure.php
@@ -1,38 +1,50 @@
 <?php
-  /**
-   * COmanage Match Matchgrid Configure Template
-   *
-   * Portions licensed to the University Corporation for Advanced Internet
-   * Development, Inc. ("UCAID") under one or more contributor license agreements.
-   * See the NOTICE file distributed with this work for additional information
-   * regarding copyright ownership.
-   *
-   * UCAID licenses this file to you under the Apache License, Version 2.0
-   * (the "License"); you may not use this file except in compliance with the
-   * License. You may obtain a copy of the License at:
-   *
-   * http://www.apache.org/licenses/LICENSE-2.0
-   *
-   * Unless required by applicable law or agreed to in writing, software
-   * distributed under the License is distributed on an "AS IS" BASIS,
-   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   * See the License for the specific language governing permissions and
-   * limitations under the License.
-   *
-   * @link          http://www.internet2.edu/comanage COmanage Project
-   * @package       match
-   * @since         COmanage Match v1.0.0
-   * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-   */
-
-  declare(strict_types = 1);
+/**
+ * COmanage Match Matchgrid Configure Template
+ *
+ * Portions licensed to the University Corporation for Advanced Internet
+ * Development, Inc. ("UCAID") under one or more contributor license agreements.
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @link          http://www.internet2.edu/comanage COmanage Project
+ * @package       match
+ * @since         COmanage Match v1.0.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+declare(strict_types = 1);
+
+// $flashArgs pass banner messages to the flash element container
+$flashArgs = [];
+if(!empty($indexBanners)) {
+  $flashArgs['vv_index_banners'] = $indexBanners;
+}
+if(!empty($banners)) {
+  $flashArgs['vv_banners'] = $banners;
+}
 ?>
+
 <div class="pageTitleContainer">
   <div class="pageTitle">
     <h1><?= $vv_title; ?></h1>
   </div>
 </div>
 
+<?= $this->element('flash', $flashArgs); ?>
+
 <?= __('match.meta.version', [chop(file_get_contents(CONFIG . DS . "VERSION"))]); ?>
 
 <section class="inner-content">
diff --git a/app/templates/Matchgrids/delete.php b/app/templates/Matchgrids/delete.php
index 72ec888df..96fba000b 100644
--- a/app/templates/Matchgrids/delete.php
+++ b/app/templates/Matchgrids/delete.php
@@ -28,7 +28,7 @@
 declare(strict_types = 1);
 
 ?>
-<div class="titleNavContainer">
+<div class="pageTitleContainer">
   <div class="pageTitle">
     <h1><?= $vv_title; ?></h1>
   </div>
diff --git a/app/templates/Matchgrids/manage.php b/app/templates/Matchgrids/manage.php
index 65524db44..e6f62b9d1 100644
--- a/app/templates/Matchgrids/manage.php
+++ b/app/templates/Matchgrids/manage.php
@@ -26,6 +26,15 @@
  */
 
 declare(strict_types = 1);
+  
+// $flashArgs pass banner messages to the flash element container
+$flashArgs = [];
+if(!empty($indexBanners)) {
+  $flashArgs['vv_index_banners'] = $indexBanners;
+}
+if(!empty($banners)) {
+  $flashArgs['vv_banners'] = $banners;
+}
 ?>
 <div class="pageTitleContainer">
   <div class="pageTitle">
@@ -63,6 +72,8 @@
     </p>
   <?php endif; ?>
   
+  <?= $this->element('flash', $flashArgs); ?>
+  
   <!-- Matchgrid Management -->
   <div id="matchgrid-management" class="call-to-action-blocks">
     <div class="call-to-action">
diff --git a/app/templates/Matchgrids/pending.php b/app/templates/Matchgrids/pending.php
index bb3e6aacb..95d3e3c72 100644
--- a/app/templates/Matchgrids/pending.php
+++ b/app/templates/Matchgrids/pending.php
@@ -26,14 +26,25 @@
  */
 
 declare(strict_types = 1);
+  
+// $flashArgs pass banner messages to the flash element container
+$flashArgs = [];
+if(!empty($indexBanners)) {
+  $flashArgs['vv_index_banners'] = $indexBanners;
+}
+if(!empty($banners)) {
+  $flashArgs['vv_banners'] = $banners;
+}
 ?>
 
-<div class="titleNavContainer">
+<div class="pageTitleContainer">
   <div class="pageTitle">
     <h1><?= $vv_title; ?></h1>
   </div>
 </div>
 
+<?= $this->element('flash', $flashArgs); ?>
+
 <h2><?= __('match.rs.pending', [count($vv_pending)]); ?></h2>
 
 <table>
diff --git a/app/templates/Matchgrids/reconcile.php b/app/templates/Matchgrids/reconcile.php
index 0f401fd0a..4f2856a0b 100644
--- a/app/templates/Matchgrids/reconcile.php
+++ b/app/templates/Matchgrids/reconcile.php
@@ -86,7 +86,7 @@
   $canAttr = array_merge($canAttr, $tempArr);
 ?>
 
-<div class="titleNavContainer">
+<div class="pageTitleContainer">
   <div class="pageTitle">
     <h1><?= __('match.op.reconcile.requests'); ?></h1>
   </div>
diff --git a/app/templates/Matchgrids/select.php b/app/templates/Matchgrids/select.php
index fbe116a5d..b4b7ff3eb 100644
--- a/app/templates/Matchgrids/select.php
+++ b/app/templates/Matchgrids/select.php
@@ -29,7 +29,7 @@
 
 use \App\Lib\Enum\PermissionEnum;
 ?>
-<div class="titleNavContainer">
+<div class="pageTitleContainer">
   <div class="pageTitle">
     <h1><?= $vv_title; ?></h1>
   </div>
diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php
index 804f7739a..592154357 100644
--- a/app/templates/Standard/index.php
+++ b/app/templates/Standard/index.php
@@ -85,13 +85,13 @@ function _column_key($modelsName, $c, $tz=null) {
 }
 
 // $flashArgs pass banner messages to the flash element container
-  $flashArgs = [];
-  if(!empty($indexBanners)) {
-    $flashArgs['vv_index_banners'] = $indexBanners;
-  }
-  if(!empty($banners)) {
-    $flashArgs['vv_banners'] = $banners;
-  }
+$flashArgs = [];
+if(!empty($indexBanners)) {
+  $flashArgs['vv_index_banners'] = $indexBanners;
+}
+if(!empty($banners)) {
+  $flashArgs['vv_banners'] = $banners;
+}
 ?>
 
 <?php if(!empty($subnav)): ?>
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 2d8b433cd..a14d7353a 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -394,8 +394,8 @@ ul.form-list li.alert-banner .co-alert {
 .co-info-topbox {
   clear: both;
   padding: 1em;
-  background-color: var(--cmg-color-yellow-002);
-  border: 1px solid var(--cmg-color-lightgray-005);
+  background-color: var(--cmg-color-yellow-001);
+  border: 1px solid var(--cmg-color-yellow-003);
   margin-bottom: 1em;
 }
 #lastLogin p {
diff --git a/app/webroot/css/co-color.css b/app/webroot/css/co-color.css
index 90fc7a5d8..cbe51a0b9 100644
--- a/app/webroot/css/co-color.css
+++ b/app/webroot/css/co-color.css
@@ -69,11 +69,13 @@
   --cmg-color-yellow-003: #f6f5ae;    /* alert: warning border color */
   --cmg-color-yellow-004: #ffd;       /* forms: focused input */
   
-  --cmg-color-red-001: #fcc;          /* red warning */
+  --cmg-color-red-001: #ffd4d4;       /* alert: danger */
   --cmg-color-red-002: #c00;          /* forms: error icons */
   --cmg-color-red-003: #e33;          /* title for deleted/archived */
   --cmg-color-red-004: #c33;          /* button */
   --cmg-color-red-005: #dc3545;       /* danger badge */
+  --cmg-color-red-006: #842029;       /* alert: danger text color */
+  --cmg-color-red-007: #f8cece;       /* alert: danger border color */
 
   --cmg-color-white: #fff;            /* white */
   --cmg-color-black: #000;            /* black */