diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php index 4207eaf..e46f7a8 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupBL.php @@ -13,6 +13,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); require_once("addGroupUI.inc"); + require_once("../adminUI.inc"); require_once("$default->fileSystemRoot/lib/groups/GroupUnitLink.inc"); require_once("$default->fileSystemRoot/lib/security/permission.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc index 836289b..08c7970 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc @@ -15,16 +15,15 @@ function getPage() { $aParameterNumbers = array(0); $aDisplayColumnTypes = array(1); $aRequired = array(1); - //$aDropDownListTableNames = array(10=>"document_types_lookup"); // create a text field that is required $oPatternCreate = & new PatternCreate("Group", "groups/Group.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); $oPatternCreate->setUniqueName("group"); - $sToRender .= "

\n"; - $sToRender .= "Add a New Group to the System:\n"; + $sToRender .= "" . renderHeading("Add Group") . "
"; + $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -33,7 +32,7 @@ function getPage() { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "
Add a New Group to the System
" . $oPatternCreate->render() . "
graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>graphicsUrl/widgets/add.gif\" value=\"Submit\" border=\"0\"/>
\n"; return $sToRender; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc index 89013aa..66a004f 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc @@ -18,15 +18,12 @@ function getPage($iUserID) { if (isset($iUserID)) { $oUser = User::get($iUserID); } else { - $heading = "Please select a User: \n"; + $heading = "Please select a User:\n"; } - $sToRender .= "

\n"; - $sToRender .= "Select a User to Remove from a Group:\n"; + $sToRender .= "" . renderHeading("Remove User From Group") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; $sToRender .= $heading; - $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -71,10 +68,9 @@ function getGroupPage($iUserID, $aGroup) { $Groupdisplay = "\n"; } - $sToRender .= "

\n"; - $sToRender .= "Select a Group to Remove User from:\n"; + $sToRender .= "
User Name: " . getUserDisplay($oUser) . "Group Name: " . $oGroup->getName() . "
" . renderHeading("Remove User From Group") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -104,7 +100,7 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { // change headings if User selected if (isset($iUserID)) { $oUser = User::get($iUserID); - $heading = "Are you sure you wish to remove this user from the Group?"; + $heading = ""; } // change headings if User selected @@ -113,10 +109,8 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { $Groupdisplay = "\n"; } - $sToRender .= "

\n"; - $sToRender .= "Select a Group to Remove User from:\n"; + $sToRender .= "
Select a Group to Remove User from:
User Name: " . getUserDisplay($oUser) . "
Are you sure you wish to remove this user from the Group?
Group Name: " . $oGroup->getName() . "
" . renderHeading("Remove User From Group") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; $sToRender .= "\n"; $sToRender .= $heading; $sToRender .= "\n"; @@ -142,10 +136,9 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { function getPageFail() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Sorry, Removal Failed\n"; + $sToRender .= "
" . renderHeading("Remove User From Group") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -164,10 +157,9 @@ function getPageFail() { function getPageSuccess() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Success!\n"; + $sToRender .= "
Sorry, Removal Failed
" . renderHeading("Remove User From Group") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n";
Success!
The User was successfully removed from the Group