Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed flash message
@rmathis
rmathis committed Feb 2, 2021
1 parent 4a4e60b commit df35b95
Showing 7 changed files with 60 additions and 87 deletions.
18 changes: 9 additions & 9 deletions Controller/GrouperGroupsController.php
View file
@@ -99,7 +99,7 @@ public function groupMember() {
} catch (Exception $e) {
CakeLog::write('error',
'GrouperLite Controller - groupMember: ' . var_export($e->getMessage(), true));
$this->Flash->error("Your Membership Groups cannot be found currently, please try again later.");
$this->Flash->set("Your Membership Groups cannot be found currently, please try again later.", array('key' => 'error'));
$this->set('groupergroupmemberships', array());
}
}
@@ -118,15 +118,15 @@ public function groupOptin() {
try {
$optin = $this->GrouperGroup->optinGroups($this->userId);
if (isset($optin['errorMessage'])){
$this->Flash->error('Some error');
$this->Flash->set('Some error', array('key' => 'error'));
$this->set('groupergroupoptin', array());
} else {
$this->set('groupergroupoptin', $optin);
}

} catch (Exception $e) {
CakeLog::write('error', 'GrouperLite Controller: Seeing is believing');
$this->Flash->error($e->getMessage());
$this->Flash->set($e->getMessage(), array('key' => 'error'));
$this->set('groupergroupoptin', array());
}
}
@@ -156,13 +156,13 @@ public function joinGroup() {
$name = $this->request->data['GroupName'];

if($this->GrouperGroup->joinGroup($this->userId, $name)) {
$this->Flash->success(_txt('pl.grouperlite.message.flash.join-group-success'));
$this->Flash->set(_txt('pl.grouperlite.message.flash.join-group-success'), array('key' => 'success'));
} else {
$this->Flash->error(_txt('pl.grouperlite.message.flash.join-group-failed'));
$this->Flash->set(_txt('pl.grouperlite.message.flash.join-group-failed'), array('key' => 'error'));
}

} else {
$this->Flash->error(_txt('pl.grouperlite.message.flash.join-group-error'));
$this->Flash->set(_txt('pl.grouperlite.message.flash.join-group-error'));
}

return $this->redirect(array('action' => 'groupoptin'));
@@ -178,12 +178,12 @@ public function leaveGroup() {
$name = $this->request->data['GroupName'];

if($this->GrouperGroup->leaveGroup($this->userId, $name)) {
$this->Flash->success(_txt('pl.grouperlite.message.flash.leave-group-success'));
$this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-success'), array('key' => 'success'));
} else {
$this->Flash->error(_txt('pl.grouperlite.message.flash.leave-group-failed'));
$this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-failed'), array('key' => 'error'));
}
} else {
$this->Flash->error(_txt('pl.grouperlite.message.flash.leave-group-error'));
$this->Flash->set(_txt('pl.grouperlite.message.flash.leave-group-error'), array('key' => 'error'));
}

return $this->redirect(array('action' => 'groupmember'));
4 changes: 2 additions & 2 deletions View/CoGrouperLites/display.ctp
View file
@@ -40,8 +40,8 @@ $divid = $vv_config['CoGrouperLite']['co_dashboard_widget_id'];
<div class="card">
<div class="row no-gutters">
<div class="col-xs-5 col-md-5">
<div class="p-4 h-100 d-flex flex-md-column justify-content-center flex-row">
<?php print $this->Html->image('GrouperLite.grouper-logo.png', array('class' => 'img-fluid')); ?>
<div class="p-4 h-100 d-flex flex-md-column justify-content-center flex-row align-items-center">
<?php print $this->Html->image('GrouperLite.grouper-logo.png', array('class' => 'logo-fluid')); ?>
</div>
</div>
<div class="col-xs-7 col-md-7">
71 changes: 38 additions & 33 deletions View/Elements/Components/search.ctp
View file
@@ -1,47 +1,52 @@
<script type="text/javascript">
$(function() {
var collapse = $(".collapse"),
btn = $(".adv-search-link"),
open = false;
$(function() {
var collapse = $(".collapse"),
btn = $(".adv-search-link"),
open = false;

btn.addClass("active");
collapse.hide();
btn.click(function(ev){
ev.preventDefault();
open = !open;
collapse.slideToggle();
btn.toggleClass('active');
btn.find('.fa').toggleClass('fa-caret-down').toggleClass('fa-caret-up');
btn.addClass("active");
collapse.hide();
btn.click(function(ev) {
ev.preventDefault();
open = !open;
collapse.slideToggle();
btn.toggleClass('active');
btn.find('.fa').toggleClass('fa-caret-down').toggleClass('fa-caret-up');
});
});
});
</script>
<?php echo $this->Form->create(false, array(
'url' => array('controller' => 'groupergroups', 'action' => $active),
'class' => 'search mb-4'
)); ?>
<div>
<div class="d-flex">
<div class="input-group input-group-search">
<?php echo $this->Form->input("search", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
<!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
<div class="input-group-append">
<button class="btn btn-outline-secondary px-4" type="submit" value="Submit">
<i class="fa fa-search"></i>
<span class="ml-2"><?php echo _txt('pl.grouperlite.action.search'); ?></span>
<div id="search-grouper-form">
<div class="d-flex">
<div class="input-group input-group-search">
<?php echo $this->Form->input("search", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?>
<!--<input type="text" name="search" class="form-control" value="<?php echo isset($searchcriteria) ? $searchcriteria : ''; ?>" /> -->
<div class="input-group-append">
<?php if (isset($searchcriteria) && $searchcriteria !== '') { ?>
<button class="btn btn-outline-secondary" type="button" value="Clear" id="reset-search">
<i class="fa fa-times fa-lg"></i>
</button>
</div>
<?php } ?>
<button class="btn btn-primary px-4" type="submit" value="Submit">
<i class="fa fa-search"></i>
<span class="ml-2"><?php echo _txt('pl.grouperlite.action.search'); ?></span>
</button>
</div>
</div>
<?php if (isset($searchcriteria)) { ?>
<div class="d-flex px-2 pt-4">
<button class="btn btn-badge btn-primary badge badge-pill badge-primary">
<?php echo _txt('pl.grouperlite.search.tags.text').' '.$searchcriteria; ?>
<i class="fa fa-times"></i>
</button>
</div>
<?php } ?>
</div>
<!--
<script>
$(function() {
$('#reset-search').on('click', function() {
$('input#search').val('');
$('#groupoptinForm').submit();
});
});
</script>
</div>
<!--
<div id class="my-2 collapse bg-light border-light py-3 px-4">
<div class="row">
<div class="col col-lg-6 col-12">
@@ -103,4 +108,4 @@ $(function() {
</button>
</div>
-->
<?php echo $this->Form->end(); ?>
<?php echo $this->Form->end(); ?>
8 changes: 0 additions & 8 deletions View/Elements/Flash/container.ctp
View file

This file was deleted.

1 change: 0 additions & 1 deletion View/Elements/Flash/default.ctp
View file

This file was deleted.

18 changes: 9 additions & 9 deletions View/GrouperGroups/fields.inc
View file
@@ -92,21 +92,21 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
});
</script>

<div class="form-group row py-2 bg-lighter">
<?php echo $this->Form->label(false, _txt('pl.grouperlite.form.group.template.label'), array(
<!--<div class="form-group row py-2 bg-lighter">
<?php /* echo $this->Form->label(false, _txt('pl.grouperlite.form.group.template.label'), array(
'for' => 'template-select',
'class' => "col-sm-3 col-form-label"
)); ?>
)); */ ?>
<div class="col-sm-9">
<?php echo $this->Form->input('grouptemplate', array(
<?php /*echo $this->Form->input('grouptemplate', array(
'label' => false,
'class' => 'custom-select',
'id' => 'template-select',
'options' => array('1' => 'Template', '2' => 'Another template', '3' => 'Yet another template'),
'empty' => _txt('pl.grouperlite.form.group.template.empty')
)); ?>
)); */ ?>
</div>
</div>
</div>-->
<fieldset id="form" class="">
<div class="form-group row py-2 bg-light">
<?php echo $this->Form->label(false, _txt('pl.grouperlite.form.group.name.label'), array(
@@ -181,8 +181,8 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
</div>
</div>
</div>
<div class="form-group row py-2 bg-light">
<?php echo $this->Form->label(false, _txt('pl.grouperlite.form.group.subs.label'), array(
<?php /* <div class="form-group row py-2 bg-light">
echo $this->Form->label(false, _txt('pl.grouperlite.form.group.subs.label'), array(
'for' => 'subscribers',
'class' => "col-sm-3 col-form-label"
)); ?>
@@ -198,7 +198,7 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
</small>
<div id="subscriber-list" class="my-2"></div>
</div>
</div>
</div> */ ?>
<div class="form-group row py-2 bg-lighter">
<div class="col-sm-9 offset-sm-3">
<?php echo $this->Form->button(_txt('pl.grouperlite.form.group.action.save'), array(
27 changes: 2 additions & 25 deletions webroot/css/co-grouper-plugin.css
View file
@@ -140,32 +140,9 @@ a {
color: white;
}

.flash-container {
top: 20px;
left: 805px;
position: fixed;
width: 310px;
.logo-fluid {
max-width: 194px;
height: auto;
margin: 0px;
padding: 0px;
list-style-type: none;
z-index: 10000000;
}

.flash-container .message {
overflow: hidden;
background: lightgreen url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAoCAYAAAAPOoFWAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPZJREFUeNq81tsOgjAMANB2ov7/7ypaN7IlIwi9rGuT8QSc9EIDAsAznxvY4pXPKr05RUE5MEVB+TyWfCEl9LZApYopCmo9C4FKSMtYoI8Bwv79aQJU4l6hXXCZrQbokJEksxHo9KMOgc6w1atHXM8K9DVC7FQnJ0i8iK3QooGgbnyKgMDygBWyYFZoqx4qS27KqLZJjA1D0jK6QJcYEQEiWv9PGkTsbqxQ8oT+ZtZB6AkdsJnQDnMoHXHLGKOgDYuCWmYhEERCI5gaamW0bnHdA3k2ltlIN+2qKRyCND0bhqSYCyTB3CAOc4WusBEIpkeBuPgJMAAX8Hs1NfqHRgAAAABJRU5ErkJggg==") repeat-x scroll left top;
border-radius: 5px;
border: 1px solid rgb(80, 194, 78);
box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 4px;
color: darkgreen;
width: 310px;
cursor: pointer;
font-size: 13px;
line-height: 16px;
text-align: center;
padding: 8px 10px 9px;
position: relative;
}

.badge {

0 comments on commit df35b95

Please sign in to comment.