diff --git a/Model/GrouperLite.php b/Model/GrouperLite.php index ef785ea..860de2a 100644 --- a/Model/GrouperLite.php +++ b/Model/GrouperLite.php @@ -21,12 +21,12 @@ class GrouperLite extends AppModel { public function cmPluginMenus() { return array( - "cogroups" => array( + /*"cogroups" => array( 'Grouper groups' => array( 'controller' => "groupergroups", 'action' => "groupoptin" ) - ) + )*/ ); } diff --git a/View/CoGrouperLites/display.ctp b/View/CoGrouperLites/display.ctp index 469ea62..376c317 100644 --- a/View/CoGrouperLites/display.ctp +++ b/View/CoGrouperLites/display.ctp @@ -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']; ?> -
-
-
- 'GrouperGroups', - 'action' => 'groupoptin', - 'co' => $coid, - 'glid' => $glid - ) - ); ?>"> - - + \ No newline at end of file diff --git a/View/Elements/Components/groupattributes.ctp b/View/Elements/Components/groupattributes.ctp index 11cb6a7..c2ba7d5 100644 --- a/View/Elements/Components/groupattributes.ctp +++ b/View/Elements/Components/groupattributes.ctp @@ -1,7 +1,7 @@ - + diff --git a/View/Elements/Components/optAction.ctp b/View/Elements/Components/optAction.ctp index b80be2e..1324664 100644 --- a/View/Elements/Components/optAction.ctp +++ b/View/Elements/Components/optAction.ctp @@ -2,7 +2,7 @@ 'url' => array('controller' => 'groupergroups', 'action' => $action) )); ?> Form->hidden('GroupName', array('default' => $group)); ?> - diff --git a/View/GrouperGroups/emaillistsmanaged.ctp b/View/GrouperGroups/emaillistsmanaged.ctp index b9a1204..0a6961f 100644 --- a/View/GrouperGroups/emaillistsmanaged.ctp +++ b/View/GrouperGroups/emaillistsmanaged.ctp @@ -28,7 +28,7 @@ + + View in Grouper   @@ -37,7 +41,7 @@ $attrUrlBase = $baseUrl.$path.$attrOperation;

Subscribers

-
+
element('Components/subscriberList', array('subscribers' => array( array( "name" => "Galena Munoz", @@ -54,4 +58,4 @@ $attrUrlBase = $baseUrl.$path.$attrOperation; ))); ?>
- + \ No newline at end of file diff --git a/View/GrouperGroups/groupmember.ctp b/View/GrouperGroups/groupmember.ctp index 93d9f5f..4b78ae2 100644 --- a/View/GrouperGroups/groupmember.ctp +++ b/View/GrouperGroups/groupmember.ctp @@ -9,7 +9,6 @@
- @@ -25,13 +24,6 @@ ) ?> - diff --git a/View/GrouperGroups/groupowner.ctp b/View/GrouperGroups/groupowner.ctp index 7f66485..c288924 100644 --- a/View/GrouperGroups/groupowner.ctp +++ b/View/GrouperGroups/groupowner.ctp @@ -36,11 +36,11 @@
Attribute nameAttribute name Attribute description Action
- element('GrouperLite.Components/optAction', array( - 'member' => $group['member'], - 'action' => $group['member'] ? 'leavegroup' : 'joingroup', - 'group' => $group['name'] - )); ?> -
- - diff --git a/webroot/css/co-grouper-plugin.css b/webroot/css/co-grouper-plugin.css index bf37d93..22a2668 100644 --- a/webroot/css/co-grouper-plugin.css +++ b/webroot/css/co-grouper-plugin.css @@ -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; } \ No newline at end of file