From ba3a92c19cdda67242df8640689183581c3d4f7f Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 27 Oct 2021 15:47:16 -0700
Subject: [PATCH] Fixed accessibility issues, fixed caret icon

---
 View/CoGrouperLites/display.ctp             | 4 ++--
 View/Elements/Components/subscriberList.ctp | 2 +-
 View/GrouperGroups/emaillistsmanage.ctp     | 2 +-
 View/GrouperGroups/groupmember.ctp          | 5 +++++
 View/GrouperGroups/groupowner.ctp           | 6 ++++++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp
index f112905..ed399f5 100644
--- a/View/CoGrouperLites/display.ctp
+++ b/View/CoGrouperLites/display.ctp
@@ -48,7 +48,7 @@ echo $this->element('GrouperLite.base-styles');
                         </div>
                     </div>
                     <div class="col-xs-12 col-md-6 col-lg-4">
-                        <h6 class="text-center mb-2 mt-2"><i class="fa fa-users"></i>&nbsp; <?php echo _txt('pl.grouperlite.dashboard.heading.groups'); ?></h6>
+                        <h3 class="text-center mb-2 mt-2 h6"><i class="fa fa-users"></i>&nbsp; <?php echo _txt('pl.grouperlite.dashboard.heading.groups'); ?></h3>
                         <div class="px-4 d-flex flex-column justify-content-center align-items-center">
                             <a class="btn btn-primary btn-block text-nowrap" href="<?php print $this->Html->url(
                                                                                         array(
@@ -88,7 +88,7 @@ echo $this->element('GrouperLite.base-styles');
                         </div>
                     </div>
                     <div class="col-xs-12 col-md-6 col-lg-4 border-left">
-                        <h6 class="text-center mb-2 mt-2"><i class="fa fa-envelope"></i>&nbsp; <?php echo _txt('pl.grouperlite.dashboard.heading.email-lists'); ?></h6>
+                        <h3 class="text-center mb-2 mt-2 h6"><i class="fa fa-envelope"></i>&nbsp; <?php echo _txt('pl.grouperlite.dashboard.heading.email-lists'); ?></h3>
                         <div class="px-4 d-flex flex-column justify-content-center align-items-center">
                             <a class="btn btn-secondary btn-block text-nowrap" href="<?php print $this->Html->url(
                                                                                             array(
diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp
index fcbec65..d2ed38f 100644
--- a/View/Elements/Components/subscriberList.ctp
+++ b/View/Elements/Components/subscriberList.ctp
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-dialog-scrollable">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="modal-title"><?php echo _txt('pl.grouperlite.group.info.members-heading'); ?></h5>
+                <h3 class="modal-title h5" id="modal-title"><?php echo _txt('pl.grouperlite.group.info.members-heading'); ?></h3>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                     <span class="sr-only">Close</span>
diff --git a/View/GrouperGroups/emaillistsmanage.ctp b/View/GrouperGroups/emaillistsmanage.ctp
index 7657544..6eadf4e 100644
--- a/View/GrouperGroups/emaillistsmanage.ctp
+++ b/View/GrouperGroups/emaillistsmanage.ctp
@@ -52,6 +52,6 @@
 <?php endif; ?>
 <?php if (count($emailgroups) < 1) : ?>
     <div class="alert alert-info">
-        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.working-groups.zero-state'); ?></p>
+        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.email-lists.zero-state'); ?></p>
     </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index c5d6d16..a63549b 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -88,6 +88,11 @@ $numColumns = count($columns);
                         </button>
                     </td>
                 </tr>
+                <?php if (!count($wggroup)) : ?>
+                    <tr class="table-light collapse collapse-wg-working-group-parent show">
+                        <td colspan="5" class="text-center">No working groups.</td>
+                    </tr>
+                <?php endif; ?>
                 <?php foreach ($wgmemberships as $wggroup) : ?>
                     <tr class="table-light collapse collapse-wg-working-group-parent show">
                         <td colspan="<?php echo $numColumns - 2; ?>">
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 6484834..fecbb2a 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -101,6 +101,11 @@ $numColumns = count($columns);
             </button>
           </td>
         </tr>
+        <?php if (!count($wgowner)) : ?>
+          <tr class="table-light collapse collapse-wg-working-group-parent show">
+            <td colspan="5" class="text-center">No working groups.</td>
+          </tr>
+        <?php endif; ?>
         <?php foreach ($wgowners as $wgowner) : ?>
           <tr class="table-light collapse collapse-wg-working-group-parent show">
             <td colspan="<?php echo $numColumns; ?>">
@@ -110,6 +115,7 @@ $numColumns = count($columns);
               </button>
             </td>
           </tr>
+
           <?php foreach ($wgowner['Groups'] as $key => $group) : ?>
             <tr class="collapse collapse-wg-<?php echo $wgowner['WGName']; ?> collapse-wg-working-group" id="collapse-wg-<?php echo $wgowner['WGName'] . '-' . $key; ?>">
               <td class="pl-3"><?php echo $group['WGApp'] ?? "No Name"; ?></td>