From faacb3813c6c206a19c50c45a8fe80686a2395e0 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 25 Feb 2021 12:35:03 -0700
Subject: [PATCH] Updates to UI

---
 Lib/lang.php                                      |  4 +++-
 View/CoGrouperLites/display.ctp                   |  4 ++--
 .../Elements/Components/navigation-emaillists.ctp | 15 ++++++++++++++-
 View/Elements/Components/navigation-groups.ctp    | 15 ++++++++++++++-
 View/GrouperGroups/base.ctp                       |  3 ++-
 webroot/css/co-grouper-plugin.css                 |  2 +-
 6 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/Lib/lang.php b/Lib/lang.php
index 6a9ae6d..b464443 100644
--- a/Lib/lang.php
+++ b/Lib/lang.php
@@ -17,6 +17,8 @@
   'pl.grouperlite.nav.emaillists-manage' => 'Email lists I manage',
   'pl.grouperlite.nav.create-group' => 'Create group',
   'pl.grouperlite.nav.create-email' => 'Create email list',
+  'pl.grouperlite.nav.emaillists' => 'Email Lists',
+  'pl.grouperlite.nav.groups' => 'Groups',
 
   'pl.grouperlite.title.root' => 'Grouper Collaborations:',
   'pl.grouperlite.title.groupinfo' => 'Group configuration and attributes',
@@ -46,7 +48,7 @@
   'pl.grouperlite.table.description'  => 'Description',
   'pl.grouperlite.table.status'  => 'Status',
   'pl.grouperlite.table.action'  => 'Action',
-  'pl.grouperlite.table.open' => 'Open?',
+  'pl.grouperlite.table.open' => 'Access',
   'pl.grouperlite.table.groups' => 'Groups',
 
   'pl.grouperlite.value.descr.zerostate' => 'No Description',
diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp
index ffd633f..6d1e03e 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-4 col-md-4">
-                        <h6 class="text-center mb-2 mt-2">Groups</h6>
+                        <h6 class="text-center mb-2 mt-2"><i class="fa fa-users"></i>&nbsp; Groups</h6>
                         <div class="px-4 d-flex flex-column justify-content-center">
                             <a class="btn btn-primary" href="<?php print $this->Html->url(
                                                                     array(
@@ -88,7 +88,7 @@ echo $this->element('GrouperLite.base-styles');
                         </div>
                     </div>
                     <div class="col-xs-4 col-md-4 border-left">
-                        <h6 class="text-center mb-2 mt-2">Email Lists</h6>
+                        <h6 class="text-center mb-2 mt-2"><i class="fa fa-envelope"></i>&nbsp; Email Lists</h6>
                         <div class="px-4 d-flex flex-column justify-content-center">
                             <a class="btn btn-secondary" href="<?php print $this->Html->url(
                                                                     array(
diff --git a/View/Elements/Components/navigation-emaillists.ctp b/View/Elements/Components/navigation-emaillists.ctp
index 7b8c255..6612a61 100644
--- a/View/Elements/Components/navigation-emaillists.ctp
+++ b/View/Elements/Components/navigation-emaillists.ctp
@@ -38,7 +38,7 @@
         </div>
     </div>
     <?php if ($isuserowner === 'T') { ?>
-        <div class="align-self">
+        <div class="align-self-center">
             <?php
             $createGroupUrl = $this->Html->url(
                 array(
@@ -52,4 +52,17 @@
             </a>
         </div>
     <?php } ?>
+    <div class="align-self-center ml-auto">
+        <?php
+        $gotoGroupsUrl = $this->Html->url(
+            array(
+                'controller' => 'groupergroups',
+                'action' => 'groupoptin'
+            )
+        );
+        ?>
+        <a href="<?php echo $gotoGroupsUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
+            <i class="fa fa-users"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.groups'); ?>
+        </a>
+    </div>
 </nav>
\ No newline at end of file
diff --git a/View/Elements/Components/navigation-groups.ctp b/View/Elements/Components/navigation-groups.ctp
index 0a0268b..636e6c4 100644
--- a/View/Elements/Components/navigation-groups.ctp
+++ b/View/Elements/Components/navigation-groups.ctp
@@ -38,7 +38,7 @@
         </div>
     </div>
     <?php if ($isuserowner === 'T') { ?>
-        <div class="align-self">
+        <div class="align-self-center">
             <?php
             $createGroupUrl = $this->Html->url(
                 array(
@@ -52,4 +52,17 @@
             </a>
         </div>
     <?php } ?>
+    <div class="align-self-center ml-auto">
+        <?php
+        $gotoEmailListsUrl = $this->Html->url(
+            array(
+                'controller' => 'groupergroups',
+                'action' => 'emaillistsoptin'
+            )
+        );
+        ?>
+        <a href="<?php echo $gotoEmailListsUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
+            <i class="fa fa-envelope"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.emaillists'); ?>
+        </a>
+    </div>
 </nav>
\ No newline at end of file
diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp
index 6a835bd..6b393b3 100644
--- a/View/GrouperGroups/base.ctp
+++ b/View/GrouperGroups/base.ctp
@@ -13,6 +13,7 @@ $this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => '
     <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 class="ml-auto"><a href="#">Why Grouper?</a></div>-->
     </div>
     <?php echo $this->fetch('content'); ?>
-</div>
+</div>
\ No newline at end of file
diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css
index da3c6ea..8ee6b0e 100644
--- a/webroot/css/co-grouper-plugin.css
+++ b/webroot/css/co-grouper-plugin.css
@@ -114,7 +114,7 @@ a {
 
 #grouper-plugin .input-group.input-group-search input.form-control {
     font-size: 1.25rem;
-    padding: 1.6rem 1rem;
+    padding: 1.3rem 1rem;
 }
 
 #grouper-plugin .input-group.input-group-search .input-group-append .btn.btn-outline-secondary {