Skip to content

Commit

Permalink
Merge branch 'develop' of bitbucket.org:unicon/comanagework into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@axel
axel committed Sep 24, 2021
2 parents 5196571 + b6e3f23 commit 80c4aa6
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 51 deletions.
32 changes: 16 additions & 16 deletions View/CoGrouperLites/display.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,6 @@ echo $this->element('GrouperLite.base-styles');
<h6 class="text-center mb-2 mt-2"><i class="fa fa-users"></i>&nbsp; <?php echo _txt('pl.grouperlite.dashboard.heading.groups'); ?></h6>
<div class="px-4 d-flex flex-column justify-content-center">
<a class="btn btn-primary" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'grouper_groups',
'action' => 'groupoptin',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.groups-can-join'); ?>
</a>
<a class="btn btn-primary mt-1" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'grouper_groups',
Expand All @@ -73,6 +62,17 @@ echo $this->element('GrouperLite.base-styles');
<?php echo _txt('pl.grouperlite.nav.memberships'); ?>

</a>
<a class="btn btn-primary mt-1" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'grouper_groups',
'action' => 'groupoptin',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.groups-can-join'); ?>
</a>
<a class="btn btn-primary mt-1" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
Expand All @@ -94,24 +94,24 @@ echo $this->element('GrouperLite.base-styles');
array(
'plugin' => "grouper_lite",
'controller' => 'grouper_groups',
'action' => 'emaillistsoptin',
'action' => 'emaillistsMember',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.emaillists-join'); ?>
<?php echo _txt('pl.grouperlite.nav.emaillists-member'); ?>

</a>
<a class="btn btn-secondary mt-1" href="<?php print $this->Html->url(
array(
'plugin' => "grouper_lite",
'controller' => 'grouper_groups',
'action' => 'emaillistsMember',
'action' => 'emaillistsoptin',
'co' => $coid,
'glid' => $glid
)
); ?>">
<?php echo _txt('pl.grouperlite.nav.emaillists-member'); ?>

<?php echo _txt('pl.grouperlite.nav.emaillists-join'); ?>
</a>
<a class="btn btn-secondary mt-1" href="<?php print $this->Html->url(
array(
Expand Down
14 changes: 7 additions & 7 deletions View/Elements/Components/navigation-emaillists.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
<div class="nav-item">
<?php
print $this->Html->link(
_txt('pl.grouperlite.nav.emaillists-join'),
_txt('pl.grouperlite.nav.emaillists-member'),
array(
'controller' => 'grouper_groups',
'action' => 'emaillistsoptin'
'action' => 'emaillistsmember'
),
array('class' => array('nav-link', $active == 'emaillistsoptin' ? 'active' : ''))
array('class' => array('nav-link', $active == 'emaillistsmember' ? 'active' : ''))
)
?>
</div>
<div class="nav-item">
<?php
print $this->Html->link(
_txt('pl.grouperlite.nav.emaillists-member'),
_txt('pl.grouperlite.nav.emaillists-join'),
array(
'controller' => 'grouper_groups',
'action' => 'emaillistsmember'
'action' => 'emaillistsoptin'
),
array('class' => array('nav-link', $active == 'emaillistsmember' ? 'active' : ''))
array('class' => array('nav-link', $active == 'emaillistsoptin' ? 'active' : ''))
)
?>
</div>
Expand Down Expand Up @@ -57,7 +57,7 @@
$gotoGroupsUrl = $this->Html->url(
array(
'controller' => 'grouper_groups',
'action' => 'groupoptin'
'action' => 'groupmember'
)
);
?>
Expand Down
14 changes: 7 additions & 7 deletions View/Elements/Components/navigation-groups.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
<div class="nav-item">
<?php
print $this->Html->link(
_txt('pl.grouperlite.nav.groups-can-join'),
_txt('pl.grouperlite.nav.memberships'),
array(
'controller' => 'grouper_groups',
'action' => 'groupoptin'
'action' => 'groupmember'
),
array('class' => array('nav-link', $active == 'groupoptin' ? 'active' : ''))
array('class' => array('nav-link', $active == 'groupmember' ? 'active' : ''))
)
?>
</div>
<div class="nav-item">
<?php
print $this->Html->link(
_txt('pl.grouperlite.nav.memberships'),
_txt('pl.grouperlite.nav.groups-can-join'),
array(
'controller' => 'grouper_groups',
'action' => 'groupmember'
'action' => 'groupoptin'
),
array('class' => array('nav-link', $active == 'groupmember' ? 'active' : ''))
array('class' => array('nav-link', $active == 'groupoptin' ? 'active' : ''))
)
?>
</div>
Expand Down Expand Up @@ -73,7 +73,7 @@
$gotoEmailListsUrl = $this->Html->url(
array(
'controller' => 'grouper_groups',
'action' => 'emaillistsoptin'
'action' => 'emaillistsmember'
)
);
?>
Expand Down
6 changes: 3 additions & 3 deletions View/GrouperGroups/base.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ print $this->Html->css('GrouperLite.co-grouper-plugin') . "\n ";
<?php /* only JQuery here - other scripts at bottom */
print $this->Html->script('GrouperLite.typeahead.bundle.js') . "\n ";

$this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => 'grouper_groups', 'action' => 'groupoptin'), array('prepend' => true));
$this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => 'grouper_groups', 'action' => 'groupmember'), array('prepend' => true));
?>

<div id="grouper-plugin" class="grouper pt-2">
Expand All @@ -22,9 +22,9 @@ $this->Html->addCrumb(_txt('pl.grouperlite.crumb.root'), array('controller' => '
$('.grouper-table .collapse-btn').on('click', function(ev) {
var btn = $(ev.currentTarget);
if (btn.hasClass('collapsed')) {
btn.find('i').removeClass('fa-caret-down').addClass('fa-caret-up');
btn.find('i').removeClass('fa-caret-right').addClass('fa-caret-down');
} else {
btn.find('i').removeClass('fa-caret-up').addClass('fa-caret-down');
btn.find('i').removeClass('fa-caret-down').addClass('fa-caret-right');
}
})
</script>
28 changes: 16 additions & 12 deletions View/GrouperGroups/groupmember.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,25 @@ $numColumns = count($columns);
<tbody>
<tr class="table-secondary">
<td colspan="<?php echo $numColumns; ?>">
<button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="false">
<button type="button" class="btn btn-link btn-text collapse-btn collapsed fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="false">
Ad-hoc groups
<i class="fa fa-caret-up fa-sm"></i>
<i class="fa fa-caret-right fa-sm"></i>
</button>
</td>
</tr>
<?php foreach ($groupmemberships as $key => $group) : ?>
<tr class="collapse collapse-adhoc-group-parent show">
<td class="pl-3"><a href="<?php echo $this->Html->url(
array(
'controller' => 'grouper_groups',
'action' => 'groupinfo',
'?' => array('groupname' => urlencode($group['name']))
)
) ?>" title="<?php echo $group['name']; ?>"><?php echo $group['friendlyName'] ?? "No Name"; ?></a></td>
<tr class="collapse collapse-adhoc-group-parent">
<td class="pl-3">
<a href="<?php echo $this->Html->url(
array(
'controller' => 'grouper_groups',
'action' => 'groupinfo',
'?' => array('groupname' => urlencode($group['name']))
)
) ?>" title="<?php echo $group['name']; ?>">
<?php echo $group['friendlyName'] ?? "No Name"; ?>
</a>
</td>
<?php if ($isuserowner === 'T') { ?>
<td>&mdash;</td>
<?php } ?>
Expand All @@ -71,7 +75,7 @@ $numColumns = count($columns);
<td colspan="<?php echo $numColumns; ?>">
<button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-wg-working-group-parent" role="button" aria-expanded="false">
Working groups
<i class="fa fa-caret-up fa-sm"></i>
<i class="fa fa-caret-down fa-sm"></i>
</button>
</td>
</tr>
Expand All @@ -80,7 +84,7 @@ $numColumns = count($columns);
<td colspan="<?php echo $numColumns - 2; ?>">
<button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0 collapsed" data-toggle="collapse" data-target=".collapse-wg-<?php echo $wggroup['WGName']; ?>" role="button" aria-expanded="false">
<?php echo $wggroup['WGName'] ?? "No Name"; ?>
<i class="fa fa-caret-down fa-sm"></i>
<i class="fa fa-caret-right fa-sm"></i>
</button>
</td>
<td>
Expand Down
12 changes: 6 additions & 6 deletions View/GrouperGroups/groupoptin.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ $numColumns = count($columns);
<tbody>
<tr class="table-secondary">
<td colspan="<?php echo $numColumns; ?>">
<button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="false">
<button type="button" class="btn btn-link btn-text collapse-btn collapsed fw-bold m-0" data-toggle="collapse" data-target=".collapse-adhoc-group-parent" role="button" aria-expanded="false">
Ad-hoc groups
<i class="fa fa-caret-up fa-sm"></i>
<i class="fa fa-caret-right fa-sm"></i>
</button>
</td>
</tr>
<?php foreach ($groupoptins as $key => $group) : ?>
<tr class="collapse collapse-adhoc-group-parent show">
<tr class="collapse collapse-adhoc-group-parent">
<td class="pl-3"><a href="<?php echo $this->Html->url(
array(
'controller' => 'grouper_groups',
Expand All @@ -67,14 +67,14 @@ $numColumns = count($columns);
<tbody>
<tr class="table-secondary">
<td colspan="<?php echo $numColumns; ?>">
<button type="button" class="btn btn-link btn-text collapse-btn fw-bold m-0" data-toggle="collapse" data-target=".collapse-wg-working-group-parent" role="button" aria-expanded="false">
<button type="button" class="btn btn-link btn-text collapse-btn collapsed fw-bold m-0" data-toggle="collapse" data-target=".collapse-wg-working-group-parent" role="button" aria-expanded="false">
Working groups
<i class="fa fa-caret-up fa-sm"></i>
<i class="fa fa-caret-right fa-sm"></i>
</button>
</td>
</tr>
<?php foreach ($wgoptins as $i => $wgoptin) : ?>
<tr class="table- collapse collapse-wg-working-group-parent show">
<tr class="table- collapse collapse-wg-working-group-parent">
<td colspan="<?php echo $numColumns - 2; ?>">
<span class="h6"><?php echo $wgoptin['WGName'] ?? "No Name"; ?></span>
</td>
Expand Down

0 comments on commit 80c4aa6

Please sign in to comment.