diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php index fb45a29..ca1aa60 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgBL.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("addOrgUI.inc"); + require_once("../adminUI.inc"); require_once("$default->fileSystemRoot/lib/unitmanagement/UnitOrganisationLink.inc"); require_once("$default->fileSystemRoot/lib/security/permission.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php index 3fc876b..b7e98b4 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php @@ -9,38 +9,32 @@ */ require_once("../../../../../config/dmsDefaults.php"); +require_once("../adminUI.inc"); global $default; - -if(checkSession()) -{ - -// include the page template (with navbar) -require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - -$Center = "

\n" ; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "\n"; -$Center .= "
Organisation added Successfully!
rootUrl/control.php?action=addOrg\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; - - -$oPatternCustom = & new PatternCustom(); -$oPatternCustom->setHtml($Center); -$main->setCentralPayload($oPatternCustom); -$main->render(); - - - +if(checkSession()) { + + // include the page template (with navbar) + require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); + + $sToRender .= "" . renderHeading("Add Unit") . "
"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "
Organisation added Successfully!
rootUrl/control.php?action=addOrg\">graphicsUrl/widgets/back.gif\" border = \"0\" />
\n"; + + $oPatternCustom = & new PatternCustom(); + $oPatternCustom->setHtml($sToRender); + $main->setCentralPayload($oPatternCustom); + $main->render(); } - ?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc index 9a99495..dc0a641 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc @@ -21,10 +21,8 @@ function getPage() { $oPatternCreate = & new PatternCreate("Organisation", "orgmanagement/Organisation.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); $oPatternCreate->setUniqueName("organisation"); - $sToRender .= "

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

\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php index dd9bfba..bf82885 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgBL.php @@ -13,6 +13,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); require_once("editOrgUI.inc"); + require_once("../adminUI.inc"); require_once("$default->fileSystemRoot/lib/security/permission.inc"); require_once("$default->fileSystemRoot/lib/orgmanagement/Organisation.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc index 36693d1..84d93e5 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc @@ -14,14 +14,11 @@ function getEditPage($iOrgID) { $oOrg = null; if (isset($iOrgID)) { $oOrg = Organisation::get($iOrgID); - } - $sToRender .= "

\n"; - $sToRender .= "Edit Organisation Properties:\n"; + $sToRender .= "
" . $oPatternCreate->render() . "
" . renderHeading("Edit Organisation") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; - $sToRender .= "\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -31,10 +28,9 @@ function getEditPage($iOrgID) { $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "" . getUpdateButton($oOrg); - $sToRender .= getCancelButton($oOrg); + $sToRender .= getCancelButton($oOrg); $sToRender .= "
Please select an organisation:
Organisation Name: " . getOrgDisplay($oOrg) . "
\n"; - return $sToRender; } @@ -42,10 +38,9 @@ function getEditPage($iOrgID) { function getEditPageSuccess() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Success!\n"; + $sToRender .= "" . renderHeading("Edit Organisation") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -64,10 +59,9 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "

\n"; - $sToRender .= "Success!\n"; + $sToRender .= "
Success!
The Organisation was successfully modified
" . renderHeading("Edit Organisation") . "
"; $sToRender .= "\n"; - $sToRender .= "

\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -101,9 +95,7 @@ function getOrgDisplay($oOrg) { // gets the updatebutton when a Org is selected function getUpdateButton($oOrg) { global $default; - if (!isset($oOrg)) { - return "Please select a Organisation: "; - } else { + if (isset($oOrg)) { return "\n"; } } @@ -112,7 +104,7 @@ function getUpdateButton($oOrg) { function getCancelButton($oOrg) { global $default; if (!isset($oOrg)) { - //return "\n"; + return "\n"; } else { return "\n"; }
Failure!>/td>
Organisation modification Failed!
graphicsUrl/widgets/update.gif\" value=\"submit\" border=\"0\"/>rootUrl/control.php?action=groupManagement\">graphicsUrl/widgets/cancel.gif\" value=\"cancel\" />rootUrl/control.php?action=orgManagement\">graphicsUrl/widgets/cancel.gif\" value=\"cancel\" border=\"0\"/>rootUrl/control.php?action=editOrg\">graphicsUrl/widgets/cancel.gif\" border = \"0\" />