Updated counter styles

internet2 · Mar 10, 2021 · 7a7e249 · 7a7e249
1 parent e56d2c3
commit 7a7e249
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 9 deletions.
diff --git a/View/Elements/pagination.ctp b/View/Elements/pagination.ctp
@@ -36,7 +36,7 @@ $includeGoto = isset($goto) ? $goto : true;
 
 ?>
 
-<div class="pagination d-flex justify-content-start align-items-center">
+<div class="<?php echo isset($class) ? $class : 'pagination' ?> d-flex justify-content-start align-items-center">
     <?php if ($includeCounter) : ?>
         <div class="pagination-element pagination-counter muted">
             <?php

diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
@@ -33,11 +33,16 @@
             <?php endforeach; ?>
         </tbody>
         <tfoot>
-        <tr>
-            <th colspan="5">
-              <?php print $this->element("pagination"); ?>
-            </th>
-        </tr>
+            <tr>
+                <th colspan="5">
+                    <?php print $this->element("pagination", array(
+                        'goto' => false,
+                        'limit' => true,
+                        'numbers' => true,
+                        'counter' => false
+                    )); ?>
+                </th>
+            </tr>
         </tfoot>
     </table>
 </div>
diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
@@ -3,6 +3,13 @@
 <?php echo $this->element('GrouperLite.Components/navigation-groups', array('active' => 'groupoptin')); ?>
 <?php echo $this->element('GrouperLite.Components/search', array('active' => 'groupoptin')); ?>
 <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">
         <thead>
             <tr>
@@ -35,11 +42,11 @@
         <tfoot>
             <tr>
                 <th colspan="5">
-                    <?php print $this->element( "pagination", array(
+                    <?php print $this->element("pagination", array(
                         'goto' => false,
                         'limit' => true,
                         'numbers' => true,
-                        'counter' => true
+                        'counter' => false
                     )); ?>
                 </th>
             </tr>

diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
@@ -42,7 +42,12 @@
         <tfoot>
             <tr>
                 <th colspan="5">
-                    <?php print $this->element("pagination"); ?>
+                    <?php print $this->element("pagination", array(
+                        'goto' => false,
+                        'limit' => true,
+                        'numbers' => true,
+                        'counter' => false
+                    )); ?>
                 </th>
             </tr>
         </tfoot>

diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css
@@ -216,6 +216,11 @@ a.list-group-item-action:hover .fa {
     padding: 2px;
 }
 
+.grouper .counter {
+    margin: 0.5rem 0;
+    font-size: 0.9rem;
+}
+
 .grouper .pagination a {
     color: white;
 }
@@ -230,6 +235,10 @@ a.list-group-item-action:hover .fa {
 }
 
 .grouper .pagination .pagination-element.pagination-numbers {
+    margin-right: 1rem;
+}
+
+.grouper .pagination .pagination-element.pagination-numbers-link:not(:first-child) {
     border-left: 1px solid rgba(255, 255, 255, 0.5);
 }