Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated styles and layouts
@rmathis
rmathis committed Jan 28, 2021
1 parent b7243a8 commit 8a88679
Showing 9 changed files with 79 additions and 78 deletions.
4 changes: 2 additions & 2 deletions Model/GrouperLite.php
View file
@@ -21,12 +21,12 @@ class GrouperLite extends AppModel {

public function cmPluginMenus() {
return array(
"cogroups" => array(
/*"cogroups" => array(
'Grouper groups' => array(
'controller' => "groupergroups",
'action' => "groupoptin"
)
)
)*/
);
}

92 changes: 47 additions & 45 deletions View/CoGrouperLites/display.ctp
View file
@@ -32,54 +32,56 @@
// Figure out the widget ID so we can overwrite the dashboard's widget div
$divid = $vv_config['CoGrouperLite']['co_dashboard_widget_id'];
?>
<div class="row">
<div class="col-12 col-lg-6 col-xl-4">
<div class="list-group" style="border-radius: 0px">
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'GrouperGroups',
'action' => 'groupoptin',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.groups-can-join'); ?>
<i class="fa fa-arrow-right" aria-hidden="true"></i>
<div class="container-fluid p-0">
<div class="row no-gutters">
<div class="col-12 col-lg-6 col-xl-3">
<div class="list-group list-group-flush" style="">
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'GrouperGroups',
'action' => 'groupoptin',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.groups-can-join'); ?>
<i class="fa fa-arrow-right" aria-hidden="true"></i>

</a>
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'GrouperGroups',
'action' => 'groupowner',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.groups-presided'); ?>
<i class="fa fa-arrow-right" aria-hidden="true"></i>
</a>
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'GrouperGroups',
'action' => 'groupowner',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.groups-presided'); ?>
<i class="fa fa-arrow-right" aria-hidden="true"></i>

</a>
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'GrouperGroups',
'action' => 'groupmember',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.memberships'); ?>
<i class="fa fa-arrow-right" aria-hidden="true"></i>
</a>
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'GrouperGroups',
'action' => 'groupmember',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.memberships'); ?>
<i class="fa fa-arrow-right" aria-hidden="true"></i>

</a>
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="#" tabindex="-1" aria-disabled="true">
<?php echo _txt('pl.grouperlite.nav.email-lists'); ?>
</a>
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="#" tabindex="-1" aria-disabled="true">
<?php echo _txt('pl.grouperlite.nav.email-lists-managed'); ?>
</a>
</a>
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="#" tabindex="-1" aria-disabled="true">
<?php echo _txt('pl.grouperlite.nav.email-lists'); ?>
</a>
<a class="list-group-item list-group-item-action d-flex justify-content-between align-items-center" href="#" tabindex="-1" aria-disabled="true">
<?php echo _txt('pl.grouperlite.nav.email-lists-managed'); ?>
</a>
</div>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion View/Elements/Components/groupattributes.ctp
View file
@@ -1,7 +1,7 @@
<table class="table table-striped w-100">
<thead>
<tr>
<th class="attr descr">Attribute name</th>
<th class="attr">Attribute name</th>
<th class="attr definition">Attribute description</th>
<th class="attr action">Action</th>
</tr>
2 changes: 1 addition & 1 deletion View/Elements/Components/optAction.ctp
View file
@@ -2,7 +2,7 @@
'url' => array('controller' => 'groupergroups', 'action' => $action)
)); ?>
<?php print $this->Form->hidden('GroupName', array('default' => $group)); ?>
<button class="btn btn-raised btn-block btn-<?php echo $member ? 'danger' : 'success'; ?>" type="submit">
<button class="btn btn-block btn-<?php echo $member ? 'danger' : 'success'; ?>" type="submit">
<?php echo $member ? _txt('pl.grouperlite.action.leave-group') : _txt('pl.grouperlite.action.join-group') ?> &nbsp;
<i class="fa fa-<?php echo $member ? 'user-times' : 'users'; ?> fa-sm"></i>
</button>
2 changes: 1 addition & 1 deletion View/GrouperGroups/emaillistsmanaged.ctp
View file
@@ -28,7 +28,7 @@
<span class="d-flex flex-column flex-lg-row justify-content-between align-items-center">
<button class="btn btn-raised btn-primary w-50 mr-1">
<?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
<i class="fa fa-edit fa-sm"></i>
<i class="fa fa-pencil fa-sm"></i>
</button>
<button class="btn btn-raised btn-danger w-50 ml-1">
<?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
18 changes: 11 additions & 7 deletions View/GrouperGroups/groupinfo.ctp
View file
@@ -4,17 +4,21 @@
$baseUrl = 'https://grouper.staging.at.internet2.edu/grouper/';
$path = 'grouperUi/app/UiV2Main.index';
$groupOperation = '?operation=UiV2Group.viewGroup&groupId=';
$groupUrlBase = $baseUrl.$path.$groupOperation;
$groupUrlBase = $baseUrl . $path . $groupOperation;
$attrOperation = '?operation=UiV2AttributeDefName.viewAttributeDefName&attributeDefNameId=';
$attrUrlBase = $baseUrl.$path.$attrOperation;
$attrUrlBase = $baseUrl . $path . $attrOperation;
?>

<div>
<div class="border-bottom py-4 mb-4 d-flex justify-content-between">
<h2><strong>Group: </strong><?php echo $groupergroupsdetail['displayName']; ?></h2>
<div>
<a href="<?php echo $groupUrlBase.$groupergroupsdetail['uuid']; ?>" class="btn btn-primary btn-raised" target="_blank" role="button">
View Group in Grouper &nbsp;
<div class="d-flex align-items-center">
<button class="btn btn-primary mr-2">
Edit Group
<i class="fa fa-pencil fa-sm"></i>
</button>
<a href="<?php echo $groupUrlBase . $groupergroupsdetail['uuid']; ?>" class="btn btn-success mt-0" target="_blank" role="button">
View in Grouper &nbsp;
<i class="fa fa-external-link"></i>
</a>
</div>
@@ -37,7 +41,7 @@ $attrUrlBase = $baseUrl.$path.$attrOperation;
</div>
<div class="col-xl-6 col-xs-12">
<h3>Subscribers</h3>
<hr class="m-0" />
<hr class="mb-0" />
<?php echo $this->element('Components/subscriberList', array('subscribers' => array(
array(
"name" => "Galena Munoz",
@@ -54,4 +58,4 @@ $attrUrlBase = $baseUrl.$path.$attrOperation;
))); ?>
</div>
</div>
</div>
</div>
8 changes: 0 additions & 8 deletions View/GrouperGroups/groupmember.ctp
View file
@@ -9,7 +9,6 @@
<th class="group name"><?php echo _txt('pl.grouperlite.table.name'); ?></th>
<th class="group description"><?php echo _txt('pl.grouperlite.table.description'); ?></th>
<th class="group status"><?php echo _txt('pl.grouperlite.table.status'); ?></th>
<th class="group action"><?php echo _txt('pl.grouperlite.table.action'); ?></th>
</tr>
</thead>
<tbody>
@@ -25,13 +24,6 @@
) ?></td>
<td><?php echo isset($group['description']) ? $group['description'] : _txt('pl.grouperlite.value.descr.zerostate'); ?></td>
<td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? _txt('pl.grouperlite.value.enabled') : _txt('pl.grouperlite.value.disabled'); ?></td>
<td>
<?php echo $this->element('GrouperLite.Components/optAction', array(
'member' => $group['member'],
'action' => $group['member'] ? 'leavegroup' : 'joingroup',
'group' => $group['name']
)); ?>
</td>
</tr>
<?php endforeach; ?>
</tbody>
6 changes: 3 additions & 3 deletions View/GrouperGroups/groupowner.ctp
View file
@@ -36,11 +36,11 @@
<td><?php echo isset($group['enabled']) && $group['enabled'] === 'T' ? 'Enabled' : 'Disabled'; ?></td>
<td class="text-right">
<span class="d-flex flex-column flex-lg-row justify-content-between align-items-center">
<button class="btn btn-raised btn-primary w-50 mr-1">
<button class="btn btn-primary btn-block">
<?php echo _txt('pl.grouperlite.action.edit-group'); ?> &nbsp;
<i class="fa fa-edit fa-sm"></i>
<i class="fa fa-pencil fa-sm"></i>
</button>
<button class="btn btn-raised btn-danger w-50 ml-1">
<button class="btn btn-danger btn-block ml-1 mt-0">
<?php echo _txt('pl.grouperlite.action.disable-group'); ?> &nbsp;
<i class="fa fa-ban fa-sm"></i>
</button>
23 changes: 13 additions & 10 deletions webroot/css/co-grouper-plugin.css
View file
@@ -1,8 +1,3 @@
.btn.btn-primary {
background-color: var(--primary);
border-color: var(--primary);
}

.badge.badge-primary {
background-color: var(--primary);
border-color: var(--primary);
@@ -11,11 +6,14 @@
.btn.btn-success {
background-color: var(--success);
border-color: var(--success);
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);
}

.btn.btn-danger {
background-color: var(--danger);
border-color: var(--danger);
color: white;
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);
}

.btn.btn-icon {
@@ -28,10 +26,6 @@ a {
color: var(--primary);
}

#grouper-plugin .btn.btn-raised {
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);
}

#grouper-plugin .btn.btn-primary:hover {
background-color: black;
border-color: black;
@@ -113,6 +107,7 @@ a {
border-right: 2px solid #fff;
border-bottom: 2px solid #fff;
font-weight: normal;
vertical-align: middle;
}

#grouper-plugin .form-control, #grouper-plugin .custom-select {
@@ -206,10 +201,18 @@ a {
background-color: #EEE;
}

.input-group > .input.text {
.input-group>.input.text {
position: relative;
flex: 1 1 auto;
width: 1%;
min-width: 0;
margin-bottom: 0;
}

a.list-group-item-action:hover {
text-decoration: underline;
}

a.list-group-item-action:hover .fa {
text-decoration: none;
}

0 comments on commit 8a88679

Please sign in to comment.