diff --git a/Lib/lang.php b/Lib/lang.php index ca2c6fd..1bb3ee4 100644 --- a/Lib/lang.php +++ b/Lib/lang.php @@ -103,6 +103,8 @@ 'pl.grouperlite.action.edit' => 'Edit', 'pl.grouperlite.action.view-in-grouper' => 'View in Grouper', 'pl.grouperlite.action.view-members' => 'View members', + 'pl.grouperlite.action.grouper' => 'Grouper', + 'pl.grouperlite.action.members' => 'Members', 'pl.grouperlite.action.close' => 'Close', 'pl.grouperlite.action.clear' => 'Clear', diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp index e2bd7aa..43c7608 100644 --- a/View/Elements/Components/optAction.ctp +++ b/View/Elements/Components/optAction.ctp @@ -4,7 +4,7 @@ 'id' => 'join-group.' . $idx )); ?> Form->hidden('GroupName', array('default' => $group, 'id' => 'groupName.' . $idx)); ?> - diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp index 57e98e3..83f92ad 100644 --- a/View/Elements/Components/subscriberList.ctp +++ b/View/Elements/Components/subscriberList.ctp @@ -1,11 +1,66 @@ + + \ No newline at end of file diff --git a/View/Elements/base-styles.ctp b/View/Elements/base-styles.ctp index b7a6607..0d3330e 100644 --- a/View/Elements/base-styles.ctp +++ b/View/Elements/base-styles.ctp @@ -54,4 +54,22 @@ .grouper a:not(.btn):hover { color: var(--link-hover); } + + #subscribers.loading .loader { + display: block; + } + + #subscribers.loading .subs, + #subscribers.error .subs { + display: none; + } + + #subscribers.error .msg { + display: block; + } + + #subscribers .loader, + #subscribers .msg { + display: none; + } \ No newline at end of file diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp index d8695bd..1fd387b 100644 --- a/View/GrouperGroups/groupinfo.ctp +++ b/View/GrouperGroups/groupinfo.ctp @@ -13,13 +13,7 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;

- - - - -   - - +
@@ -48,24 +42,3 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
- - - - \ No newline at end of file diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp index 735dab8..80622b6 100644 --- a/View/GrouperGroups/groupmember.ctp +++ b/View/GrouperGroups/groupmember.ctp @@ -60,12 +60,21 @@ $numColumns = count($columns); - element('GrouperLite.Components/optAction', array( - 'member' => $group['optOut'], - 'action' => 'leavegroup', - 'group' => $group['name'], - 'idx' => $key - )) : ''; ?> + + element('GrouperLite.Components/optAction', array( + 'member' => $group['optOut'], + 'action' => 'leavegroup', + 'group' => $group['name'], + 'idx' => $key + )) : ''; ?> + + + +   + + + + @@ -91,12 +100,32 @@ $numColumns = count($columns); - 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) : ?> @@ -139,4 +168,5 @@ $numColumns = count($columns);

- \ No newline at end of file + +element('Components/subscriberList', array('subscribers' => $groupergroupssubscribers)); ?> \ No newline at end of file