diff --git a/Controller/GrouperGroupsController.php b/Controller/GrouperGroupsController.php index 2b79a7c..21e8a16 100644 --- a/Controller/GrouperGroupsController.php +++ b/Controller/GrouperGroupsController.php @@ -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,7 +118,7 @@ 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); @@ -126,7 +126,7 @@ public function groupOptin() { } 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')); diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp index 3d3c010..b35721b 100644 --- a/View/CoGrouperLites/display.ctp +++ b/View/CoGrouperLites/display.ctp @@ -40,8 +40,8 @@ $divid = $vv_config['CoGrouperLite']['co_dashboard_widget_id'];
-
- Html->image('GrouperLite.grouper-logo.png', array('class' => 'img-fluid')); ?> +
+ Html->image('GrouperLite.grouper-logo.png', array('class' => 'logo-fluid')); ?>
diff --git a/View/Elements/Components/search.ctp b/View/Elements/Components/search.ctp index 3baffe6..b214c64 100644 --- a/View/Elements/Components/search.ctp +++ b/View/Elements/Components/search.ctp @@ -1,47 +1,52 @@ Form->create(false, array( 'url' => array('controller' => 'groupergroups', 'action' => $active), 'class' => 'search mb-4' )); ?> -
-
-
- Form->input("search", array('label' => false, 'class' => 'form-control', 'value' => isset($searchcriteria) ? $searchcriteria : '')) ?> - -
- -
+ +
- -
- -
-
- -Form->end(); ?> +Form->end(); ?> \ No newline at end of file diff --git a/View/Elements/Flash/container.ctp b/View/Elements/Flash/container.ctp deleted file mode 100644 index 1fc0d0f..0000000 --- a/View/Elements/Flash/container.ctp +++ /dev/null @@ -1,8 +0,0 @@ -
-Flash->render(); ?> -
- \ No newline at end of file diff --git a/View/Elements/Flash/default.ctp b/View/Elements/Flash/default.ctp deleted file mode 100755 index 96d4cbc..0000000 --- a/View/Elements/Flash/default.ctp +++ /dev/null @@ -1 +0,0 @@ -
diff --git a/View/GrouperGroups/fields.inc b/View/GrouperGroups/fields.inc index c4f8018..ee78e06 100644 --- a/View/GrouperGroups/fields.inc +++ b/View/GrouperGroups/fields.inc @@ -92,21 +92,21 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ'); }); -
- Form->label(false, _txt('pl.grouperlite.form.group.template.label'), array( +
Form->label(false, _txt('pl.grouperlite.form.group.name.label'), array( @@ -181,8 +181,8 @@ $PRIVELAGES = array('READ', 'VIEW', 'OPTIN', 'OPTOUT', 'ATTRIBUTE_READ');
-
- Form->label(false, _txt('pl.grouperlite.form.group.subs.label'), array( + + 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');
-
+
*/ ?>
Form->button(_txt('pl.grouperlite.form.group.action.save'), array( diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css index 22a2668..38484bc 100644 --- a/webroot/css/co-grouper-plugin.css +++ b/webroot/css/co-grouper-plugin.css @@ -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 {