Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated styles
rmathis committed Feb 9, 2021
1 parent badec4a commit 765768d
Showing 9 changed files with 1,154 additions and 46 deletions.
3 changes: 3 additions & 0 deletions 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() {
2 changes: 2 additions & 0 deletions 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;

28 changes: 15 additions & 13 deletions View/Elements/Components/navigation.ctp
@@ -63,17 +63,19 @@
</div>
*/ ?>
</div>
<div class="align-self">
<?php
$createGroupUrl = $this->Html->url(
array(
'controller' => 'groupergroups',
'action' => 'groupcreateform'
)
);
?>
<a href="<?php echo $createGroupUrl; ?>" class="btn btn-link px-3 py-2">
<i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-group'); ?>
</a>
</div>
<?php if ($isuserowner === 'T') { ?>
<div class="align-self">
<?php
$createGroupUrl = $this->Html->url(
array(
'controller' => 'groupergroups',
'action' => 'groupcreateform'
)
);
?>
<a href="<?php echo $createGroupUrl; ?>" class="btn btn-link px-3 py-2">
<i class="fa fa-plus-circle"></i>&nbsp; <?php echo _txt('pl.grouperlite.nav.create-group'); ?>
</a>
</div>
<?php } ?>
</nav>
16 changes: 11 additions & 5 deletions View/Elements/Components/subscriberList.ctp
@@ -1,5 +1,11 @@
<ul class="list-group list-group-flush">
<?php foreach ($subscribers as $sub): ?>
<li class="list-group-item"><?php echo $sub['name']; ?> - <?php echo $sub['email']; ?></li>
<?php endforeach; ?>
</ul>

<table class="table table-striped">
<tbody>
<?php foreach ($subscribers as $sub) : ?>
<tr>
<td><?php echo $sub['name']; ?></td>
<td><?php echo $sub['email']; ?></td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
110 changes: 110 additions & 0 deletions View/Elements/pagination.php
@@ -0,0 +1,110 @@
<nav aria-label="Page navigation example">
<ul class="pagination">
<li class="page-item"><a class="page-link" href="#">Previous</a></li>
<li class="page-item"><a class="page-link" href="#">1</a></li>
<li class="page-item"><a class="page-link" href="#">2</a></li>
<li class="page-item"><a class="page-link" href="#">3</a></li>
<li class="page-item"><a class="page-link" href="#">Next</a></li>
</ul>
</nav>

<nav aria-label="Page navigation example">
<span class="paginationCounter">
<?php
// pagination information "Page {:page} of {:pages}, Viewing {:start}-{:end} of {:count}"
print _txt('in.pagination.format');
?>
</span>
<?php if ($this->paginator->hasPage(2)) : ?>
<ul class="pagination">

<li class="page-item">
<?php
// Shows the first link <a class="page-link" href="#">1</a>
print $this->Paginator->first(_txt('op.first'));
?>
</li>
<li class="page-item">
<?php
// Shows the previous link
print $this->Paginator->prev(
_txt('op.previous'),
null,
null,
array('class' => 'disabled')
);
?>
</li>
<li class="page-item">
<?php
// Shows the page numbers
print $this->Paginator->numbers();
?>
</li>
<li class="page-item">
<?php
// Shows the next link
print $this->Paginator->next(
_txt('op.next'),
null,
null,
array('class' => 'disabled')
);
?>
</li>
<li class="page-item">
<?php
// Shows the last link
print $this->Paginator->last(_txt('op.last'));
?>
</li>
</ul>
<?php endif; ?>

<?php if ($this->paginator->hasPage(2)) : ?>
<?php
// show the Goto page form if there is more than 1 page
?>
<form id="goto-page" class="pagination-form" method="get" onsubmit="gotoPage(this.pageNum.value,
<?php print $this->Paginator->counter('{:pages}'); ?>,
'<?php print _txt('er.pagenum.nan'); ?>',
'<?php print _txt('er.pagenum.exceeded', array($this->Paginator->counter('{:pages}'))); ?>');
return false;">
<label for="pageNum"><?php print _txt('fd.page.goto'); ?></label>
<input type="text" size="3" name="pageNum" id="pageNum" />
<input type="submit" value="<?php print _txt('op.go'); ?>" />
</form>
<?php endif; ?>

<?php
// Provide a form for setting the page limit.
// Default is 25 records, current maximum is 100.
// For now we will simply hard-code the options from 25 - 100.
?>
<script type="text/javascript">
var recordCount = '<?php print $this->Paginator->params()['count']; ?>';
var currentPage = '<?php print $this->Paginator->params()['page']; ?>';
var currentLimit = '<?php print $this->Paginator->params()['limit']; ?>';
var currentPath = '<?php print filter_var($this->request->here, FILTER_SANITIZE_SPECIAL_CHARS); ?>';
var currentAction = '<?php print filter_var($this->request->action, FILTER_SANITIZE_SPECIAL_CHARS); ?>';
</script>
<form id="limit-page" class="pagination-form" method="get" onsubmit="limitPage(this.pageLimit.value,recordCount,currentPage,currentPath,currentAction); return false;">
<label for="pageLimit"><?php print _txt('fd.page.limit.display'); ?></label>
<select name="pageLimit" id="pageLimit">
<option value="25">25</option>
<option value="50">50</option>
<option value="75">75</option>
<option value="100">100</option>
</select>
<?php print _txt('fd.page.limit.records'); ?>
<input type="submit" value="<?php print _txt('op.go'); ?>" />
<script type="text/javascript">
$(function() {
// Check if the currentLimit holds an appropriate value on first load, and set the select option
if (currentLimit != '' && (currentLimit == '50' || currentLimit == '75' || currentLimit == '100')) {
$("#pageLimit").val(currentLimit);
}
});
</script>
</form>
</nav>
663 changes: 641 additions & 22 deletions View/GrouperGroups/groupinfo.ctp

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions View/GrouperGroups/groupmember.ctp
@@ -14,24 +14,26 @@
<tbody>
<?php foreach ($groupergroupmemberships as $group) : ?>
<tr>
<td><?php echo $this->Html->link(
<td>
<?php echo $this->Html->link(
isset($group['friendlyName']) ? $group['friendlyName'] : "No Name",
array(
'controller' => 'groupergroups',
'action' => 'groupinfo',
'?' => array('groupname' => urlencode($group['name']))
)
) ?></td>
) ?>
</td>
<td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
<td>
<?php echo $group['optedin'] ? $this->element('GrouperLite.Components/optAction', array(
'member' => $group['optedin'],
'action' => 'leavegroup',
'group' => $group['name']
'member' => $group['optedin'],
'action' => 'leavegroup',
'group' => $group['name']
)) : ''; ?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
</table>
</div>
</div>
344 changes: 344 additions & 0 deletions 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"
}
]
20 changes: 20 additions & 0 deletions 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;
}

0 comments on commit 765768d

Please sign in to comment.