From 765768dd244064b70bf6c764a928c5e2714f32d9 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Tue, 9 Feb 2021 13:55:49 -0700 Subject: [PATCH] Updated styles --- Controller/GrouperGroupsController.php | 3 + Model/GrouperAttribute.php | 2 + View/Elements/Components/navigation.ctp | 28 +- View/Elements/Components/subscriberList.ctp | 16 +- View/Elements/pagination.php | 110 ++++ View/GrouperGroups/groupinfo.ctp | 663 +++++++++++++++++++- View/GrouperGroups/groupmember.ctp | 14 +- View/GrouperGroups/users.json | 344 ++++++++++ webroot/css/co-grouper-plugin.css | 20 + 9 files changed, 1154 insertions(+), 46 deletions(-) create mode 100644 View/Elements/pagination.php create mode 100644 View/GrouperGroups/users.json diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php index 96df0fd..b1b67f4 100644 --- a/Controller/GrouperGroupsController.php +++ b/Controller/GrouperGroupsController.php @@ -62,11 +62,14 @@ public function index() { public function groupInfo() { $name = urldecode($this->request->query['groupname']); + $details = $this->GrouperGroup->groupDescriptions($name); $this->set('groupname', $name); $this->set('title', _txt('pl.grouperlite.title.groupinfo')); $this->set('groupergroupsdetail', $details[0]); + + $this->set('isuserowner', $this->GrouperGroup->isUserOwner($this->userId)); } public function groupOwner() { diff --git a/Model/GrouperAttribute.php b/Model/GrouperAttribute.php index d1c865f..f57c2fb 100644 --- a/Model/GrouperAttribute.php +++ b/Model/GrouperAttribute.php @@ -58,6 +58,8 @@ private function initApi() { * @throws GrouperLiteException */ public function getGroupAttributes(string $groupName) { + $this->initApi(); + $args = array(); $args['conditions']['groupName'] = $groupName; diff --git a/View/Elements/Components/navigation.ctp b/View/Elements/Components/navigation.ctp index a0e2c68..4385907 100644 --- a/View/Elements/Components/navigation.ctp +++ b/View/Elements/Components/navigation.ctp @@ -63,17 +63,19 @@ */ ?> -
- Html->url( - array( - 'controller' => 'groupergroups', - 'action' => 'groupcreateform' - ) - ); - ?> - -   - -
+ +
+ Html->url( + array( + 'controller' => 'groupergroups', + 'action' => 'groupcreateform' + ) + ); + ?> + +   + +
+ \ No newline at end of file diff --git a/View/Elements/Components/subscriberList.ctp b/View/Elements/Components/subscriberList.ctp index bf4330e..378dc0e 100644 --- a/View/Elements/Components/subscriberList.ctp +++ b/View/Elements/Components/subscriberList.ctp @@ -1,5 +1,11 @@ - \ No newline at end of file + + + + + + + + + + +
\ No newline at end of file diff --git a/View/Elements/pagination.php b/View/Elements/pagination.php new file mode 100644 index 0000000..2bb25ec --- /dev/null +++ b/View/Elements/pagination.php @@ -0,0 +1,110 @@ + + + \ No newline at end of file diff --git a/View/GrouperGroups/groupinfo.ctp b/View/GrouperGroups/groupinfo.ctp index 2350cb0..c74a6b6 100644 --- a/View/GrouperGroups/groupinfo.ctp +++ b/View/GrouperGroups/groupinfo.ctp @@ -7,16 +7,17 @@ $groupOperation = '?operation=UiV2Group.viewGroup&groupId='; $groupUrlBase = $baseUrl . $path . $groupOperation; $attrOperation = '?operation=UiV2AttributeDefName.viewAttributeDefName&attributeDefNameId='; $attrUrlBase = $baseUrl . $path . $attrOperation; + +$isuserowner = 'T'; ?>

Group:

- + + + View in Grouper   @@ -25,10 +26,21 @@ $attrUrlBase = $baseUrl . $path . $attrOperation;
-

Group Properties

+
+

Group Properties

+ + + +
+ + element('Components/groupproperties', array( 'group' => $groupergroupsdetail )); ?> +
@@ -39,23 +51,630 @@ $attrUrlBase = $baseUrl . $path . $attrOperation; )); ?>
-
-

Subscribers

-
- element('Components/subscriberList', array('subscribers' => array( - array( - "name" => "Galena Munoz", - "email" => "ipsum.cursus.vestibulum@urnaconvalliserat.net", - "cou" => "Active, Member", - "org" => "Eu Corporation" - ), - array( - "name" => "Doris Santos", - "email" => "vitae@non.org", - "cou" => "Active, Filesource, Member", - "org" => "Aliquam LLC" - ) - ))); ?> +
+
+ + \ No newline at end of file diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp index e9f704d..48b0f3a 100644 --- a/View/GrouperGroups/groupmember.ctp +++ b/View/GrouperGroups/groupmember.ctp @@ -14,24 +14,26 @@ - Html->link( + + Html->link( isset($group['friendlyName']) ? $group['friendlyName'] : "No Name", array( 'controller' => 'groupergroups', 'action' => 'groupinfo', '?' => array('groupname' => urlencode($group['name'])) ) - ) ?> + ) ?> + element('GrouperLite.Components/optAction', array( - 'member' => $group['optedin'], - 'action' => 'leavegroup', - 'group' => $group['name'] + 'member' => $group['optedin'], + 'action' => 'leavegroup', + 'group' => $group['name'] )) : ''; ?> -
\ No newline at end of file +
diff --git a/View/GrouperGroups/users.json b/View/GrouperGroups/users.json new file mode 100644 index 0000000..6e08fee --- /dev/null +++ b/View/GrouperGroups/users.json @@ -0,0 +1,344 @@ +[ + { + "name": "Galena Munoz", + "email": "ipsum.cursus.vestibulum@urnaconvalliserat.net", + "cou": "Active, Member", + "org": "Eu Corporation" + }, + { + "name": "Doris Santos", + "email": "vitae@non.org", + "cou": "Active, Filesource, Member", + "org": "Aliquam LLC" + }, + { + "name": "Alma English", + "email": "pede.Cum.sociis@telluseu.net", + "cou": "Member, Active, Writer, Filesource", + "org": "Consectetuer Corp." + }, + { + "name": "Halee Finley", + "email": "in.consectetuer.ipsum@parturientmontes.co.uk", + "cou": "Member", + "org": "Felis Ltd" + }, + { + "name": "Austin Hardy", + "email": "iaculis@Donecegestas.co.uk", + "cou": "Writer", + "org": "Nonummy LLP" + }, + { + "name": "Victor Powell", + "email": "nisi@eget.ca", + "cou": "Member, Active", + "org": "Praesent Interdum Ligula PC" + }, + { + "name": "Baxter Estrada", + "email": "in.consequat.enim@vestibulum.co.uk", + "cou": "", + "org": "In Molestie Tortor Corporation" + }, + { + "name": "Carlos Rose", + "email": "elit.elit@non.co.uk", + "cou": "Member, Writer, Filesource, Active", + "org": "Risus Nulla Eget LLP" + }, + { + "name": "Ishmael Patton", + "email": "leo.Morbi@mollisnoncursus.co.uk", + "cou": "Writer, Filesource", + "org": "A Enim Suspendisse Consulting" + }, + { + "name": "Ryder Tanner", + "email": "varius@rutrum.org", + "cou": "Writer, Filesource", + "org": "Ornare Elit Elit Consulting" + }, + { + "name": "Dane Rollins", + "email": "Curabitur.consequat.lectus@Naminterdum.ca", + "cou": "Member", + "org": "Ut Pellentesque Consulting" + }, + { + "name": "Brian Kaufman", + "email": "aliquet.vel@orciluctuset.edu", + "cou": "Filesource, Active", + "org": "Justo Eu Arcu Inc." + }, + { + "name": "Lester Price", + "email": "Integer@idlibero.edu", + "cou": "Writer, Member, Active, Filesource", + "org": "Dapibus Rutrum Justo Incorporated" + }, + { + "name": "Helen Cardenas", + "email": "Curabitur.egestas.nunc@quisdiam.org", + "cou": "Member, Active, Filesource", + "org": "Faucibus Morbi Vehicula Associates" + }, + { + "name": "Hop Holloway", + "email": "non.arcu.Vivamus@nibhvulputate.org", + "cou": "Filesource, Active, Member", + "org": "Nunc Sed Pede Ltd" + }, + { + "name": "Madeson Hendrix", + "email": "viverra@purus.com", + "cou": "", + "org": "Neque Venenatis Consulting" + }, + { + "name": "Amity Navarro", + "email": "tincidunt.Donec@inconsequat.com", + "cou": "Writer", + "org": "Pretium Aliquet Consulting" + }, + { + "name": "Cameron Booth", + "email": "nulla.magna@Quisqueporttitor.net", + "cou": "", + "org": "Fusce Associates" + }, + { + "name": "Sybil Burgess", + "email": "Fusce.feugiat@sem.org", + "cou": "Writer, Member, Filesource, Active", + "org": "Curabitur Corporation" + }, + { + "name": "Otto Cantrell", + "email": "Ut@nonarcu.org", + "cou": "", + "org": "Cursus PC" + }, + { + "name": "Mannix Obrien", + "email": "eu.neque@egestasDuisac.ca", + "cou": "", + "org": "Amet Faucibus Corp." + }, + { + "name": "Marcia Gill", + "email": "molestie.in.tempus@posuere.edu", + "cou": "", + "org": "Et Corp." + }, + { + "name": "Tanek Figueroa", + "email": "diam@arcuSed.org", + "cou": "Active", + "org": "Bibendum Donec Ltd" + }, + { + "name": "Ira Lynn", + "email": "aliquet@consequatpurusMaecenas.edu", + "cou": "Filesource", + "org": "Massa Suspendisse Eleifend Corporation" + }, + { + "name": "Lesley Pittman", + "email": "iaculis.odio@Phasellus.edu", + "cou": "Member, Writer", + "org": "Urna Et Arcu PC" + }, + { + "name": "Len Ryan", + "email": "ut.mi.Duis@sitamet.org", + "cou": "Writer, Filesource, Active", + "org": "Vestibulum Accumsan PC" + }, + { + "name": "Sarah Morton", + "email": "dis.parturient@rhoncusProin.org", + "cou": "Active", + "org": "Amet Consectetuer PC" + }, + { + "name": "Marny Hewitt", + "email": "dapibus@orciquis.ca", + "cou": "Active, Writer", + "org": "Ultricies Consulting" + }, + { + "name": "Abel Lyons", + "email": "Proin.eget.odio@enim.org", + "cou": "Writer", + "org": "Amet Lorem Corporation" + }, + { + "name": "Slade Schneider", + "email": "ante.dictum.cursus@turpisAliquamadipiscing.co.uk", + "cou": "", + "org": "Lacinia Company" + }, + { + "name": "Ashton Arnold", + "email": "velit.justo@velitin.edu", + "cou": "", + "org": "Diam Ltd" + }, + { + "name": "Phelan Goff", + "email": "ullamcorper.viverra.Maecenas@Donecporttitortellus.ca", + "cou": "", + "org": "Faucibus Id Libero Institute" + }, + { + "name": "Graham Underwood", + "email": "Nulla.dignissim.Maecenas@Donecsollicitudin.ca", + "cou": "Filesource, Member", + "org": "Duis Gravida Praesent Ltd" + }, + { + "name": "Alisa Scott", + "email": "ipsum.primis.in@erat.co.uk", + "cou": "Writer, Active", + "org": "Vivamus Non Lorem Inc." + }, + { + "name": "Asher Mccray", + "email": "semper.auctor@nibhAliquamornare.edu", + "cou": "Writer, Member", + "org": "Orci Corporation" + }, + { + "name": "Hanna Salas", + "email": "feugiat@purusactellus.net", + "cou": "", + "org": "Lectus Convallis Industries" + }, + { + "name": "Jeremy Riley", + "email": "Ut.sagittis@necante.ca", + "cou": "Writer", + "org": "Luctus Curabitur LLP" + }, + { + "name": "Violet Trevino", + "email": "vestibulum@nec.edu", + "cou": "", + "org": "Ligula Aenean Gravida Consulting" + }, + { + "name": "Carissa Myers", + "email": "non@rhoncusDonec.co.uk", + "cou": "Member, Filesource", + "org": "Tempor Corporation" + }, + { + "name": "Kadeem Osborn", + "email": "nulla.In@aliquameros.ca", + "cou": "Filesource, Active, Member, Writer", + "org": "Tempus Risus Donec PC" + }, + { + "name": "Kiayada England", + "email": "ultrices.posuere@lectus.net", + "cou": "", + "org": "Orci Institute" + }, + { + "name": "Connor Gardner", + "email": "diam.eu@tortorIntegeraliquam.org", + "cou": "Member, Active, Writer", + "org": "Vulputate Nisi Sem LLP" + }, + { + "name": "Alfonso Casey", + "email": "montes.nascetur.ridiculus@risus.net", + "cou": "Member", + "org": "Sed Eu Nibh Consulting" + }, + { + "name": "Avye Raymond", + "email": "mauris.sapien@tempusrisusDonec.co.uk", + "cou": "Active, Writer, Filesource, Member", + "org": "Amet Ante Incorporated" + }, + { + "name": "Quamar Cross", + "email": "elit.pretium@Sedid.org", + "cou": "", + "org": "Dapibus PC" + }, + { + "name": "Justine Kemp", + "email": "diam@ornare.org", + "cou": "Writer, Filesource", + "org": "Libero At Auctor Associates" + }, + { + "name": "Blair Rush", + "email": "at.velit.Cras@pulvinar.ca", + "cou": "", + "org": "Nulla Tempor Associates" + }, + { + "name": "Jael Travis", + "email": "ut.dolor.dapibus@vestibulumneceuismod.ca", + "cou": "", + "org": "Facilisis Lorem LLC" + }, + { + "name": "Donovan Patel", + "email": "bibendum.ullamcorper@Sedeu.co.uk", + "cou": "Member, Filesource, Writer, Active", + "org": "Ipsum Sodales Incorporated" + }, + { + "name": "Sylvester Brady", + "email": "amet@consequatauctornunc.net", + "cou": "", + "org": "Semper Nam Limited" + }, + { + "name": "Yuri Eaton", + "email": "Nullam.lobortis.quam@Etiamligulatortor.com", + "cou": "", + "org": "Eu Elit Nulla LLP" + }, + { + "name": "Bree Harmon", + "email": "libero.Integer@maurisaliquam.ca", + "cou": "Filesource, Active, Member, Writer", + "org": "Dui In Sodales PC" + }, + { + "name": "Tanek Tucker", + "email": "arcu@Craslorem.org", + "cou": "Active, Member, Filesource", + "org": "Nisl Arcu Company" + }, + { + "name": "Jermaine Stevens", + "email": "luctus@Donec.org", + "cou": "Active, Writer", + "org": "Pellentesque Sed Dictum Corp." + }, + { + "name": "Ira Robinson", + "email": "malesuada.vel@lobortisClass.ca", + "cou": "Active, Member", + "org": "Ac Sem Ut Consulting" + }, + { + "name": "Jocelyn Fulton", + "email": "tristique.senectus.et@faucibusorci.co.uk", + "cou": "Active, Member, Filesource, Writer", + "org": "Ante Ipsum Institute" + }, + { + "name": "Tatyana Kelly", + "email": "a.facilisis.non@tortorat.ca", + "cou": "", + "org": "Donec Feugiat Limited" + } +] \ No newline at end of file diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css index 38484bc..ec6461f 100644 --- a/webroot/css/co-grouper-plugin.css +++ b/webroot/css/co-grouper-plugin.css @@ -22,6 +22,13 @@ margin: 0; } +.btn-sm { + padding: 0.6rem 1rem; + font-size: 1rem; + line-height: 1; + border-radius: .2rem; +} + a { color: var(--primary); } @@ -192,4 +199,17 @@ a.list-group-item-action:hover { a.list-group-item-action:hover .fa { text-decoration: none; +} + +.modal.modal-primary .modal-header { + background: var(--primary); + color: white; +} + +.modal.modal-primary .modal-title, .modal.modal-primary .modal-header, .modal.modal-primary .close { + color: white; +} + +.modal.modal-primary .close { + opacity: 1; } \ No newline at end of file