From 722c0b09ea8abf31d986cc073ffacf9995a5a6aa Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Sun, 3 Aug 2003 13:34:47 +0000 Subject: [PATCH] used refactored getAddLink method --- presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php | 1 + presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc | 11 ++--------- presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php | 1 + presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc | 9 +-------- presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php | 1 + presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc | 2 +- 6 files changed, 7 insertions(+), 18 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php index 687c9fc..fefdb1c 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsBL.php @@ -16,6 +16,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); require_once("listGroupsUI.inc"); if (checkSession()) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc index 465c4c1..087519c 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/listGroupsUI.inc @@ -8,13 +8,6 @@ * */ -function getAddGroupLink() { - global $default; - $sBGColor = $default->siteMap->getSectionColour("Administration", "td"); - return "
" . generateControllerLink("addGroup", "", "Add A Group") . "
\n"; -} - - // display the listbox initially ..then just display the text function getUnitDisplay($iUnitID) { global $default; @@ -27,7 +20,7 @@ function getUnitDisplay($iUnitID) { if ($iUnitID != 0) { $oPatternListBox->setSelectedValue($iUnitID); } - return "
Filter by Unit " . $oPatternListBox->render() . "
"; + return "
Filter By Unit " . $oPatternListBox->render() . "
"; } function getGroups($fUnitID) { @@ -58,7 +51,7 @@ function getPage($fUnitID) { global $default; $sToRender .= renderHeading("Current System Groups"); - $sToRender .= getAddGroupLink(); + $sToRender .= getAddLink("addGroup", "Add A Group"); $sToRender .= getUnitDisplay($fUnitID); $sToRender .= getGroups($fUnitID); return $sToRender; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php index 31c5e64..4ad43d3 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsBL.php @@ -15,6 +15,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); require_once("listUnitsUI.inc"); if (checkSession()) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc index 7be2074..9b6ebe6 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/listUnitsUI.inc @@ -8,12 +8,6 @@ * */ -function getAddUnitLink() { - global $default; - $sBGColor = $default->siteMap->getSectionColour("Administration", "td"); - return "
" . generateControllerLink("addUnit", "", "Add A Unit") . "
\n"; -} - function getOrganisationDisplay($fOrganisationID) { global $default; $oPatternListBox = & new PatternListBox($default->owl_organisations_table, "name", "id", "fOrganisationID"); @@ -55,8 +49,7 @@ function getPage($fOrganisationID) { global $default; $sToRender .= renderHeading("Current System Units"); - // add user link - $sToRender .= getAddUnitLink(); + $sToRender .= getAddLink("addUnit", "Add A Unit"); $sToRender .= getOrganisationDisplay($fOrganisationID); $sToRender .= getUnits($fOrganisationID); return $sToRender; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php index 84d9112..ac0844f 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php @@ -16,6 +16,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.i require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); require_once("listUsersUI.inc"); +require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc"); if (checkSession()) { $oPatternCustom = & new PatternCustom(); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc index 8efc655..f9f8ef5 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersUI.inc @@ -64,7 +64,7 @@ function getPage($fGroupID) { $sToRender .= renderHeading("Current System Users"); // add user link - $sToRender .= getAddUserLink(); + $sToRender .= getAddLink("addUser", "Add A User"); $sToRender .= getGroupDisplay($fGroupID); $sToRender .= getUsers($fGroupID); return $sToRender; -- libgit2 0.21.4