From 68283c12ccdd70ba6478b2319faa836d4406f1b8 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 20 Sep 2022 08:58:54 -0700 Subject: [PATCH] Updates to UI --- Lib/lang.php | 2 +- View/CoGrouperLites/display.ctp | 2 +- View/Elements/Components/groupattributes.ctp | 2 +- .../Elements/Components/navigation-groups.ctp | 2 +- View/Elements/Components/optAction.ctp | 2 +- View/Elements/Components/search.ctp | 4 +- View/Elements/Components/subscriberList.ctp | 9 +- View/Elements/base-styles.ctp | 53 ++++++++++++ View/GrouperGroups/base.ctp | 6 +- View/GrouperGroups/emaillistinfo.ctp | 12 +-- View/GrouperGroups/groupfields.inc | 2 +- View/GrouperGroups/groupinfo.ctp | 2 +- View/GrouperGroups/groupmember.ctp | 44 +++++----- View/GrouperGroups/groupoptin.ctp | 4 +- View/GrouperGroups/groupowner.ctp | 82 +++++++++---------- 15 files changed, 141 insertions(+), 87 deletions(-) diff --git a/Lib/lang.php b/Lib/lang.php index aeea088..bd624ee 100644 --- a/Lib/lang.php +++ b/Lib/lang.php @@ -158,6 +158,6 @@ 'pl.grouperlite.pagination.counter' => 'Viewing {:start}-{:end} of {:count}', 'pl.grouperlite.attributes.zero-state' => 'No Attributes Associated to this Group.', 'pl.grouperlite.groups.zero-state' => 'No groups found.', - 'pl.grouperlite.working-groups.zero-state' => 'No working groups found.', + 'pl.grouperlite.working-groups.zero-state' => 'None.', 'pl.grouperlite.email-lists.zero-state' => 'No email lists found.' ); \ No newline at end of file diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp index 052c999..90ec902 100644 --- a/View/CoGrouperLites/display.ctp +++ b/View/CoGrouperLites/display.ctp @@ -48,7 +48,7 @@ echo $this->element('GrouperLite.base-styles');
-

 

+

 

" class="btn btn-grouper btn btn-primary btn btn-raised btn btn-block" target="_blank" role="button"> - + diff --git a/View/Elements/Components/navigation-groups.ctp b/View/Elements/Components/navigation-groups.ctp index cd04cf8..f437f4c 100644 --- a/View/Elements/Components/navigation-groups.ctp +++ b/View/Elements/Components/navigation-groups.ctp @@ -64,7 +64,7 @@ ); ?> -   +  
diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp index 2c6d939..7751316 100644 --- a/View/Elements/Components/optAction.ctp +++ b/View/Elements/Components/optAction.ctp @@ -6,6 +6,6 @@ Form->hidden('GroupName', array('default' => $group, 'id' => 'groupName.' . $idx)); ?> Form->end(); ?> \ No newline at end of file diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp index c456412..2e4759e 100644 --- a/View/Elements/Components/search.ctp +++ b/View/Elements/Components/search.ctp @@ -11,12 +11,12 @@
diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp index e953522..c2803e1 100644 --- a/View/Elements/Components/subscriberList.ctp +++ b/View/Elements/Components/subscriberList.ctp @@ -9,7 +9,12 @@
- + + + + + +

Loading...

@@ -29,7 +34,7 @@
diff --git a/View/Elements/base-styles.ctp b/View/Elements/base-styles.ctp index 83b8f44..86e29bb 100644 --- a/View/Elements/base-styles.ctp +++ b/View/Elements/base-styles.ctp @@ -15,6 +15,18 @@ --secondary: var(--darkteal) } + .text-grouper { + color: var(--primary); + } + + .material-icons.mt-0 { + margin-top: 0; + } + + #content .material-icons.lg { + font-size: 1.2rem; + } + .grouper .btn:not(.btn-link) { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12); max-width: 220px; @@ -76,4 +88,45 @@ .modal-open .ui-menu { z-index: 2000; } + + #grouper-loader { + pointer-events: none; + width: 100px; + display: block; + margin: 0 auto; + overflow: visible; + padding: 15px; + max-width: 100%; + } + + #grouper-loader circle { + transform-origin: center; + fill: var(--primary); + transition: ease; + animation-timing-function: ease-in-out !important; + } + + /* fade out half */ + + #grouper-loader.fade-out-half circle:nth-child(1) { + animation: fadeInHalf 0.9s -2.3s infinite reverse; + } + + #grouper-loader.fade-out-half circle:nth-child(2) { + animation: fadeInHalf 0.9s -1.3s infinite reverse; + } + + #grouper-loader.fade-out-half circle:nth-child(3) { + animation: fadeInHalf 0.9s -0.3s infinite reverse; + } + + @keyframes fadeInHalf { + from { + opacity: 0.5; + } + + to: { + opacity: 1; + } + } \ No newline at end of file diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp index c470d70..0c879d3 100644 --- a/View/GrouperGroups/base.ctp +++ b/View/GrouperGroups/base.ctp @@ -39,14 +39,14 @@ $this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => ' $('.grouper-table .collapse-btn').on('click', function(ev) { var btn = $(ev.currentTarget); if (btn.hasClass('collapsed')) { - btn.find('i').removeClass('fa-caret-right').addClass('fa-caret-down'); + btn.find('em.material-icons').text('arrow_right'); } else { - btn.find('i').removeClass('fa-caret-down').addClass('fa-caret-right'); + btn.find('em.material-icons').text('arrow_drop_down'); } }); $('.collapse-wg-working-group-parent').on('hide.bs.collapse', function(ev) { $(this).siblings('.collapse-wg-working-group').collapse('hide'); - $(this).parent().find('.collapse-btn .fa-caret-down').removeClass('fa-caret-down').addClass('fa-caret-right'); + $(this).parent().find('.collapse-btn .material-icons').text('arrow_drop_down'); }); \ No newline at end of file diff --git a/View/GrouperGroups/emaillistinfo.ctp b/View/GrouperGroups/emaillistinfo.ctp index 4eaa7f7..f2d9356 100644 --- a/View/GrouperGroups/emaillistinfo.ctp +++ b/View/GrouperGroups/emaillistinfo.ctp @@ -13,12 +13,12 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;

- - - -   - - +
diff --git a/View/GrouperGroups/groupfields.inc b/View/GrouperGroups/groupfields.inc index a130056..c3b3066 100644 --- a/View/GrouperGroups/groupfields.inc +++ b/View/GrouperGroups/groupfields.inc @@ -75,7 +75,7 @@ $PRIVILEGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ'); '', '', '', - '', + '', '' ].join(''); diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp index 07907f5..9e74792 100644 --- a/View/GrouperGroups/groupinfo.ctp +++ b/View/GrouperGroups/groupinfo.ctp @@ -24,7 +24,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp index d06614f..f2db5b8 100644 --- a/View/GrouperGroups/groupmember.ctp +++ b/View/GrouperGroups/groupmember.ctp @@ -42,7 +42,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; @@ -65,21 +65,21 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; 'group' => $group['name'], 'idx' => $key )) : ''; ?> - - - - -   - - - + - No working groups. + None @@ -104,7 +104,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; @@ -119,7 +119,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; 'idx' => $key )) : ''; ?> - -   - - diff --git a/View/GrouperGroups/groupoptin.ctp b/View/GrouperGroups/groupoptin.ctp index ce1c7ef..00be779 100644 --- a/View/GrouperGroups/groupoptin.ctp +++ b/View/GrouperGroups/groupoptin.ctp @@ -42,7 +42,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; @@ -70,7 +70,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp index fbea2ee..3eeb0ea 100644 --- a/View/GrouperGroups/groupowner.ctp +++ b/View/GrouperGroups/groupowner.ctp @@ -42,7 +42,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; @@ -74,7 +74,7 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; 'idx' => $key )) : ''; ?>   - + @@ -100,53 +100,53 @@ $collapsed = $config['defaultCollapse'] === 'collapsed' ? true : false; - No working groups. + None - - - - - - - - - element('GrouperLite.Components/optAction', array( - 'member' => $wggroup['optOut'], - 'action' => 'leavegroup', - 'group' => $wggroup['workingGroupId'], - 'idx' => $key - )) : ''; ?> - - - - -   - - - - - + + + + + + + + + element('GrouperLite.Components/optAction', array( + 'member' => $wggroup['optOut'], + 'action' => 'leavegroup', + 'group' => $wggroup['workingGroupId'], + 'idx' => $key + )) : ''; ?> + + + + +   + + + + + $group) : ?>