diff --git a/module/my/control.php b/module/my/control.php index 5d29b3ad53..3985d2acf7 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -374,7 +374,11 @@ class my extends control if($this->post->mode == 'new') { $listID = $this->user->createContactList($this->post->newList, $this->post->users); - die(js::locate(inlink('manageContacts', "listID=$listID"), 'parent')); + if(isonlybody()) + { + die(js::closeModal('parent.parent', '', 'function(){parent.parent.ajaxGetContacts(\'#mailtoGroup\')}')); + } + else die(js::locate(inlink('manageContacts', "listID=$listID"), 'parent')); } elseif($this->post->mode == 'edit') { diff --git a/module/project/css/managemembers.css b/module/project/css/managemembers.css index 9f2f166590..62c9f77c93 100644 --- a/module/project/css/managemembers.css +++ b/module/project/css/managemembers.css @@ -14,3 +14,7 @@ .modal-dialog {margin-top: 10%;} .table-form thead > tr > th {background: none; border: none} + +#titlebar > .heading {float: left; padding-right: 10px!important} +#titlebar > .heading > .icon {display: inline;} +#deptSelector {float: left; min-width: 220px; position: relative; top: -7px} diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index a8da0de2cd..6598d8a5e1 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -16,11 +16,10 @@
- icons['team']);?> - project->manageMembers;?> - + project->manageMembers;?> +
-
project->selectDept}'");?>
+
project->selectDept}'");?>
diff --git a/www/js/my.full.js b/www/js/my.full.js index 7ba89e60c6..4aca74f86a 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -624,7 +624,7 @@ function ajaxGetContacts(obj) { if(!contacts) return false; - $inputgroup = $(obj).parent().parent(); + $inputgroup = $(obj).closest('.input-group'); $inputgroup.find('.input-group-btn').remove(); $inputgroup.append(contacts); $inputgroup.find('select:last').chosen(defaultChosenOptions);