Styled email list pages, updated color scheme

Ioannis · Feb 24, 2021 · 6b8347e · 6b8347e
1 parent ce19e76
commit 6b8347e
Showing 22 changed files with 338 additions and 145 deletions.
diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php
@@ -381,7 +381,8 @@ function isAuthorized() {
     $p['groupmember'] = true;
     $p['groupoptin'] = true;
     $p['emaillistsoptin'] = true;
-    $p['emaillistsmanaged'] = true;
+    $p['emaillistsmember'] = true;
+    $p['emaillistsmanage'] = true;
     $p['emaillistsinfo'] = true;
     $p['groupcreateform'] = true;
     $p['groupcreate'] = true;
@@ -393,33 +394,54 @@ function isAuthorized() {
     return ($p[$this->action]);
   }
 
-  public function emailListsOptin() {
-    $this->set('title', _txt('pl.grouperlite.title.emaillists'));
+  public function emaillistsOptin() {
+    $this->set('title', _txt('pl.grouperlite.title.emaillists-join'));
     // mock data
     $this->set('group', array(
       'member' => true,
       'name' => 'Email List 1',
       'description' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
       'enabled' => 'T'
     ));
+
+    $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
   }
 
-  public function emailListsManaged() {
-    $this->set('title', _txt('pl.grouperlite.title.emaillistsmanaged'));
+  public function emaillistsMember()
+  {
+    $this->set('title', _txt('pl.grouperlite.title.emaillists-member'));
     // mock data
     $this->set('group', array(
       'member' => true,
       'name' => 'Email List 1',
+      'domain' => 'internet2',
       'description' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
       'enabled' => 'T'
     ));
+
+    $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
+  }
+
+  public function emaillistsManage() {
+    $this->set('title', _txt('pl.grouperlite.title.emaillists-manage'));
+    // mock data
+    $this->set('group', array(
+      'member' => true,
+      'name' => 'Email List 1',
+      'domain' => 'internet2',
+      'description' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+      'enabled' => 'T'
+    ));
+
+    $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId));
   }
 
-  public function emailListInfo() {
+  public function emaillistInfo() {
     $this->set('title', _txt('pl.grouperlite.title.emaillistsinfo'));
     // mock data
     $this->set('groupergroupsdetail', array(
       'member' => true,
+      'domain' => 'internet2',
       'uuid' => 'abc123xyz789',
       'displayExtension' => 'email-list-1',
       'extension' => 'email-list-1',

diff --git a/Lib/lang.php b/Lib/lang.php
@@ -12,17 +12,20 @@
   'pl.grouperlite.nav.groups-can-join' => 'Groups I can join',
   'pl.grouperlite.nav.groups-presided' => 'Groups I manage',
   'pl.grouperlite.nav.memberships' => 'My memberships',
-  'pl.grouperlite.nav.email-lists' => 'Email lists',
-  'pl.grouperlite.nav.email-lists-managed' => 'Email lists I manage',
+  'pl.grouperlite.nav.emaillists-join' => 'Email lists I can join',
+  'pl.grouperlite.nav.emaillists-member' => 'My email lists',
+  '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.title.root' => 'Grouper Collaborations:',
   'pl.grouperlite.title.groupinfo' => 'Group configuration and attributes',
   'pl.grouperlite.title.groupowner' => 'Groups I manage',
   'pl.grouperlite.title.groupmember' => 'My Memberships',
   'pl.grouperlite.title.groupoptin' => 'Groups I can join',
-  'pl.grouperlite.title.emaillists' => 'Email lists',
-  'pl.grouperlite.title.emaillistsmanaged' => 'Email lists I manage',
+  'pl.grouperlite.title.emaillists-join' => 'Email lists I can join',
+  'pl.grouperlite.title.emaillists-member' => 'My email lists',
+  'pl.grouperlite.title.emaillists-manage' => 'Email lists I manage',
   'pl.grouperlite.title.emaillistsinfo' => 'Email list configuration and attributes',
   'pl.grouperlite.title.groupcreate' => 'Create Group',
 
@@ -43,13 +46,15 @@
   'pl.grouperlite.table.description'  => 'Description',
   'pl.grouperlite.table.status'  => 'Status',
   'pl.grouperlite.table.action'  => 'Action',
+  'pl.grouperlite.table.open' => 'Open?',
+  'pl.grouperlite.table.groups' => 'Groups',
 
   'pl.grouperlite.value.descr.zerostate' => 'No Description',
   'pl.grouperlite.value.enabled' => 'Enabled',
   'pl.grouperlite.value.disabled' => 'Disabled',
 
-  'pl.grouperlite.action.join-group' => 'Join group',
-  'pl.grouperlite.action.leave-group' => 'Leave group',
+  'pl.grouperlite.action.join' => 'Join',
+  'pl.grouperlite.action.leave' => 'Leave',
   'pl.grouperlite.action.edit-group' => 'Edit',
   'pl.grouperlite.action.disable-group' => 'Disable',
   'pl.grouperlite.action.subscribe' => 'Subscribe',

diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp
@@ -30,22 +30,26 @@
  */
 
 // Figure out the widget ID so we can overwrite the dashboard's widget div
+
 $divid = $vv_config['CoGrouperLite']['co_dashboard_widget_id'];
-?>
 
+echo $this->element('GrouperLite.base-styles');
+
+?>
 
-<div class="container-fluid p-0">
+<div class="container-fluid p-0 grouper">
     <div class="row no-gutters">
         <div class="col-12 col-lg-8 col-xl-6">
             <div class="border rounded">
-                <div class="row no-gutters">
-                    <div class="col-xs-5 col-md-5">
+                <div class="row no-gutters py-2">
+                    <div class="col-xs-4 col-md-4">
                         <div class="p-4 h-100 d-flex flex-md-column justify-content-center flex-row align-items-center">
                             <?php print $this->Html->image('GrouperLite.grouper-logo.png', array('class' => 'logo-fluid')); ?>
                         </div>
                     </div>
-                    <div class="col-xs-7 col-md-7">
-                        <div class="p-4 h-100 d-flex flex-column justify-content-center">
+                    <div class="col-xs-4 col-md-4">
+                        <h6 class="text-center mb-2 mt-2">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(
                                                                         'plugin' => "grouper_lite",
@@ -81,15 +85,46 @@ $divid = $vv_config['CoGrouperLite']['co_dashboard_widget_id'];
                                 <?php echo _txt('pl.grouperlite.nav.groups-presided'); ?>
 
                             </a>
-                            <!--<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="#" tabindex="-1" aria-disabled="true">
-                    <?php //echo _txt('pl.grouperlite.nav.email-lists'); 
-                    ?>
-                </a>
-                <a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="#" tabindex="-1" aria-disabled="true">
-                    <?php //echo _txt('pl.grouperlite.nav.email-lists-managed'); 
-                    ?>
-                </a>
-                -->
+                        </div>
+                    </div>
+                    <div class="col-xs-4 col-md-4 border-left">
+                        <h6 class="text-center mb-2 mt-2">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(
+                                                                        'plugin' => "grouper_lite",
+                                                                        'controller' => 'GrouperGroups',
+                                                                        'action' => 'emaillistsoptin',
+                                                                        'co' => $coid,
+                                                                        'glid' => $glid
+                                                                    )
+                                                                ); ?>">
+                                <?php echo _txt('pl.grouperlite.nav.emaillists-join'); ?>
+                            </a>
+                            <a class="btn btn-secondary mt-1" href="<?php print $this->Html->url(
+                                                                        array(
+                                                                            'plugin' => "grouper_lite",
+                                                                            'controller' => 'GrouperGroups',
+                                                                            'action' => 'emaillistsMember',
+                                                                            'co' => $coid,
+                                                                            'glid' => $glid
+                                                                        )
+                                                                    ); ?>">
+                                <?php echo _txt('pl.grouperlite.nav.emaillists-member'); ?>
+
+                            </a>
+                            <a class="btn btn-secondary mt-1" href="<?php print $this->Html->url(
+                                                                        array(
+                                                                            'plugin' => "grouper_lite",
+                                                                            'controller' => 'GrouperGroups',
+                                                                            'action' => 'emaillistsManage',
+                                                                            'co' => $coid,
+                                                                            'glid' => $glid
+                                                                        )
+                                                                    ); ?>">
+                                <?php echo _txt('pl.grouperlite.nav.emaillists-manage'); ?>
+
+                            </a>
                         </div>
                     </div>
                 </div>

diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp
@@ -12,7 +12,7 @@
                 <td><?php echo $attr['displayName']; ?></td>
                 <td><?php echo $attr['description'] ?></td>
                 <td>
-                    <a href="<?php echo $baseUrl.$attr['uuid']; ?>" class="btn btn-primary btn-raised btn-block" target="_blank" role="button">
+                    <a href="<?php echo $baseUrl.$attr['uuid']; ?>" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button">
                         View <i class="fa fa-external-link"></i>
                     </a>
                 </td>

diff --git a/View/Elements/Components/navigation-emaillists.ctp b/View/Elements/Components/navigation-emaillists.ctp
@@ -0,0 +1,55 @@
+<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
+            print $this->Html->link(
+                _txt('pl.grouperlite.nav.emaillists-join'),
+                array(
+                    'controller' => 'GrouperGroups',
+                    'action' => 'emaillistsoptin'
+                ),
+                array('class' => array('nav-link', $active == 'emaillistsoptin' ? 'active' : ''))
+            )
+            ?>
+        </div>
+        <div class="nav-item">
+            <?php
+            print $this->Html->link(
+                _txt('pl.grouperlite.nav.emaillists-member'),
+                array(
+                    'controller' => 'GrouperGroups',
+                    'action' => 'emaillistsmember'
+                ),
+                array('class' => array('nav-link', $active == 'emaillistsmember' ? 'active' : ''))
+            )
+            ?>
+        </div>
+        <div class="nav-item">
+            <?php
+            print $this->Html->link(
+                _txt('pl.grouperlite.nav.emaillists-manage'),
+                array(
+                    'controller' => 'GrouperGroups',
+                    'action' => 'emaillistsmanage'
+                ),
+                array('class' => array('nav-link', $active == 'emaillistsmanage' ? 'active' : ''))
+            )
+            ?>
+        </div>
+    </div>
+    <?php if ($isuserowner === 'T') { ?>
+        <div class="align-self">
+            <?php
+            $createGroupUrl = $this->Html->url(
+                array(
+                    'controller' => 'groupergroups',
+                    'action' => 'groupcreateform'
+                )
+            );
+            ?>
+            <a href="<?php echo $createGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
+                <i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-email'); ?>
+            </a>
+        </div>
+    <?php } ?>
+</nav>
diff --git a/View/Elements/Components/navigation.ctp → ...Elements/Components/navigation-groups.ctp b/View/Elements/Components/navigation.ctp → ...Elements/Components/navigation-groups.ctp
@@ -36,30 +36,6 @@
             )
             ?>
         </div>
-        <div class="nav-item">
-            <?php
-            print $this->Html->link(
-                _txt('pl.grouperlite.nav.email-lists'),
-                array(
-                    'controller' => 'groupergroups',
-                    'action' => 'emaillistsoptin'
-                ),
-                array('class' => array('nav-link', $active == 'emaillistsoptin' ? 'active' : ''))
-            )
-            ?>
-        </div>
-        <div class="nav-item">
-            <?php
-            print $this->Html->link(
-                _txt('pl.grouperlite.nav.email-lists-managed'),
-                array(
-                    'controller' => 'groupergroups',
-                    'action' => 'emaillistsmanaged'
-                ),
-                array('class' => array('nav-link', $active == 'emaillistsmanaged' ? 'active' : ''))
-            )
-            ?>
-        </div>
     </div>
     <?php if ($isuserowner === 'T') { ?>
         <div class="align-self">
@@ -71,7 +47,7 @@
                 )
             );
             ?>
-            <a href="<?php echo $createGroupUrl; ?>" class="btn btn-link px-3 py-2">
+            <a href="<?php echo $createGroupUrl; ?>" class="btn btn-grouper btn btn-link px-3 py-2">
                 <i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-group'); ?>
             </a>
         </div>

diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp
@@ -1,9 +1,10 @@
 <?php echo $this->Form->create(false, array(
-  'url' => array('controller' => 'groupergroups', 'action' => $action)
+  'url' => array('controller' => 'groupergroups', 'action' => $action),
+  'class' => 'd-flex justify-content-center'
 )); ?>
 <?php print $this->Form->hidden('GroupName', array('default' => $group)); ?>
 <button class="btn btn-block btn-<?php echo $member ? 'danger' : 'success'; ?>" type="submit">
-    <?php echo $member ? _txt('pl.grouperlite.action.leave-group') : _txt('pl.grouperlite.action.join-group') ?> &nbsp;
+    <?php echo $member ? _txt('pl.grouperlite.action.leave') : _txt('pl.grouperlite.action.join') ?> &nbsp;
     <i class="fa fa-<?php echo $member ? 'user-times' : 'users'; ?> fa-sm"></i>
 </button>
 <?php echo $this->Form->end(); ?>
diff --git a/View/Elements/Components/pagination.ctp b/View/Elements/Components/pagination.ctp
@@ -6,7 +6,7 @@
             <option>100</option>
         </select>
         records
-        <button className="btn btn-light btn-sm ml-2">Go</button>
+        <button className="btn btn-grouper btn btn-light btn btn-sm ml-2">Go</button>
     </div>
     <div>
         Page 1 of 1, Viewing 1-23 of 23

diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp
@@ -1,17 +1,17 @@
 <script type="text/javascript">
     $(function() {
         var collapse = $(".collapse"),
-            btn = $(".adv-search-link"),
+            btn btn-grouper = $(".adv-search-link"),
             open = false;
 
-        btn.addClass("active");
+        btn btn-grouper.addClass("active");
         collapse.hide();
-        btn.click(function(ev) {
+        btn btn-grouper.click(function(ev) {
             ev.preventDefault();
             open = !open;
             collapse.slideToggle();
-            btn.toggleClass('active');
-            btn.find('.fa').toggleClass('fa-caret-down').toggleClass('fa-caret-up');
+            btn btn-grouper.toggleClass('active');
+            btn btn-grouper.find('.fa').toggleClass('fa-caret-down').toggleClass('fa-caret-up');
         });
     });
 </script>
@@ -26,11 +26,11 @@
             <!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
             <div class="input-group-append">
                 <?php if (isset($searchcriteria) && $searchcriteria !== '') { ?>
-                    <button class="btn btn-outline-secondary" type="button" value="Clear" id="reset-search">
+                    <button class="btn btn-grouper btn-outline-secondary" type="button" value="Clear" id="reset-search">
                         <i class="fa fa-times fa-lg"></i>
                     </button>
                 <?php } ?>
-                <button class="btn btn-primary px-4" type="submit" value="Submit">
+                <button class="btn btn-grouper btn-primary px-4" type="submit" value="Submit">
                     <i class="fa fa-search"></i>
                     <span class="ml-2"><?php echo _txt('pl.grouperlite.action.search'); ?></span>
                 </button>
@@ -97,12 +97,12 @@
                 <input type="text" name="" class="form-control" id="adv-search-users" />
             </div>
             <div class="col col-lg-6 col-12 d-flex justify-content-end align-items-end">
-                <button class="btn btn-primary btn-raised">Filter Groups</button>
+                <button class="btn btn-grouper btn btn-primary btn btn-raised">Filter Groups</button>
             </div>
         </div>
     </div>
     <div class="d-flex justify-content-end align-items-end my-2">
-        <button class="btn btn-link adv-search-link">
+        <button class="btn btn-grouper btn btn-link adv-search-link">
             <i class="fa fa-caret-down"></i>
             &nbsp;advanced search
         </button>