From 9f9a43dc069cda07d948beb43c91cf306918be38 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 15 Dec 2020 15:27:06 -0700 Subject: [PATCH] Integrated plugin with comanage processes --- Lib/lang.php | 29 +++++++++++++++++++++ Model/GrouperLite.php | 11 ++++++++ View/CoGrouperLite/display.ctp | 1 + View/Elements/Components/navigation.ctp | 15 ++++------- View/Elements/Components/optAction.ctp | 17 ++++-------- View/Elements/Components/search.ctp | 14 +++++----- View/GrouperGroups/base.ctp | 13 ++++++++-- View/GrouperGroups/emaillistsmanaged.ctp | 27 ++++++++++--------- View/GrouperGroups/emaillistsoptin.ctp | 25 ++++++++++-------- View/GrouperGroups/groupcreateform.ctp | 33 ++++++++++++------------ View/GrouperGroups/groupinfo.ctp | 1 + View/GrouperGroups/groupoptin.ctp | 14 +++++----- View/GrouperGroups/groupowner.ctp | 27 ++++++++++--------- webroot/css/bootstrap.css | 3 +-- webroot/css/co-grouper-plugin.css | 2 +- 15 files changed, 142 insertions(+), 90 deletions(-) create mode 100644 Lib/lang.php create mode 100644 View/CoGrouperLite/display.ctp diff --git a/Lib/lang.php b/Lib/lang.php new file mode 100644 index 0000000..aa89932 --- /dev/null +++ b/Lib/lang.php @@ -0,0 +1,29 @@ + 'Groups', + 'pl.grouperlite.nav.groups-presided' => 'Groups I preside over', + 'pl.grouperlite.nav.email-lists' => 'Email lists', + 'pl.grouperlite.nav.email-lists-managed' => 'Email lists I manage', + 'pl.grouperlite.nav.create-group' => 'Create group', + + 'pl.grouperlite.table.name' => 'Name', + 'pl.grouperlite.table.description' => 'Description', + 'pl.grouperlite.table.status' => 'Status', + 'pl.grouperlite.table.action' => 'Action', + + '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.edit-group' => 'Edit', + 'pl.grouperlite.action.disable-group' => 'Disable', + 'pl.grouperlite.action.subscribe' => 'Subscribe', + 'pl.grouperlite.action.unsubscribe' => 'Unsubscribe', + 'pl.grouperlite.action.search' => 'Search', + + 'pl.grouperlite.search.tags.text' => 'Search', +); \ No newline at end of file diff --git a/Model/GrouperLite.php b/Model/GrouperLite.php index 9892b1c..3123303 100644 --- a/Model/GrouperLite.php +++ b/Model/GrouperLite.php @@ -8,5 +8,16 @@ class GrouperLite extends AppModel { // Required by COmanage Plugins public $cmPluginType = "dashboardwidget"; + public function cmPluginMenus() { + return array( + "cogroups" => array( + 'Grouper groups' => array( + 'controller' => "groupergroups", + 'action' => "groupoptin" + ) + ) + ); + } + } \ No newline at end of file diff --git a/View/CoGrouperLite/display.ctp b/View/CoGrouperLite/display.ctp new file mode 100644 index 0000000..2e9664d --- /dev/null +++ b/View/CoGrouperLite/display.ctp @@ -0,0 +1 @@ +Hi I am the dashboard widget \ No newline at end of file diff --git a/View/Elements/Components/navigation.ctp b/View/Elements/Components/navigation.ctp index fc5c06c..8ec8cd1 100644 --- a/View/Elements/Components/navigation.ctp +++ b/View/Elements/Components/navigation.ctp @@ -1,14 +1,9 @@ - \ No newline at end of file diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp index 723e54d..ba7a348 100644 --- a/View/Elements/Components/optAction.ctp +++ b/View/Elements/Components/optAction.ctp @@ -1,16 +1,9 @@ -
+Form->create(false, array( + 'url' => array('controller' => 'groupergroups', 'action' => $action) +)); ?> - Form->hidden('token', array('default' => $vv_petition_token)) . "\n"; - } - ?> -
\ No newline at end of file +Form->end(); ?> \ No newline at end of file diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp index 4be109f..05d861f 100644 --- a/View/Elements/Components/search.ctp +++ b/View/Elements/Components/search.ctp @@ -15,8 +15,10 @@ $(document).ready(function() { }); }); - -
+Form->create(false, array( + 'url' => array('controller' => 'groupergroups', 'action' => $active), + 'class' => 'search mb-4' +)); ?>
@@ -24,7 +26,7 @@ $(document).ready(function() {
@@ -32,12 +34,13 @@ $(document).ready(function() {
+ - +Form->end(); ?> diff --git a/View/GrouperGroups/base.ctp b/View/GrouperGroups/base.ctp index 9f47669..b140f6b 100644 --- a/View/GrouperGroups/base.ctp +++ b/View/GrouperGroups/base.ctp @@ -1,8 +1,17 @@ Html->css('GrouperLite.co-grouper-plugin', array('inline' => false)); +print $this->Html->css('GrouperLite.bootstrap') . "\n "; +print $this->Html->css('GrouperLite.co-grouper-base') . "\n "; +print $this->Html->css('GrouperLite.co-grouper-plugin') . "\n "; +?> + +Html->script('GrouperLite.bootstrap.bundle.js') . "\n "; +print $this->Html->script('GrouperLite.typeahead.bundle.js') . "\n "; + +$this->Html->addCrumb('Grouper groups', array('controller' => 'groupergroups', 'action' => 'groupoptin'), array('prepend' => true)); ?> -
+

diff --git a/View/GrouperGroups/emaillistsmanaged.ctp b/View/GrouperGroups/emaillistsmanaged.ctp index b3b3acc..b9a1204 100644 --- a/View/GrouperGroups/emaillistsmanaged.ctp +++ b/View/GrouperGroups/emaillistsmanaged.ctp @@ -1,14 +1,15 @@ extend('/GrouperGroups/base'); ?> +Html->addCrumb('Email lists I manage'); ?> element('Components/navigation', array('active' => 'emaillistsmanaged', 'create' => true)); ?> element('Components/search', array('active' => 'emaillistsmanaged')); ?>
- - - - + + + + @@ -24,14 +25,16 @@ diff --git a/View/GrouperGroups/emaillistsoptin.ctp b/View/GrouperGroups/emaillistsoptin.ctp index 1fbe173..29b37e8 100644 --- a/View/GrouperGroups/emaillistsoptin.ctp +++ b/View/GrouperGroups/emaillistsoptin.ctp @@ -1,14 +1,18 @@ extend('/GrouperGroups/base'); ?> +Html->addCrumb('Email lists I can join'); ?> element('Components/navigation', array('active' => 'emaillistsoptin')); ?> element('Components/search', array('active' => 'emaillistsoptin')); ?> + +Html->addCrumb('Group Optin/Optout'); ?> +
NameDescriptionStatusAction
- - + + + +
- - - - + + + + @@ -21,14 +25,13 @@ '?' => array('groupname' => urlencode($group['name'])) ) ) ?> - - + + diff --git a/View/GrouperGroups/groupcreateform.ctp b/View/GrouperGroups/groupcreateform.ctp index a4fb2d3..f37d426 100644 --- a/View/GrouperGroups/groupcreateform.ctp +++ b/View/GrouperGroups/groupcreateform.ctp @@ -1,4 +1,5 @@ extend('/GrouperGroups/base'); ?> +Html->addCrumb('Create a Group'); ?>
NameDescriptionStatusAction
- element('Components/optAction', array( - 'member' => $group['member'], - 'action' => $group['member'] ? 'leavegroup' : 'joingroup', - 'group' => $group['name'] - )); ?> +