Merge branch 'develop' of bitbucket.org:unicon/comanagework into develop

internet2 · Jul 23, 2021 · 03323e9 · 03323e9
2 parents b45189d + d6cd35a
commit 03323e9
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 23 deletions.
diff --git a/Lib/lang.php b/Lib/lang.php
@@ -84,6 +84,11 @@
   'pl.grouperlite.value.enabled' => 'Enabled',
   'pl.grouperlite.value.disabled' => 'Disabled',
 
+  'pl.grouperlite.value.sympa - internet2' => 'Sympa description',
+  'pl.grouperlite.value.jira' => 'Jira description',
+  'pl.grouperlite.value.confluence' => 'Confluence description',
+  'pl.grouperlite.value.incommon-collab' => '',
+
   'pl.grouperlite.action.join' => 'Join',
   'pl.grouperlite.action.leave' => 'Leave',
   'pl.grouperlite.action.edit-group' => 'Edit',

diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp
@@ -25,7 +25,7 @@ $numColumns = count($columns);
             'counter' => true,
             'class' => 'counter'
         )); ?>
-        <table class="table table-striped w-100 mb-0">
+        <table class="table w-100 mb-0">
             <thead>
                 <tr>
                     <?php foreach ($columns as $key => $label) : ?>
@@ -34,7 +34,7 @@ $numColumns = count($columns);
                 </tr>
             </thead>
             <tbody>
-                <tr>
+                <tr class="table-secondary">
                     <td colspan="<?php echo $numColumns; ?>">
                         <p class="h6 fw-bold m-0">Ad-hoc groups</p>
                     </td>
@@ -64,10 +64,15 @@ $numColumns = count($columns);
                 <?php endforeach; ?>
             </tbody>
             <tbody>
+                <tr class="table-secondary">
+                    <td colspan="<?php echo $numColumns; ?>">
+                        <p class="h6 fw-bold m-0">Working groups</p>
+                    </td>
+                </tr>
                 <?php foreach ($wgmemberships as $wggroup) : ?>
-                    <tr>
-                        <td colspan="<?php echo $numColumns - 2; ?>">
-                            <button type="button" class="btn btn-link btn-text collapse-btn h6 fw-bold m-0 collapsed" data-toggle="collapse" data-target=".collapse-wg-<?php echo $wggroup['WGName']; ?>" role="button" aria-expanded="false">
+                    <tr class="table-light">
+                        <td colspan="<?php echo $numColumns - 1; ?>">
+                            <button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0 collapsed" data-toggle="collapse" data-target=".collapse-wg-<?php echo $wggroup['WGName']; ?>" role="button" aria-expanded="false">
                                 <?php echo $wggroup['WGName'] ?? "No Name"; ?>
                                 <i class="fa fa-caret-down fa-sm"></i>
                             </button>
@@ -99,7 +104,7 @@ $numColumns = count($columns);
                             <?php if ($isuserowner === 'T') { ?>
                                 <td><?php echo $group['WGRole'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
                             <?php } ?>
-                            <td><?php echo $group['description'] ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
+                            <td><?php echo _txt('pl.grouperlite.value.'.$group['WGApp'] ) ?? _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
                             <td>
 
                             </td>

diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp
@@ -25,7 +25,7 @@ $numColumns = count($columns);
       'counter' => true,
       'class' => 'counter'
     )); ?>
-    <table class="table table-striped w-100 mb-0">
+    <table class="table w-100 mb-0">
       <thead>
         <tr>
           <?php foreach ($columns as $key => $label) : ?>
@@ -34,7 +34,7 @@ $numColumns = count($columns);
         </tr>
       </thead>
       <tbody>
-        <tr>
+        <tr class="table-secondary">
           <td colspan="<?php echo $numColumns; ?>">
             <p class="h6 fw-bold m-0">Ad-hoc groups</p>
           </td>
@@ -65,9 +65,14 @@ $numColumns = count($columns);
         <?php endforeach; ?>
       </tbody>
       <tbody>
+        <tr class="table-secondary">
+          <td colspan="<?php echo $numColumns; ?>">
+            <p class="h6 fw-bold m-0">Working groups</p>
+          </td>
+        </tr>
         <?php foreach ($wgoptins as $i => $wgoptin) : ?>
-          <tr>
-            <td colspan="<?php echo $numColumns - 2; ?>">
+          <tr class="table-light">
+            <td colspan="<?php echo $numColumns - 1; ?>">
               <button type="button" class="btn btn-link btn-text collapse-btn h6 fw-bold m-0 collapsed" data-toggle="collapse" data-target=".collapse-wg-<?php echo $wgoptin['WGName']; ?>" role="button" aria-expanded="false">
                 <?php echo $wgoptin['WGName'] ?? "No Name"; ?>
                 <i class="fa fa-caret-down fa-sm"></i>

diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp
@@ -26,7 +26,7 @@ $numColumns = count($columns);
       'counter' => true,
       'class' => 'counter'
     )); ?>
-    <table class="table table-striped w-100 mb-0">
+    <table class="table table-bordered w-100 mb-0">
       <thead>
         <tr>
           <?php foreach ($columns as $key => $label) : ?>
@@ -35,7 +35,7 @@ $numColumns = count($columns);
         </tr>
       </thead>
       <tbody>
-        <tr>
+        <tr class="table-secondary">
           <td colspan="<?php echo $numColumns; ?>">
             <p class="h6 fw-bold m-0">Ad-hoc groups</>
           </td>
@@ -64,7 +64,7 @@ $numColumns = count($columns);
             <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-center align-items-center">
-                <button class="btn btn-grouper btn btn-primary" disabled>
+                <button class="btn btn-grouper btn-sm btn-primary" disabled>
                   <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
                   <i class="fa fa-pencil fa-sm"></i>
                 </button>
@@ -78,8 +78,13 @@ $numColumns = count($columns);
         <?php endforeach; ?>
       </tbody>
       <tbody>
+        <tr class="table-secondary">
+          <td colspan="<?php echo $numColumns; ?>">
+            <p class="h6 fw-bold m-0">Working groups</p>
+          </td>
+        </tr>
         <?php foreach ($wgowners as $wgowner) : ?>
-          <tr>
+          <tr class="table-light">
             <td colspan="<?php echo $numColumns; ?>">
               <button type="button" class="btn btn-link btn-text collapse-btn h6 fw-bold m-0 collapsed" data-toggle="collapse" data-target=".collapse-wg-<?php echo $wgowner['WGName']; ?>" role="button" aria-expanded="false">
                 <?php echo $wgowner['WGName'] ?? "No Name"; ?>
@@ -102,7 +107,7 @@ $numColumns = count($columns);
               <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>
+                  <button class="btn btn-grouper btn-primary btn-sm" disabled>
                     <?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
                     <i class="fa fa-pencil fa-sm"></i>
                   </button>

diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css
@@ -35,7 +35,6 @@ a {
     padding: 0.75rem 2rem;
     transition: background-color .2s cubic-bezier(.4, 0, .2, 1), color .2s cubic-bezier(.4, 0, .2, 1);
     border-radius: 0;
-    ;
 }
 
 #grouper-plugin .nav.nav-tabs .nav-item a.nav-link:not(.active) {
@@ -52,17 +51,11 @@ a {
     border-color: transparent;
 }
 
-#grouper-plugin .table {}
-
-#grouper-plugin .table thead {}
-
 #grouper-plugin .table thead th {
     background-color: var(--primary);
     color: white;
 }
 
-#grouper-plugin .table thead th.group {}
-
 #grouper-plugin .table thead th.group.name {
     min-width: 200px;
 }
@@ -103,13 +96,16 @@ a {
 #grouper-plugin .table thead th, #grouper-plugin .table tbody td {
     padding: 0.75em;
     text-align: left;
-    border-top: none;
     border-right: 2px solid #fff;
     border-bottom: 2px solid #fff;
     font-weight: normal;
     vertical-align: middle;
 }
 
+#grouper-plugin .table thead th, #grouper-plugin .table tbody tr:not(:last-child):not(.table-light) td {
+    border-bottom: 1px solid #ececec !important;
+}
+
 #grouper-plugin .form-control, #grouper-plugin .custom-select {
     border-radius: 0;
 }
@@ -297,4 +293,10 @@ a.list-group-item-action:hover .fa {
     -webkit-transition: none;
     transition: none;
     display: none;
+}
+
+.grouper .table .table-light>td {
+    background-color: #ececec;
+    border-bottom: 1px solid #FFF !important;
+    margin-bottom: 1px;
 }