diff --git a/presentation/lookAndFeel/knowledgeTree/administration/admin.php b/presentation/lookAndFeel/knowledgeTree/administration/admin.php index 6ac1474..2defec7 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/admin.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/admin.php @@ -1,6 +1,6 @@ fileSystemRoot/presentation/Html.inc"); /** * $Id$ @@ -14,21 +14,28 @@ require_once("adminUI.inc"); * @package presentation.lookAndFeel.knowledgeTree.administration */ -if(checkSession()) { +/** + * Display the heading for the admin section + */ +function renderAdminHeading($sHeading, $sSectionName = "") { + $sCenter .= renderHeading("Administration"); + $sCenter .= "\n"; + $sCenter .= "\n"; + $sCenter .= "\n"; + $sCenter .= "
Welcome to the Administration Section
Please make a selection from the sidemenu.
\n"; + return $sCenter; +} + +if (checkSession()) { require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - if (isset($sectionName)) { - $sCenter .= "\n"; - if ($sectionName == "userAdministration") { - - $sCenter .= renderHeading("User Administration"); - }else if ($sectionName == "Administration"){ - $sCenter .= "
\n"; - $sCenter .= renderHeading("Administration"); - } - $sCenter .= "
\n"; - } - //$sCenter .= ""; + if (!isset($sectionName)) { + $sectionName = "Administration"; + } + $sCenter .= "\n"; + $sCenter .= renderAdminHeading("Administration"); + $sCenter .= "
\n"; + $oPatternCustom = & new PatternCustom(); $oPatternCustom->setHtml($sCenter); $main->setCentralPayload($oPatternCustom); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc index bbb19e3..64387dd 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/adminUI.inc @@ -1,32 +1,5 @@ siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); - } - $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); - $sColor = $sColor == "" ? $sSectionName : $sColor; - $sToRender .= "$sHeading\n"; - $sToRender .= "\n"; - $sToRender .= "\n"; - return $sToRender; -} -function renderHeading($sHeading, $sSectionName = "") { - //global $default; - - - $sCenter .= getHeading($sHeading, $sSectionName); - if ($sHeading == "Administration"){ - $sCenter .= " Welcome to the Administration Section\n"; - $sCenter .= "Please make a selection from the sidemenu.\n"; - } - - return $sCenter; -} + ?> diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php index fe7ee79..ee2aed8 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldSuccess.php @@ -18,7 +18,7 @@ if(checkSession()) { // include the page template (with navbar) require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $Center .= "" . renderHeading("Add Document Field") . "
"; + $Center .= renderHeading("Add Document Field"); $Center .= "\n"; $Center .= "\n"; if ($fDocTypeID == -1) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc index d6074b4..525ea5d 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/addDocFieldUI.inc @@ -23,7 +23,7 @@ function getPage() { $oPatternCreate = & new PatternCreate("DocumentField", "documentmanagement/DocumentField.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired,$aDropDownListTableNames,$aDropDownListValueColumns,$aDropDownListDisplayColumns); $oPatternCreate->setUniqueName("DocField"); - $sToRender .= "
" . renderHeading("Add Document Field") . "
"; + $sToRender .= renderHeading("Add Document Field"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc index 602049d..57ce82e 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/editDocFieldUI.inc @@ -23,7 +23,7 @@ function getEditPage($iDocFieldID) { } - $sToRender .= "
" . renderHeading("Edit Document Field") . "
"; + $sToRender .= renderHeading("Edit Document Field"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -77,7 +77,7 @@ function getEditPage($iDocFieldID) { function getEditPageSuccess() { global $default; - $sToRender .= "
" . renderHeading("Edit Document Field") . "
"; + $sToRender .= renderHeading("Edit Document Field"); $sToRender .= "Success!\n"; $sToRender .= "\n"; $sToRender .= "

\n"; @@ -98,7 +98,7 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "
" . renderHeading("Edit Document Field") . "
"; + $sToRender .= renderHeading("Edit Document Field"); $sToRender .= "FAILURE!\n"; $sToRender .= "\n"; $sToRender .= "

\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc index 1db3686..058b103 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/addMetaDataUI.inc @@ -8,7 +8,7 @@ function getSelectFieldPage($iDocFieldID) { $oDocField = DocumentField::get($iDocFieldID); } - $sToRender .= "
" . renderHeading("Add Document Field Lookup") . "
"; + $sToRender .= renderHeading("Add Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "Please Select a Field\n"; $sToRender .= "\n"; @@ -32,7 +32,7 @@ function getAddMetaDataPage($iDocFieldID) { $oDocField = DocumentField::get($iDocFieldID); } - $sToRender .= "
" . renderHeading("Add Document Field Lookup") . "
"; + $sToRender .= renderHeading("Add Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "Please Enter a new lookup value to add to the Selected Field\n"; $sToRender .= "\n"; @@ -68,7 +68,7 @@ function getAddMetaDataPage($iDocFieldID) { function getSuccessPage() { global $default; - $sToRender .= "
" . renderHeading("Add Document Field Lookup") . "
"; + $sToRender .= renderHeading("Add Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -86,7 +86,7 @@ function getSuccessPage() { function getFailPage() { global $default; - $sToRender .= "
Success!
The lookup value was successfully added
" . renderHeading("Add Document Field Lookup") . "
"; + $sToRender .= renderHeading("Add Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -105,7 +105,7 @@ function getFailPage() { function getTextPage() { global $default; - $sToRender .= "
FAILURE!
The lookup value was not added
" . renderHeading("Add Document Field Lookup") . "
"; + $sToRender .= renderHeading("Add Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc index 781f6c4..a8a8737 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/editMetaDataUI.inc @@ -8,7 +8,7 @@ function getSelectFieldPage($iDocFieldID) { $oDocField = DocumentField::get($iDocFieldID); } - $sToRender .= "
FAILURE!
Please Enter a Value in the Text Box
" . renderHeading("Edit Document Field Lookup") . "
"; + $sToRender .= renderHeading("Edit Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "Please Select a Field\n"; $sToRender .= "\n"; @@ -39,7 +39,7 @@ function getSelectMetaDataPage($iDocFieldID, $iMetaDataID) { $oMetaData = MetaData::get($iMetaDataID); } - $sToRender .= "
" . renderHeading("Edit Document Field Lookup") . "
"; + $sToRender .= renderHeading("Edit Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "Please Select the Document Field Lookup you wish to Edit\n"; $sToRender .= "\n"; @@ -70,7 +70,7 @@ function getEditMetaDataPage($iDocFieldID, $iMetaDataID) { $oMetaData = MetaData::get($iMetaDataID); } - $sToRender .= "
" . renderHeading("Edit Document Field Lookup") . "
"; + $sToRender .= renderHeading("Edit Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "Enter a Different Value\n"; $sToRender .= "\n"; @@ -102,7 +102,7 @@ function getEditMetaDataPage($iDocFieldID, $iMetaDataID) { function getSuccessPage() { global $default; - $sToRender .= "
" . renderHeading("Edit Document Field Lookup") . "
"; + $sToRender .= renderHeading("Edit Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -120,7 +120,7 @@ function getSuccessPage() { function getFailPage() { global $default; - $sToRender .= "
Success!
The Document Field Lookup was successfully edited
" . renderHeading("Edit Document Field Lookup") . "
"; + $sToRender .= renderHeading("Edit Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -139,7 +139,7 @@ function getFailPage() { function getTextPage() { global $default; - $sToRender .= "
FAILURE!
The Document Field Lookup was not updated
" . renderHeading("Edit Document Field Lookup") . "
"; + $sToRender .= renderHeading("Edit Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc index 4d33623..e169791 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/metadatamanagement/removeMetaDataUI.inc @@ -8,7 +8,7 @@ function getSelectFieldPage($iDocFieldID) { $oDocField = DocumentField::get($iDocFieldID); } - $sToRender .= "
FAILURE!
Please Enter a Value in the Text Box
" . renderHeading("Remove Document Field Lookup") . "
"; + $sToRender .= renderHeading("Remove Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "Please Select a Field\n"; $sToRender .= "\n"; @@ -39,7 +39,7 @@ function getSelectMetaDataPage($iDocFieldID, $iMetaDataID) { $oMetaData = MetaData::get($iMetaDataID); } - $sToRender .= "
" . renderHeading("Remove Document Field Lookup") . "
"; + $sToRender .= renderHeading("Remove Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "Please Select the Lookup value you wish to remove\n"; $sToRender .= "\n"; @@ -70,7 +70,7 @@ function getDeleteConfirmedPage($iDocFieldID, $iMetaDataID) { $oMetaData = MetaData::get($iMetaDataID); } - $sToRender .= "
" . renderHeading("Remove Document Field Lookup") . "
"; + $sToRender .= renderHeading("Remove Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -96,7 +96,7 @@ function getDeleteConfirmedPage($iDocFieldID, $iMetaDataID) { function getSuccessPage() { global $default; - $sToRender .= "
Are you sure you wish to Remove the specified lookup from the Field?
" . renderHeading("Remove Document Field Lookup") . "
"; + $sToRender .= renderHeading("Remove Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -114,7 +114,7 @@ function getSuccessPage() { function getFailPage() { global $default; - $sToRender .= "
Success!
The lookup was successfully deleted
" . renderHeading("Remove Document Field Lookup") . "
"; + $sToRender .= renderHeading("Remove Document Field Lookup"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldUI.inc index f8e6515..ba925ff 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/removeDocFieldUI.inc @@ -1,13 +1,14 @@ " . renderHeading("Remove Document Field") . "
FAILURE!
The lookup was not deleted
"; + $sToRender .= renderHeading("Remove Document Field"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -48,7 +49,7 @@ function getDeleteSuccessPage() { global $default; - $sToRender .= "
$sHeading
" . renderHeading("Remove Document Field") . "
"; + $sToRender .= renderHeading("Remove Document Field"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -70,7 +71,7 @@ function getDeleteFailPage() { global $default; - $sToRender .= "
Document Field SuccessFully Removed!
" . renderHeading("Remove Document Field") . "
"; + $sToRender .= renderHeading("Remove Document Field"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doctypefieldmanagement/assignDocTypeToFieldUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/doctypefieldmanagement/assignDocTypeToFieldUI.inc index 550a9e0..3c976ee 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/doctypefieldmanagement/assignDocTypeToFieldUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/doctypefieldmanagement/assignDocTypeToFieldUI.inc @@ -25,7 +25,7 @@ function getPage($iDocTypeID, $iDocFieldID) { $oDocField = DocumentField::get($iDocFieldID); } - $sToRender .= "
Deletion Failed!
" . renderHeading("Assign Document Field to Document Type") . "
"; + $sToRender .= renderHeading("Assign Document Field to Document Type"); $sToRender .= "\n"; $sToRender .= $heading; $sToRender .= "\n"; @@ -53,7 +53,7 @@ function getPage($iDocTypeID, $iDocFieldID) { function getPageNotSelected() { global $default; - $sToRender .= "
" . renderHeading("Assign Document Field to Document Type") . "
"; + $sToRender .= renderHeading("Assign Document Field to Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -72,7 +72,7 @@ function getPageNotSelected() { function getPageSuccess() { global $default; - $sToRender .= "
Sorry, Selection Failed
Please select BOTH a Document Type AND a Document Field
" . renderHeading("Assign Document Field to Document Type") . "
"; + $sToRender .= renderHeading("Assign Document Field to Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -91,7 +91,7 @@ function getPageSuccess() { function getPageFail() { global $default; - $sToRender .= "
Success!
The Document Field was successfully assigned to the specified Document Type
" . renderHeading("Assign Document Field to Document Type") . "
"; + $sToRender .= renderHeading("Assign Document Field to Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/addDocTypeSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/addDocTypeSuccess.php index 00e392f..0641fd3 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/addDocTypeSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/addDocTypeSuccess.php @@ -9,7 +9,6 @@ */ require_once("../../../../../config/dmsDefaults.php"); -require_once("../adminUI.inc"); global $default; @@ -18,7 +17,7 @@ if(checkSession()) { // include the page template (with navbar) require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $Center .= "
Failure!
The Document Field already belongs to that Document Type
" . renderHeading("Add Document Type") . "
"; + $Center .= renderHeading("Add Document Type"); $Center .= "\n"; $Center .= "\n"; if($fDocTypeID == -1) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/addDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/addDocTypeUI.inc index 0531af8..b09ac62 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/addDocTypeUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/addDocTypeUI.inc @@ -21,7 +21,7 @@ function getPage() { $oPatternCreate = & new PatternCreate("DocumentType", "documentmanagement/DocumentType.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); $oPatternCreate->setUniqueName("documentType"); - $sToRender .= "
" . renderHeading("Add Document Type") . "
"; + $sToRender .= renderHeading("Add Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/editDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/editDocTypeUI.inc index 6615b8d..8f03bda 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/editDocTypeUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/editDocTypeUI.inc @@ -17,7 +17,7 @@ function getEditPage($iDocTypeID) { } - $sToRender .= "
" . renderHeading("Edit Document Type") . "
"; + $sToRender .= renderHeading("Edit Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -54,7 +54,7 @@ function getDetailsPage($iDocTypeID,$aGeneric,$aSpecific, $aAllSpecific) { } - $sToRender .= "
" . renderHeading("Edit Document Type") . "
"; + $sToRender .= renderHeading("Edit Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -148,7 +148,7 @@ function getMandatoryPage($iDocFieldID,$iDocTypeFieldID) { function getEditPageSuccess() { global $default; - $sToRender .= "


" . renderHeading("Edit Document Type") . "
"; + $sToRender .= renderHeading("Edit Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -166,7 +166,7 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "
Success!
The Document Type was successfully modified
" . renderHeading("Edit Document Type") . "
"; + $sToRender .= renderHeading("Edit Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc index 1b08bcb..b68a610 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/removeDocTypeUI.inc @@ -19,7 +19,7 @@ function getDeletePage($iDocTypeID) { $sHeading .= "Please select a Document Type:"; } - $sToRender .= "
Failure!
Document Type modification Failed!
" . renderHeading("Remove Document Type") . "
"; + $sToRender .= renderHeading("Remove Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -44,7 +44,7 @@ function getDeleteSuccessPage() { global $default; - $sToRender .= "
$sHeading
" . renderHeading("Remove Document Type") . "
"; + $sToRender .= renderHeading("Remove Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -66,7 +66,7 @@ function getDeleteFailPage() { global $default; - $sToRender .= "
DocumentType SuccessFully Removed!
" . renderHeading("Remove Document Type") . "
"; + $sToRender .= renderHeading("Remove Document Type"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc index 08c7970..a9e1472 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/addGroupUI.inc @@ -20,7 +20,7 @@ function getPage() { $oPatternCreate = & new PatternCreate("Group", "groups/Group.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); $oPatternCreate->setUniqueName("group"); - $sToRender .= "
Deletion Failed!
" . renderHeading("Add Group") . "
"; + $sToRender .= renderHeading("Add Group"); $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc index 625b1dc..db7e996 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/assignGroupToUnitUI.inc @@ -29,7 +29,7 @@ function getPage($iGroupID, $iUnitID) { $oUnit = Unit::get($iUnitID); } - $sToRender .= "
Add a New Group to the System
" . renderHeading("Assign Group to Unit") . "
"; + $sToRender .= renderHeading("Assign Group to Unit"); $sToRender .= "\n"; $sToRender .= $heading; $sToRender .= "
\n"; @@ -74,7 +74,7 @@ function getPageFail($iGroupID) { // get the id of that unit $oUnit= Unit::get($iUnitID); - $sToRender .= "
" . renderHeading("Assign Group to Unit") . "
"; + $sToRender .= renderHeading("Assign Group to Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -102,7 +102,7 @@ function getPageFail($iGroupID) { function getPageNotSelected() { global $default; - $sToRender .= "
Sorry, Assignment Failed
" . renderHeading("Assign Group to Unit") . "
"; + $sToRender .= renderHeading("Assign Group to Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -122,7 +122,7 @@ function getPageNotSelected() { function getPageSuccess() { global $default; - $sToRender .= "
Sorry, Selection Failed
" . renderHeading("Assign Group to Unit") . "
"; + $sToRender .= renderHeading("Assign Group to Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php index be3dbcf..25c1717 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php @@ -18,7 +18,7 @@ if(checkSession()) { // include the page template (with navbar) require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $Center .= "
Success!
" . renderHeading("Edit Group") . "
"; + $Center .= renderHeading("Edit Group"); $Center .= "\n"; $Center .= "\n"; $Center .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc index 32b7436..7f0d293 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupUI.inc @@ -25,7 +25,7 @@ function getCreatePage($iGroupID) { $oPattern->setUniqueName("groupEdit"); $oPattern->setColumnsRequired(array(1,0,0)); - $sToRender .= "
Update Successful!
" . renderHeading("Edit Group Properties") . "
"; + $sToRender .= renderHeading("Edit Group Properties"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -47,7 +47,7 @@ function getAddFailPage() { global $default; - $sToRender .= "
" . renderHeading("Edit Group Properties") . "
"; + $sToRender .= renderHeading("Edit Group Properties"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -73,7 +73,7 @@ function getEditPage($iGroupID) { } - $sToRender .= "
Add Group Failed:
" . renderHeading("Edit Group Properties") . "
"; + $sToRender .= renderHeading("Edit Group Properties"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -111,7 +111,7 @@ function getEditPage($iGroupID) { function getEditPageSuccess() { global $default; - $sToRender .= "
" . renderHeading("Edit Group Properties") . "
"; + $sToRender .= renderHeading("Edit Group Properties"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -132,7 +132,7 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "
Success!
" . renderHeading("Edit Group Properties") . "
"; + $sToRender .= renderHeading("Edit Group Properties"); $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc index 9c55727..941e37b 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupFromUnitUI.inc @@ -32,7 +32,7 @@ function getPage($iGroupID, $iUnitID) { $unitdisplay = ""; } - $sToRender .= "
Failure!
" . renderHeading("Remove Group From Unit") . "
"; + $sToRender .= renderHeading("Remove Group From Unit"); $sToRender .= "\n"; $sToRender .= $heading; $sToRender .= "
\n"; @@ -70,7 +70,7 @@ function getPageFail($iGroupID) { $oUnit= Unit::get($iUnitID); - $sToRender .= "
" . renderHeading("Remove Group From Unit") . "
"; + $sToRender .= renderHeading("Remove Group From Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -90,7 +90,7 @@ function getPageFail($iGroupID) { function getPageNotSelected() { global $default; - $sToRender .= "
Sorry, Removal Failed
" . renderHeading("Remove Group From Unit") . "
"; + $sToRender .= renderHeading("Remove Group From Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -109,7 +109,7 @@ function getPageNotSelected() { function getPageSuccess() { global $default; - $sToRender .= "
Sorry, Selection Failed
" . renderHeading("Remove Group From Unit") . "
"; + $sToRender .= renderHeading("Remove Group From Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupUI.inc index e1a1e8d..0cad69c 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/removeGroupUI.inc @@ -19,7 +19,7 @@ function getDeletePage($iGroupID) { $sHeading = "Please select a group: "; } - $sToRender .= "
Success!
" . renderHeading("Remove Group") . "
"; + $sToRender .= renderHeading("Remove Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -49,7 +49,7 @@ function getDeleteSuccessPage() { global $default; -$sToRender .= "
$sHeading
" . renderHeading("Remove Group") . "
"; +$sToRender .= renderHeading("Remove Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -71,7 +71,7 @@ function getDeleteFailPage() { global $default; -$sToRender .= "
Group SuccessFully Removed!
" . renderHeading("Remove Group") . "
"; +$sToRender .= renderHeading("Remove Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkSuccess.php index b338fea..50e5d72 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkSuccess.php @@ -18,7 +18,7 @@ if(checkSession()) { // include the page template (with navbar) require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $Center .= "
Deletion Failed!
" . renderHeading("Add QuickLink") . "
"; + $Center .= renderHeading("Add QuickLink"); $Center .= "\n"; $Center .= "\n"; if ($fLinkID != -1) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkUI.inc index f821ff5..53db9fa 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/addLinkUI.inc @@ -22,7 +22,7 @@ function getPage() { $oPatternCreate->setUniqueName("link"); $oPatternCreate->setDefaultValues(array(1=>"http://")); - $sToRender .= "
" . renderHeading("Add QuickLink") . "
"; + $sToRender .= renderHeading("Add QuickLink"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -41,7 +41,7 @@ function getPage() { function getAddPageFail() { global $default; - $sToRender .= "
" . renderHeading("Add QuickLink") . "
"; + $sToRender .= renderHeading("Add QuickLink"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc index b55d4f2..188f45e 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/editLinkUI.inc @@ -18,7 +18,7 @@ function getEditPage($iLinkID) { } else { $sHeading = "Please select a Link:"; } - $sToRender .= "
Addition Unsuccessful
" . renderHeading("Edit QuickLink") . "
"; + $sToRender .= renderHeading("Edit QuickLink"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -69,7 +69,7 @@ function getEditPage($iLinkID) { function getEditPageSuccess() { global $default; - $sToRender .= "
$sHeading
" . renderHeading("Edit QuickLink") . "
"; + $sToRender .= renderHeading("Edit QuickLink"); $sToRender .= "Success!\n"; $sToRender .= "\n"; $sToRender .= "

\n"; @@ -91,7 +91,7 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "
" . renderHeading("Edit QuickLink") . "
"; + $sToRender .= renderHeading("Edit QuickLink"); $sToRender .= "Success!\n"; $sToRender .= "\n"; $sToRender .= "

\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc index 454a3de..e50b2cd 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/linkmanagement/removeLinkUI.inc @@ -19,7 +19,7 @@ function getDeletePage($iLinkID) { $sHeading .= "Please select a Link:"; } - $sToRender .= "
" . renderHeading("Remove QuickLink") . "
"; + $sToRender .= renderHeading("Remove QuickLink"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -48,7 +48,7 @@ function getDeleteSuccessPage() { global $default; - $sToRender .= "
$sHeading
" . renderHeading("Remove QuickLink") . "
"; + $sToRender .= renderHeading("Remove QuickLink"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -70,7 +70,7 @@ function getDeleteFailPage() { global $default; - $sToRender .= "
Link SuccessFully Removed!
" . renderHeading("Remove QuickLink") . "
"; + $sToRender .= renderHeading("Remove QuickLink"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php index eecd769..31649e1 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/addNewsBL.php @@ -6,6 +6,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMainPage.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->uiDirectory/administration/news/newsUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php index 2e6ff04..1218c9c 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/editNewsBL.php @@ -6,6 +6,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMainPage.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->uiDirectory/administration/news/newsUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php index b34e562..65160fa 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/listNewsBL.php @@ -6,6 +6,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMainPage.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->uiDirectory/administration/news/newsUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc index a94d9be..d76d448 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/newsUI.inc @@ -105,7 +105,7 @@ function renderEditAddNewsForm($oDashboardNews) { function renderEditNewsPage($oDashboardNews, $sErrorMessage = "") { global $default; - $sToRender .= "
Deletion Failed!
" . renderHeading("Edit Dashboard News") . "
"; + $sToRender .= renderHeading("Edit Dashboard News"); if (strlen($sErrorMessage) > 0) { $sToRender .= renderErrorMessage($sErrorMessage); } @@ -121,7 +121,7 @@ function renderEditNewsPage($oDashboardNews, $sErrorMessage = "") { function renderAddNewsPage($oDashboardNews, $sErrorMessage = "") { global $default; - $sToRender .= "" . renderHeading("Add Dashboard News") . "
"; + $sToRender .= renderHeading("Add Dashboard News"); if (strlen($sErrorMessage) > 0) { $sToRender .= renderErrorMessage($sErrorMessage); } @@ -136,7 +136,7 @@ function renderAddNewsPage($oDashboardNews, $sErrorMessage = "") { function renderListNewsPage() { global $default; - $sToRender .= "" . renderHeading("List Dashboard News") . "
"; + $sToRender .= renderHeading("List Dashboard News"); $sToRender .= "\n"; $sToRender .= renderNewsTable(); $sToRender .= "
\n"; @@ -164,7 +164,7 @@ function renderPreviewNewsPage($oDashboardNews) { function renderDeleteNewsConfirmationPage($oDashboardNews) { global $default; - $sToRender .= "" . renderHeading("Delete Dashboard News") . "
"; + $sToRender .= renderHeading("Delete Dashboard News"); $sToRender .= "\n"; $sToRender .= ""; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/previewNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/previewNewsBL.php index 6d7fb5e..0b6599c 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/previewNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/previewNewsBL.php @@ -6,6 +6,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMainPage.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->uiDirectory/administration/news/newsUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ diff --git a/presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php index 736879d..981f661 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/news/removeNewsBL.php @@ -6,6 +6,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMainPage.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc"); require_once("$default->uiDirectory/administration/news/newsUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php index b7e98b4..e7c7b32 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgSuccess.php @@ -18,7 +18,7 @@ if(checkSession()) { // include the page template (with navbar) require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $sToRender .= "
Are you sure you wish to delete this news item?
" . renderHeading("Add Unit") . "
"; + $sToRender .= renderHeading("Add Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc index dc0a641..547f9a9 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/addOrgUI.inc @@ -21,7 +21,7 @@ function getPage() { $oPatternCreate = & new PatternCreate("Organisation", "orgmanagement/Organisation.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); $oPatternCreate->setUniqueName("organisation"); - $sToRender .= "
Organisation added Successfully!
" . renderHeading("Add Organisation") . "
"; + $sToRender .= renderHeading("Add Organisation"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc index 84d93e5..fc2518a 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/editOrgUI.inc @@ -16,7 +16,7 @@ function getEditPage($iOrgID) { $oOrg = Organisation::get($iOrgID); } - $sToRender .= "
" . renderHeading("Edit Organisation") . "
"; + $sToRender .= renderHeading("Edit Organisation"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -38,7 +38,7 @@ function getEditPage($iOrgID) { function getEditPageSuccess() { global $default; - $sToRender .= "
Please select an organisation:
" . renderHeading("Edit Organisation") . "
"; + $sToRender .= renderHeading("Edit Organisation"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -59,7 +59,7 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "
Success!
" . renderHeading("Edit Organisation") . "
"; + $sToRender .= renderHeading("Edit Organisation"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc index 0d4a6f2..6d3cc7b 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/removeOrgUI.inc @@ -20,7 +20,7 @@ function getDeletePage($iOrgID) { $sHeading .= "Please select a Organisation:"; } - $sToRender .= "
Failure!>/td>
" . renderHeading("Remove Organisation") . "
"; + $sToRender .= renderHeading("Remove Organisation"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -45,7 +45,7 @@ function getDeleteSuccessPage() { global $default; - $sToRender .= "
$sHeading
" . renderHeading("Remove Organisation") . "
"; + $sToRender .= renderHeading("Remove Organisation"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -67,7 +67,7 @@ function getDeleteFailPage() { global $default; - $sToRender .= "
Organisation SuccessFully Removed!
" . renderHeading("Remove Organisation") . "
"; + $sToRender .= renderHeading("Remove Organisation"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc index 6434dc0..0589935 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/addRoleUI.inc @@ -20,7 +20,7 @@ function getPage() { $oPatternCreate = & new PatternCreate("Role", "roles/Role.inc",$aDisplayRowNames, $aParameterNumbers, $aDisplayColumnTypes, $aRequired); $oPatternCreate->setUniqueName("role"); - $sToRender .= "
Deletion Failed!
" . renderHeading("Add Role") . "
"; + $sToRender .= renderHeading("Add Role"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleSuccess.php index 25b2cec..62f55b7 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleSuccess.php @@ -18,7 +18,7 @@ if(checkSession()) { // include the page template (with navbar) require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $Center .= "
" . renderHeading("Edit Role") . "
"; + $Center .= renderHeading("Edit Role"); $Center .= "\n"; $Center .= "\n"; $Center .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc index d35e3b8..aa6a375 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/editRoleUI.inc @@ -24,7 +24,7 @@ function getCreatePage($iRoleID) { $oPattern->setUniqueName("roleEdit"); $oPattern->setColumnsRequired(array(1,0,0)); - $sToRender .= "
Update Successful!
" . renderHeading("Edit Role") . "
"; + $sToRender .= renderHeading("Edit Role"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -46,7 +46,7 @@ function getAddFailPage() { global $default; - $sToRender .= "
" . renderHeading("Edit Role") . "
"; + $sToRender .= renderHeading("Edit Role"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -69,7 +69,7 @@ function getEditPage($iRoleID) { $oRole = Role::get($iRoleID); } - $sToRender .= "
Sorry, Role Already Exists!
" . renderHeading("Edit Role") . "
"; + $sToRender .= renderHeading("Edit Role"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -113,7 +113,7 @@ function getEditPage($iRoleID) { function getEditPageSuccess() { global $default; - $sToRender .= "
" . renderHeading("Edit Role") . "
"; + $sToRender .= renderHeading("Edit Role"); $sToRender .= "Success!\n"; $sToRender .= "\n"; $sToRender .= "

\n"; @@ -135,7 +135,7 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "
" . renderHeading("Edit Role") . "
"; + $sToRender .= renderHeading("Edit Role"); $sToRender .= "Success!\n"; $sToRender .= "\n"; $sToRender .= "

\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc index 7e9d518..f510430 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/rolemanagement/removeRoleUI.inc @@ -19,7 +19,7 @@ function getDeletePage($iRoleID) { $sHeading .= "Please select a Role:"; } - $sToRender .= "
" . renderHeading("Remove Role") . "
"; + $sToRender .= renderHeading("Remove Role"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -48,7 +48,7 @@ function getDeleteSuccessPage() { global $default; - $sToRender .= "
$sHeading
" . renderHeading("Remove Role") . "
"; + $sToRender .= renderHeading("Remove Role"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -70,7 +70,7 @@ function getDeleteFailPage() { global $default; - $sToRender .= "
Role SuccessFully Removed!
" . renderHeading("Remove Role") . "
"; + $sToRender .= renderHeading("Remove Role"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc index d89ebe3..8bc3704 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/systemsettings/systemSettingsUI.inc @@ -57,7 +57,7 @@ function getPage() { // then loop a database entry to add everything... // and then when submit...run a set thingy.. - $sToRender .= "
Deletion Failed!
" . renderHeading("System Settings") . "
"; + $sToRender .= renderHeading("System Settings"); $sToRender .= "\n"; $sToRender .= "Current System Settings: \n"; $sToRender .= "\n"; @@ -99,7 +99,7 @@ function getPage() { function getPageSuccess() { global $default; - $sToRender .= "
" . renderHeading("System Settings") . "
"; + $sToRender .= renderHeading("System Settings"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc index b3e1482..e5c16d7 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/addUnitUI.inc @@ -15,7 +15,7 @@ function getAddPage($unitID) { $oOrg = Organisation::get($iOrgID); } - $sToRender .= "
Success!
The Settings were successfully modified
" . renderHeading("Add Unit") . "
"; + $sToRender .= renderHeading("Add Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -36,7 +36,7 @@ function getAddPage($unitID) { function getAddPageSuccess() { global $default; - $sToRender .= "
" . renderHeading("Add Unit") . "
"; + $sToRender .= renderHeading("Add Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -55,7 +55,7 @@ function getAddPageSuccess() { function getAddPageFail() { global $default; - $sToRender .= "
Addition Successful!
" . renderHeading("Add Unit") . "
"; + $sToRender .= renderHeading("Add Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -76,7 +76,7 @@ function getAddPageFail() { function getPageFail() { global $default; - $sToRender .= "
Addition Unsuccessful
" . renderHeading("Add Unit") . "
"; + $sToRender .= renderHeading("Add Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -94,7 +94,7 @@ function getPageFail() { function getAddPageToOrgFail() { global $default; - $sToRender .= "
Please enter a name AND Select the Organisation
" . renderHeading("Add Unit") . "
"; + $sToRender .= renderHeading("Add Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc index 72f734c..f004854 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/editUnitUI.inc @@ -16,7 +16,7 @@ function getEditPage($iUnitID) { $oUnit = Unit::get($iUnitID); } - $sToRender .= "
Addition to Organisation Unsuccessful
" . renderHeading("Edit Unit") . "
"; + $sToRender .= renderHeading("Edit Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -37,7 +37,7 @@ function getEditPage($iUnitID) { function getEditPageSuccess() { global $default; - $sToRender .= "
Please select a unit:
" . renderHeading("Edit Unit") . "
"; + $sToRender .= renderHeading("Edit Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -58,7 +58,7 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "
Success!
" . renderHeading("Edit Unit") . "
"; + $sToRender .= renderHeading("Edit Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc index 5a997fa..0daaf03 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/unitmanagement/removeUnitUI.inc @@ -19,7 +19,7 @@ function getDeletePage($iUnitID) { $sHeading .= "Please select a Unit: "; } - $sToRender .= "
FAILED!
" . renderHeading("Remove Unit") . "
"; + $sToRender .= renderHeading("Remove Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -46,7 +46,7 @@ function getDeleteSuccessPage() { global $default; - $sToRender .= "
$sHeading
" . renderHeading("Remove Unit") . "
"; + $sToRender .= renderHeading("Remove Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -68,7 +68,7 @@ function getDeleteFailPage() { global $default; - $sToRender .= "
Unit SuccessFully Removed!
" . renderHeading("Remove Unit") . "
"; + $sToRender .= renderHeading("Remove Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -96,7 +96,7 @@ function getDeleteConfirmedPage($iUnitID,$iOrgID) { $oOrg = Organisation::get($iOrgID); } - $sToRender .= "
Deletion Failed!
" . renderHeading("Remove Unit") . "
"; + $sToRender .= renderHeading("Remove Unit"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc index 81306b6..f9f0f6d 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserToGroupUI.inc @@ -26,7 +26,7 @@ function getPage($iUserID, $iGroupID) { } $sQueryString = "&fUserID=$iUserID"; - $sToRender .= "
Are you sure you wish to Remove this Unit?:
" . renderHeading("Add User to Group") . "
"; + $sToRender .= renderHeading("Add User to Group"); $sToRender .= "\n"; $sToRender .= $heading; $sToRender .= "\n"; @@ -54,7 +54,7 @@ function getPage($iUserID, $iGroupID) { function getPageNotSelected($sQueryString) { global $default; - $sToRender .= "
" . renderHeading("Add User to Group") . "
"; + $sToRender .= renderHeading("Add User to Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -73,7 +73,7 @@ function getPageNotSelected($sQueryString) { function getPageSuccess($sQueryString) { global $default; - $sToRender .= "
Sorry, Selection Failed
Please select Group
" . renderHeading("Add User to Group") . "
"; + $sToRender .= renderHeading("Add User to Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -92,7 +92,7 @@ function getPageSuccess($sQueryString) { function getPageFail() { global $default; - $sToRender .= "
Success!
The User was successfully assigned to the specified Group
" . renderHeading("Add User to Group") . "
"; + $sToRender .= "" . renderHeading("Add User to Group"); $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc index 708f21c..9849346 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc @@ -12,7 +12,7 @@ function getSelectUserPage($aResults) { global $default; - $sToRender .= "
Failed!
The User already belongs to the specified Group
" . renderHeading("Add User To System") . "
"; + $sToRender .= renderHeading("Add User To System"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
Select the User to add to the System:
" . renderHeading("Add User To System") . "
"; + $sToRender .= renderHeading("Add User To System"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -51,7 +51,7 @@ function getAddPage($unitID) { function getDetailsDBPage($suserName, $aAttributes) { global $default; - $sToRender .= "
Please enter a VALID Username to search for in the text box below
" . renderHeading("Add User To System") . "
"; + $sToRender .= renderHeading("Add User To System"); foreach ($aAttributes as $sUserName => $aUserAttributes) { $sToRender .= "\n"; $sToRender .= "\n"; @@ -87,7 +87,7 @@ function getDetailsDBPage($suserName, $aAttributes) { function getDetailsLDAPPage($suserName, $aAttributes, $sUserIdentifier) { - $sToRender .= "
User Details:
" . renderHeading("Add User To System") . "
"; + $sToRender .= renderHeading("Add User To System"); global $default; foreach ($aAttributes as $sUserName => $aUserAttributes) { $sToRender .= "\n"; @@ -130,7 +130,7 @@ function getDetailsLDAPPage($suserName, $aAttributes, $sUserIdentifier) { function getPageSuccess() { global $default; - $sToRender .= "
" . renderHeading("Add User To System") . "
"; + $sToRender .= renderHeading("Add User To System"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -149,7 +149,7 @@ function getPageSuccess() { function getPageFail() { global $default; - $sToRender .= "
Addition Successful!
" . renderHeading("Add User To System") . "
"; + $sToRender .= renderHeading("Add User To System"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -170,7 +170,7 @@ function getPageFail() { function getPageUsernameNotFound() { global $default; - $sToRender .= "
Addition Successful!
" . renderHeading("Add User To System") . "
"; + $sToRender .= renderHeading("Add User To System"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc index a1f1e5c..f515e97 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserGroupsUI.inc @@ -21,7 +21,7 @@ function getPage($iUserID) { $heading = "\n"; } - $sToRender .= "
Username not found!
Please select a User:
" . renderHeading("Edit User Groups") . "
"; + $sToRender .= renderHeading("Edit User Groups"); $sToRender .= "\n"; $sToRender .= $heading; $sToRender .= "\n"; @@ -69,11 +69,7 @@ function getGroupPage($iUserID, $aGroup) { $sTableTag .= "
"; $sBgColor = "#F5F6EE"; - - - $sToRender .= "
"; - $sToRender .= renderHeading("Edit User Groups"); - $sToRender .= "
"; + $sToRender .= renderHeading("Edit User Groups"); $sToRender .= ""; $sToRender .= "
User Name: " . getUserDisplay($oUser) . ""; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc index df54cba..ef6e0b2 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/editUserUI.inc @@ -15,7 +15,7 @@ function getEditPage($iUserID) { if (isset($iUserID)) { $oUser = User::get($iUserID); } - $sToRender .= "" . renderHeading("Edit User Properties") . "
"; + $sToRender .= renderHeading("Edit User Properties"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -49,7 +49,7 @@ function getUserDetailsPage($iUserID) { $oPattern->setUniqueName("userEdit"); $oPattern->setColumnsRequired(array(1,1,0,0,0,0)); - $sToRender .= "
Please select a User:
" . renderHeading("Edit User Properties") . "
"; + $sToRender .= renderHeading("Edit User Properties"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -68,7 +68,7 @@ function getUserDetailsPage($iUserID) { function getEditPageSuccess() { global $default; - $sToRender .= "
" . renderHeading("Edit User Properties") . "
"; + $sToRender .= renderHeading("Edit User Properties"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -89,7 +89,7 @@ function getEditPageSuccess() { function getEditPageFail() { global $default; - $sToRender .= "
Success!
" . renderHeading("Edit User Properties") . "
"; + $sToRender .= renderHeading("Edit User Properties"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php index 8d13fa6..291a5f1 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/listUsersBL.php @@ -12,7 +12,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCreate.inc"); - require_once("ListUsersUI.inc"); + require_once("listUsersUI.inc"); require_once("../adminUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); @@ -32,11 +32,8 @@ if (checkSession()) { $oPatternCustom = & new PatternCustom(); if(checkSession()) { - - $oPatternCustom->addHtml("
Failed!
"); // Create the Heading - $oPatternCustom->addHtml(renderHeading("Current System Users")); // Create the Heading - $oPatternCustom->addHtml("
"); // Create the Heading - + + $oPatternCustom->addHtml(renderHeading("Current System Users")); // Create the Heading $oPatternCustom->addHtml("\n"; } - $sToRender .= "
Filter by group "); // if (isset($fGroupID)) { // Check if should use the query string OR ... $sFilterOptions = getFilterOptions($fGroupID); diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc index 15ec2ac..035ffaf 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserFromGroupUI.inc @@ -21,7 +21,7 @@ function getPage($iUserID) { $heading = "
Please select a User:
" . renderHeading("Remove User From Group") . "
"; + $sToRender .= renderHeading("Remove User From Group"); $sToRender .= "\n"; $sToRender .= $heading; $sToRender .= "\n"; @@ -66,7 +66,7 @@ function getGroupPage($iUserID, $aGroup) { $Groupdisplay = "\n"; } - $sToRender .= "
Group Name: " . $oGroup->getName() . "
" . renderHeading("Remove User From Group") . "
"; + $sToRender .= renderHeading("Remove User From Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -107,7 +107,7 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { $Groupdisplay = "\n"; } - $sToRender .= "
Select a Group to Remove User from:
Group Name: " . $oGroup->getName() . "
" . renderHeading("Remove User From Group") . "
"; + $sToRender .= renderHeading("Remove User From Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= $heading; @@ -134,7 +134,7 @@ function getDeleteConfirmedPage($iUserID,$fGroupID) { function getPageFail() { global $default; - $sToRender .= "
" . renderHeading("Remove User From Group") . "
"; + $sToRender .= renderHeading("Remove User From Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -155,7 +155,7 @@ function getPageFail() { function getPageSuccess($fUserID) { global $default; - $sToRender .= "
Sorry, Removal Failed
" . renderHeading("Remove User From Group") . "
"; + $sToRender .= renderHeading("Remove User From Group"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc index bb1f69e..b7ee9d8 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/removeUserUI.inc @@ -19,7 +19,7 @@ function getDeletePage($iUserID) { $sHeading .= "\n"; } - $sToRender .= "
Success!
Please select a User:
" . renderHeading("Remove User") . "
"; + $sToRender .= renderHeading("Remove User"); $sToRender .= "\n"; $sToRender .= $sHeading; $sToRender .= "\n"; @@ -42,7 +42,7 @@ function getDeleteSuccessPage() { global $default; - $sToRender .= "
" . renderHeading("Remove User") . "
"; + $sToRender .= renderHeading("Remove User"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -64,7 +64,7 @@ function getDeleteFailPage() { global $default; - $sToRender .= "
User SuccessFully Removed!
" . renderHeading("Remove User") . "
"; + $sToRender .= renderHeading("Remove User"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -85,7 +85,7 @@ function getDeleteConfirmedPage($iUserID) { $oUser = User::get($iUserID); } - $sToRender .= "
Deletion Failed!
" . renderHeading("Remove User") . "
"; + $sToRender .= renderHeading("Remove User"); $sToRender .= "\n"; $sToRender .= ""; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteSuccess.php index 8c5605c..6804637 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteSuccess.php +++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteSuccess.php @@ -17,7 +17,7 @@ if(checkSession()) { // include the page template (with navbar) require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); - $Center .= "
Are you sure you wish to Remove this User?:
Note: This User will be Removed from ALL Groups as well\n
" . renderHeading("Add Website") . "
"; + $Center .= renderHeading("Add Website"); $Center .= "\n"; $Center .= "\n"; if($fWebSiteID != -1) { diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc index 6ab4d52..de1a11e 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/addWebsiteUI.inc @@ -24,7 +24,7 @@ function getPage() { $oPatternCreate->setUniqueName("website"); $oPatternCreate->setDefaultValues(array(1=>"http://")); - $sToRender .= "
" . renderHeading("Add Website") . "
"; + $sToRender .= renderHeading("Add Website"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -43,7 +43,7 @@ function getPage() { function getAddPageFail() { global $default; - $sToRender .= "
" . renderHeading("Add Website") . "
"; + $sToRender .= renderHeading("Add Website"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc index ae7fe33..7e4bbb3 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/editWebsiteUI.inc @@ -8,7 +8,7 @@ function getSelectWebMasterPage($iUserID) { $oUser = User::get($iUserID); } - $sToRender .= "
Addition Unsuccessful
" . renderHeading("Edit Website") . "
"; + $sToRender .= renderHeading("Edit Website"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -37,7 +37,7 @@ function getSelectWebSitePage($iUserID, $iWebSiteID) { $oWebSite = WebSite::get($iWebSiteID); } - $sToRender .= "
Please Select a WebMaster
" . renderHeading("Edit Website") . "
"; + $sToRender .= renderHeading("Edit Website"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -71,7 +71,7 @@ function getEditWebSitePage($iUserID, $iWebSiteID) { $oWebSite = WebSite::get($iWebSiteID); } - $sToRender .= "
Please Select the WebSite you wish to Edit:
" . renderHeading("Edit Website") . "
"; + $sToRender .= renderHeading("Edit Website"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -111,7 +111,7 @@ function getEditWebSitePage($iUserID, $iWebSiteID) { function getSuccessPage() { global $default; - $sToRender .= "
Enter WebSite Properties
" . renderHeading("Edit Website") . "
"; + $sToRender .= renderHeading("Edit Website"); $sToRender .= "\n"; $sToRender .= "Success!\n"; $sToRender .= "
\n"; @@ -133,7 +133,7 @@ function getSuccessPage() { function getFailPage() { global $default; - $sToRender .= "
" . renderHeading("Edit Website") . "
"; + $sToRender .= renderHeading("Edit Website"); $sToRender .= "\n"; $sToRender .= "FAILURE!\n"; $sToRender .= "
\n"; @@ -156,7 +156,7 @@ function getFailPage() { function getTextPage() { global $default; - $sToRender .= "
" . renderHeading("Edit Website") . "
"; + $sToRender .= renderHeading("Edit Website"); $sToRender .= "\n"; $sToRender .= "FAILURE!\n"; $sToRender .= "
\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc index 1977b12..28718f9 100644 --- a/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/administration/websitemanagement/removeWebsiteUI.inc @@ -19,7 +19,7 @@ function getDeletePage($iWebSiteID) { $sHeading .= "Select a WebSite:\n"; } - $sToRender .= "
" . renderHeading("Remove Website") . "
"; + $sToRender .= renderHeading("Remove Website"); $sToRender .= "\n"; $sToRender .= "
\n"; $sToRender .= "\n"; @@ -48,7 +48,7 @@ function getDeletePage($iWebSiteID) { function getDeleteSuccessPage() { global $default; - $sToRender .= "
$sHeading
" . renderHeading("Remove Website") . "
"; + $sToRender .= renderHeading("Remove Website"); $sToRender .= "\n"; $sToRender .= "
\n"; $sToRender .= "\n"; @@ -71,7 +71,7 @@ function getDeleteFailPage() { global $default; - $sToRender .= "
" . renderHeading("Remove Website") . "
"; $sToRender .= "\n"; + $sToRender .= renderHeading("Remove Website"); $sToRender .= "
\n"; $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "\n";
Deletion Failed!