From 36f63dab7341d31c6e4acd0fdb3717ef44d64ebf Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Wed, 7 Jul 2021 09:26:01 -0700
Subject: [PATCH] Updated layout

---
 Lib/lang.php                       |   1 +
 View/GrouperGroups/groupmember.ctp |  69 +++++-----
 View/GrouperGroups/groupoptin.ctp  | 172 +++++++++++++------------
 View/GrouperGroups/groupowner.ctp  | 196 +++++++++++++++--------------
 4 files changed, 237 insertions(+), 201 deletions(-)

diff --git a/Lib/lang.php b/Lib/lang.php
index 0eaeaea..3071470 100644
--- a/Lib/lang.php
+++ b/Lib/lang.php
@@ -52,6 +52,7 @@
 
   'pl.grouperlite.table.name'  => 'Name',
   'pl.grouperlite.table.description'  => 'Description',
+  'pl.grouperlite.table.role'  => 'Role',
   'pl.grouperlite.table.status'  => 'Status',
   'pl.grouperlite.table.action'  => 'Action',
   'pl.grouperlite.table.open' => 'Access',
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 9074a6d..6c51d8d 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -2,6 +2,15 @@
 <?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.memberships')); ?>
 <?php echo $this->element('GrouperLite.Components/navigation-groups', array('active' => 'groupmember')); ?>
 <?php echo $this->element('GrouperLite.Components/search', array('active' => 'groupmember')); ?>
+<?php
+$columns = [
+    'name' => 'pl.grouperlite.table.name',
+    'role' => 'pl.grouperlite.table.role',
+    'description' => 'pl.grouperlite.table.description',
+    'action' => 'pl.grouperlite.table.action'
+];
+$numColumns = count($columns);
+?>
 <?php if (count($groupmemberships) > 0 || count($wgmemberships) > 0) : ?>
     <div class="">
         <?php print $this->element("pagination", array(
@@ -14,12 +23,15 @@
         <table class="table table-striped w-100 mb-0">
             <thead>
                 <tr>
-                    <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
-                    <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
-                    <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
+                    <?php foreach ($columns as $key => $label) : ?>
+                        <th class="group <?php echo $key === 'action' ? $key . ' text-center' : $key; ?>"><?php echo _txt($label); ?></th>
+                    <?php endforeach; ?>
                 </tr>
             </thead>
             <tbody>
+                <tr>
+                    <td colspan="<?php echo $numColumns; ?>">Ad-hoc groups</td>
+                </tr>
                 <?php foreach ($groupmemberships as $key => $group) : ?>
                     <tr>
                         <td><a href="<?php echo $this->Html->url(
@@ -29,6 +41,7 @@
                                                 '?' => array('groupname' => urlencode($group['name']))
                                             )
                                         ) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['friendlyName'] ?? "No Name"; ?></a></td>
+                        <td>&mdash;</td>
                         <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
                         <td>
                             <?php echo $group['optOut'] ? $this->element('GrouperLite.Components/optAction', array(
@@ -40,35 +53,35 @@
                         </td>
                     </tr>
                 <?php endforeach; ?>
+            </tbody>
+            <tbody>
                 <?php foreach ($wgmemberships as $wggroup) : ?>
                     <tr>
-                        <td colspan="3">
-                          <?php echo $wggroup['WGName'] ?? "No Name"; ?>
-                            <table>
-                                <?php foreach ($wggroup['Groups'] as $key => $group) : ?>
-                                    <tr>
-                                        <td><a href="<?php echo $this->Html->url(
-                                            array(
-                                              'controller' => 'grouper_groups',
-                                              'action' => 'groupinfo',
-                                              '?' => array('groupname' => urlencode($group['name']))
-                                            )
-                                          ) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['WGApp'] ?? "No Name"; ?></a></td>
-                                        <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                                        <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                                        <td>
-                                          <?php echo $group['optOut'] ? $this->element('GrouperLite.Components/optAction', array(
-                                            'member' => $group['optOut'],
-                                            'action' => 'leavegroup',
-                                            'group' => $group['name'],
-                                            'idx' => $key
-                                          )) : ''; ?>
-                                        </td>
-                                    </tr>
-                                <?php endforeach; ?>
-                            </table>
+                        <td colspan="<?php echo $numColumns; ?>">
+                            <?php echo $wggroup['WGName'] ?? "No Name"; ?>
                         </td>
                     </tr>
+                    <?php foreach ($wggroup['Groups'] as $key => $group) : ?>
+                        <tr>
+                            <td><a href="<?php echo $this->Html->url(
+                                                array(
+                                                    'controller' => 'grouper_groups',
+                                                    'action' => 'groupinfo',
+                                                    '?' => array('groupname' => urlencode($group['name']))
+                                                )
+                                            ) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['WGApp'] ?? "No Name"; ?></a></td>
+                            <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+                            <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+                            <td>
+                                <?php echo $group['optOut'] ? $this->element('GrouperLite.Components/optAction', array(
+                                    'member' => $group['optOut'],
+                                    'action' => 'leavegroup',
+                                    'group' => $group['name'],
+                                    'idx' => $key
+                                )) : ''; ?>
+                            </td>
+                        </tr>
+                    <?php endforeach; ?>
                 <?php endforeach; ?>
             </tbody>
         </table>
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
index d275e14..c7a6f36 100644
--- a/View/GrouperGroups/groupoptin.ctp
+++ b/View/GrouperGroups/groupoptin.ctp
@@ -2,89 +2,101 @@
 <?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.groups-can-join')); ?>
 <?php echo $this->element('GrouperLite.Components/navigation-groups', array('active' => 'groupoptin')); ?>
 <?php echo $this->element('GrouperLite.Components/search', array('active' => 'groupoptin')); ?>
+<?php
+$columns = [
+  'name' => 'pl.grouperlite.table.name',
+  'role' => 'pl.grouperlite.table.role',
+  'description' => 'pl.grouperlite.table.description',
+  'action' => 'pl.grouperlite.table.action'
+];
+$numColumns = count($columns);
+?>
 <?php if (count($groupoptins) > 0 || count($wgoptins) > 0) : ?>
-    <div class="">
-      <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => false,
-        'numbers' => false,
-        'counter' => true,
-        'class' => 'counter'
-      )); ?>
-        <table class="table table-striped w-100 mb-0">
-            <thead>
+  <div class="">
+    <?php print $this->element("pagination", array(
+      'goto' => false,
+      'limit' => false,
+      'numbers' => false,
+      'counter' => true,
+      'class' => 'counter'
+    )); ?>
+    <table class="table table-striped w-100 mb-0">
+      <thead>
+        <tr>
+          <?php foreach ($columns as $key => $label) : ?>
+            <th class="group <?php echo $key === 'action' ? $key . ' text-center' : $key; ?>"><?php echo _txt($label); ?></th>
+          <?php endforeach; ?>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td colspan="<?php echo $numColumns; ?>">Ad-hoc groups</td>
+        </tr>
+        <?php foreach ($groupoptins as $key => $group) : ?>
+          <tr>
+            <td><a href="<?php echo $this->Html->url(
+                            array(
+                              'controller' => 'grouper_groups',
+                              'action' => 'groupinfo',
+                              '?' => array('groupname' => urlencode($group['name']))
+                            )
+                          ) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['friendlyName'] ?? "No Name"; ?></a>
+            </td>
+            <td>&mdash;</td>
+            <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+            <td>
+              <?php echo $this->element('GrouperLite.Components/optAction', array(
+                'member' => $group['member'],
+                'action' => 'joingroup',
+                'group' => $group['name'],
+                'idx' => $key
+              )); ?>
+            </td>
+          </tr>
+        <?php endforeach; ?>
+      </tbody>
+      <tbody>
+        <?php foreach ($wgoptins as $wgoptin) : ?>
+          <tr>
+            <td colspan="<?php echo $numColumns; ?>">
+              <?php echo $wgoptin['WGName'] ?? "No Name"; ?>
+            </td>
+          </tr>
+          <?php foreach ($wgoptin['Groups'] as $key => $group) : ?>
             <tr>
-                <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
-                <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
-                <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
+              <td><a href="<?php echo $this->Html->url(
+                              array(
+                                'controller' => 'grouper_groups',
+                                'action' => 'groupinfo',
+                                '?' => array('groupname' => urlencode($group['name']))
+                              )
+                            ) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['WGApp'] ?? "No Name"; ?></a>
+              </td>
+              <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+              <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+              <td>
+                <?php echo $this->element('GrouperLite.Components/optAction', array(
+                  'member' => $group['member'],
+                  'action' => 'joingroup',
+                  'group' => $group['name'],
+                  'idx' => $key
+                )); ?>
+              </td>
             </tr>
-            </thead>
-            <tbody>
-            <?php foreach ($groupoptins as $key => $group) : ?>
-                <tr>
-                    <td><a href="<?php echo $this->Html->url(
-                        array(
-                          'controller' => 'grouper_groups',
-                          'action' => 'groupinfo',
-                          '?' => array('groupname' => urlencode($group['name']))
-                        )
-                      ) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['friendlyName'] ?? "No Name"; ?></a>
-                    </td>
-                    <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                    <td>
-                      <?php echo $this->element('GrouperLite.Components/optAction', array(
-                        'member' => $group['member'],
-                        'action' => 'joingroup',
-                        'group' => $group['name'],
-                        'idx' => $key
-                      )); ?>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            <?php foreach ($wgoptins as $wgoptin) : ?>
-                <tr>
-                    <td colspan="3">
-                      <?php echo $wgoptin['WGName'] ?? "No Name"; ?>
-                        <table>
-                          <?php foreach ($wgoptin['Groups'] as $key => $group) : ?>
-                              <tr>
-                                  <td><a href="<?php echo $this->Html->url(
-                                      array(
-                                        'controller' => 'grouper_groups',
-                                        'action' => 'groupinfo',
-                                        '?' => array('groupname' => urlencode($group['name']))
-                                      )
-                                    ) ?>"
-                                         title="<?php echo $group['name']; ?>"><?php echo $group['WGApp'] ?? "No Name"; ?></a>
-                                  </td>
-                                  <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                                  <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                                  <td>
-                                    <?php echo $this->element('GrouperLite.Components/optAction', array(
-                                      'member' => $group['member'],
-                                      'action' => 'joingroup',
-                                      'group' => $group['name'],
-                                      'idx' => $key
-                                    )); ?>
-                                  </td>
-                              </tr>
-                          <?php endforeach; ?>
-                        </table>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            </tbody>
-        </table>
-      <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => true,
-        'numbers' => true,
-        'counter' => false
-      )); ?>
-    </div>
+          <?php endforeach; ?>
+        <?php endforeach; ?>
+      </tbody>
+    </table>
+    <?php print $this->element("pagination", array(
+      'goto' => false,
+      'limit' => true,
+      'numbers' => true,
+      'counter' => false
+    )); ?>
+  </div>
 <?php endif; ?>
 <?php if (count($groupoptins) < 1 && count($wgoptins) < 1) : ?>
-    <div class="alert alert-info">
-        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
-    </div>
+  <div class="alert alert-info">
+    <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
+  </div>
 <?php endif; ?>
\ No newline at end of file
diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
index 05b7892..9277e68 100644
--- a/View/GrouperGroups/groupowner.ctp
+++ b/View/GrouperGroups/groupowner.ctp
@@ -2,102 +2,112 @@
 <?php $this->Html->addCrumb(_txt('pl.grouperlite.nav.groups-presided')); ?>
 <?php echo $this->element('Components/navigation-groups', array('active' => 'groupowner')); ?>
 <?php echo $this->element('Components/search', array('active' => 'groupowner')); ?>
-
+<?php
+$columns = [
+  'name' => 'pl.grouperlite.table.name',
+  'role' => 'pl.grouperlite.table.role',
+  'description' => 'pl.grouperlite.table.description',
+  'status' => 'pl.grouperlite.table.status',
+  'action' => 'pl.grouperlite.table.action'
+];
+$numColumns = count($columns);
+?>
 <?php if (count($groupsowners) > 0 || count($wgowners) > 0) : ?>
-    <div class="">
-      <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => false,
-        'numbers' => false,
-        'counter' => true,
-        'class' => 'counter'
-      )); ?>
-        <table class="table table-striped w-100 mb-0">
-            <thead>
+  <div class="">
+    <?php print $this->element("pagination", array(
+      'goto' => false,
+      'limit' => false,
+      'numbers' => false,
+      'counter' => true,
+      'class' => 'counter'
+    )); ?>
+    <table class="table table-striped w-100 mb-0">
+      <thead>
+        <tr>
+          <?php foreach ($columns as $key => $label) : ?>
+            <th class="group <?php echo $key === 'action' ? $key . ' text-center' : $key; ?>"><?php echo _txt($label); ?></th>
+          <?php endforeach; ?>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td colspan="<?php echo $numColumns; ?>">Ad-hoc groups</td>
+        </tr>
+        <?php foreach ($groupsowners as $group) : ?>
+          <tr>
+            <td><a href="<?php echo $this->Html->url(
+                            array(
+                              'controller' => 'grouper_groups',
+                              'action' => 'groupinfo',
+                              '?' => array('groupname' => urlencode($group['name']))
+                            )
+                          ) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['friendlyName'] ?? "No Name"; ?></a>
+            </td>
+            <td>&mdash;</td>
+            <td><?php echo $group['description'] ?? "No Description"; ?></td>
+            <td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? 'Enabled' : 'Disabled'; ?></td>
+            <td class="text-center">
+              <span class="d-flex flex-column flex-lg-row justify-content-between align-items-center">
+                <button class="btn btn-grouper btn btn-primary btn btn-block" disabled>
+                  <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
+                  <i class="fa fa-pencil fa-sm"></i>
+                </button>
+                <button class="btn btn-grouper btn btn-danger btn btn-block ml-1 mt-0" disabled>
+                  <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
+                  <i class="fa fa-ban fa-sm"></i>
+                </button>
+              </span>
+            </td>
+          </tr>
+        <?php endforeach; ?>
+      </tbody>
+      <tbody>
+        <?php foreach ($wgowners as $wgowner) : ?>
+          <tr>
+            <td colspan="<?php echo $numColumns; ?>">
+              <?php echo $wgowner['WGName'] ?? "No Name"; ?>
+            </td>
+          </tr>
+          <?php foreach ($wgowner['Groups'] as $key => $group) : ?>
             <tr>
-                <th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
-                <th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
-                <th class="group status"><?php echo _txt('pl.grouperlite.table.status'); ?></th>
-                <th class="group action text-center"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
+              <td><a href="<?php echo $this->Html->url(
+                              array(
+                                'controller' => 'grouper_groups',
+                                'action' => 'groupinfo',
+                                '?' => array('groupname' => urlencode($group['name']))
+                              )
+                            ) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['WGApp'] ?? "No Name"; ?></a>
+              </td>
+              <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+              <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+              <td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? 'Enabled' : 'Disabled'; ?></td>
+              <td class="text-center">
+                <span class="d-flex flex-column flex-lg-row justify-content-between align-items-center">
+                  <button class="btn btn-grouper btn btn-primary btn btn-block" disabled>
+                    <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
+                    <i class="fa fa-pencil fa-sm"></i>
+                  </button>
+                  <button class="btn btn-grouper btn btn-danger btn btn-block ml-1 mt-0" disabled>
+                    <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
+                    <i class="fa fa-ban fa-sm"></i>
+                  </button>
+                </span>
+              </td>
             </tr>
-            </thead>
-            <tbody>
-            <?php foreach ($groupsowners as $group) : ?>
-                <tr>
-                    <td><a href="<?php echo $this->Html->url(
-                        array(
-                          'controller' => 'grouper_groups',
-                          'action' => 'groupinfo',
-                          '?' => array('groupname' => urlencode($group['name']))
-                        )
-                      ) ?>"
-                           title="<?php echo $group['name']; ?>"><?php echo $group['friendlyName'] ?? "No Name"; ?></a>
-                    </td>
-                    <td><?php echo $group['description'] ?? "No Description"; ?></td>
-                    <td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? 'Enabled' : 'Disabled'; ?></td>
-                    <td class="text-center">
-                            <span class="d-flex flex-column flex-lg-row justify-content-between align-items-center">
-                                <button class="btn btn-grouper btn btn-primary btn btn-block" disabled>
-                                    <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
-                                    <i class="fa fa-pencil fa-sm"></i>
-                                </button>
-                                <button class="btn btn-grouper btn btn-danger btn btn-block ml-1 mt-0" disabled>
-                                    <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
-                                    <i class="fa fa-ban fa-sm"></i>
-                                </button>
-                            </span>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            <?php foreach ($wgowners as $wgowner) : ?>
-                <tr>
-                    <td colspan="4">
-                      <?php echo $wgowner['WGName'] ?? "No Name"; ?>
-                        <table>
-                          <?php foreach ($wgowner['Groups'] as $key => $group) : ?>
-                              <tr>
-                                  <td><a href="<?php echo $this->Html->url(
-                                      array(
-                                        'controller' => 'grouper_groups',
-                                        'action' => 'groupinfo',
-                                        '?' => array('groupname' => urlencode($group['name']))
-                                      )
-                                    ) ?>"
-                                         title="<?php echo $group['name']; ?>"><?php echo $group['WGApp'] ?? "No Name"; ?></a>
-                                  </td>
-                                  <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                                  <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                                  <td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? 'Enabled' : 'Disabled'; ?></td>
-                                  <td class="text-center">
-                                    <span class="d-flex flex-column flex-lg-row justify-content-between align-items-center">
-                                        <button class="btn btn-grouper btn btn-primary btn btn-block" disabled>
-                                            <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
-                                            <i class="fa fa-pencil fa-sm"></i>
-                                        </button>
-                                        <button class="btn btn-grouper btn btn-danger btn btn-block ml-1 mt-0" disabled>
-                                            <?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
-                                            <i class="fa fa-ban fa-sm"></i>
-                                        </button>
-                                    </span>
-                                  </td>
-                              </tr>
-                          <?php endforeach; ?>
-                        </table>
-                    </td>
-                </tr>
-            <?php endforeach; ?>
-            </tbody>
-        </table>
-      <?php print $this->element("pagination", array(
-        'goto' => false,
-        'limit' => true,
-        'numbers' => true,
-        'counter' => false
-      )); ?>
-    </div>
+          <?php endforeach; ?>
+        <?php endforeach; ?>
+      </tbody>
+    </table>
+    <?php print $this->element("pagination", array(
+      'goto' => false,
+      'limit' => true,
+      'numbers' => true,
+      'counter' => false
+    )); ?>
+  </div>
 <?php endif; ?>
 <?php if (count($groupsowners) < 1 && count($wgowners) < 1) : ?>
-    <div class="alert alert-info">
-        <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
-    </div>
+  <div class="alert alert-info">
+    <p class="lead mb-0 text-center"><?php echo _txt('pl.grouperlite.groups.zero-state'); ?></p>
+  </div>
 <?php endif; ?>
\ No newline at end of file