From b2843100f17cc47a867d18c6ebacd8b08e9daaa8 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 29 Jan 2021 14:31:18 -0700
Subject: [PATCH] Updated group tab pages

---
 Lib/lang.php                            |  2 +-
 View/Elements/Components/navigation.ctp |  4 +++-
 View/GrouperGroups/base.ctp             |  7 ++++---
 View/GrouperGroups/groupmember.ctp      | 10 ++++++++--
 View/GrouperGroups/groupoptin.ctp       |  4 +---
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Lib/lang.php b/Lib/lang.php
index e94c658..60baf2d 100644
--- a/Lib/lang.php
+++ b/Lib/lang.php
@@ -8,7 +8,7 @@
     'pl.grouperlite.config.grouper-un' => 'Username',
     'pl.grouperlite.config.grouper-pw' => 'Password',
 
-    'pl.grouperlite.crumb.root' => 'Groups',
+    'pl.grouperlite.crumb.root' => 'Grouper',
     'pl.grouperlite.nav.groups-can-join' => 'Groups I can join',
     'pl.grouperlite.nav.groups-presided' => 'Groups I manage',
     'pl.grouperlite.nav.memberships' => 'My memberships',
diff --git a/View/Elements/Components/navigation.ctp b/View/Elements/Components/navigation.ctp
index 08def8b..a0e2c68 100644
--- a/View/Elements/Components/navigation.ctp
+++ b/View/Elements/Components/navigation.ctp
@@ -1,4 +1,4 @@
-<nav id="grouper-plugin-tabs" class="nav nav-tabs mb-4 justify-content-between">
+<nav id="grouper-plugin-tabs" class="nav nav-tabs mb-4 justify-content-start">
     <div class="d-flex nav-tab-group">
         <div class="nav-item">
             <?php
@@ -36,6 +36,7 @@
             )
             ?>
         </div>
+        <?php /*
         <div class="nav-item">
             <?php
             print $this->Html->link(
@@ -60,6 +61,7 @@
             )
             ?>
         </div>
+        */ ?>
     </div>
     <div class="align-self">
         <?php
diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp
index 85339c6..7c354b4 100644
--- a/View/GrouperGroups/base.ctp
+++ b/View/GrouperGroups/base.ctp
@@ -2,15 +2,16 @@
 print $this->Html->css('GrouperLite.co-grouper-base') . "\n    ";
 print $this->Html->css('GrouperLite.co-grouper-plugin') . "\n    ";
 ?>
-    <!-- Load JavaScript -->
+<!-- Load JavaScript -->
 <?php /* only JQuery here - other scripts at bottom */
 print $this->Html->script('GrouperLite.typeahead.bundle.js') . "\n    ";
 
 $this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => 'groupergroups', 'action' => 'groupoptin'), array('prepend' => true));
 ?>
-        
+
 <div id="grouper-plugin" class="pt-2">
-    <div class="d-flex align-items-center">
+    <div class="d-flex align-items-center mb-4">
+        <?php print $this->Html->image('GrouperLite.Grouper.jpg', array('class' => 'img-fluid mr-2', 'style' => 'height: 50px')); ?>
         <h2><?php echo $title; ?></h2>
     </div>
     <?php echo $this->fetch('content'); ?>
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
index 4b78ae2..b6f38ee 100644
--- a/View/GrouperGroups/groupmember.ctp
+++ b/View/GrouperGroups/groupmember.ctp
@@ -8,7 +8,7 @@
             <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"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
             </tr>
         </thead>
         <tbody>
@@ -23,7 +23,13 @@
                             )
                         ) ?></td>
                     <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                    <td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? _txt('pl.grouperlite.value.enabled') : _txt('pl.grouperlite.value.disabled'); ?></td>
+                    <td>
+                        <?php echo $this->element('GrouperLite.Components/optAction', array(
+                            'member' => $group['member'],
+                            'leavegroup',
+                            'group' => $group['name']
+                        )); ?>
+                    </td>
                 </tr>
             <?php endforeach; ?>
         </tbody>
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
index 1c0809e..f512ba6 100644
--- a/View/GrouperGroups/groupoptin.ctp
+++ b/View/GrouperGroups/groupoptin.ctp
@@ -9,7 +9,6 @@
             <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"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
             </tr>
         </thead>
@@ -25,11 +24,10 @@
                     )
                 ) ?></td>
                 <td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
-                <td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? _txt('pl.grouperlite.value.enabled') : _txt('pl.grouperlite.value.disabled'); ?></td>
                 <td>
                     <?php echo $this->element('GrouperLite.Components/optAction', array(
                         'member' => $group['member'],
-                        'action' => $group['member'] ? 'leavegroup' : 'joingroup',
+                        'joingroup',
                         'group' => $group['name']
                     )); ?>
                 </td>