diff --git a/presentation/Html.inc b/presentation/Html.inc index 2de78dd..423fae2 100644 --- a/presentation/Html.inc +++ b/presentation/Html.inc @@ -11,6 +11,18 @@ * @package presentation */ +function renderHeading($sHeading) { + global $default; + $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); + $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); + $sToRender = "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "\n"; + $sToRender .= "
$sHeading
\n"; + return $sToRender; +} + function startTable($border, $width) { return "\n"; } diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc index 7ccd2ca..a6d059c 100644 --- a/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/discussions/addCommentUI.inc @@ -26,7 +26,7 @@ function getSubmitSuccessPage($iDocumentID){ * * @param $sHeading -> text heading for the page */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); @@ -37,7 +37,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "
\n"; return $sToRender; -} +}*/ /** * Renders the path for the document diff --git a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc index 482f249..020432b 100644 --- a/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/discussions/viewDiscussionUI.inc @@ -57,7 +57,7 @@ function getNewThreadOption($fDocumentID) { * * @param $sHeading -> text heading for the page */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); @@ -68,7 +68,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ /** * Renders the path for the document diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php index fe0e616..bda0163 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php @@ -19,6 +19,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentLink.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/security/permission.inc"); + require_once("$default->fileSystemRoot/presentation/Html.inc"); require_once("addDocumentLinkUI.inc"); if (Permission::userHasDocumentWritePermission($fDocumentID)) { diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc index a8318d9..e601f41 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc @@ -8,7 +8,7 @@ */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -18,7 +18,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getPage($iDocumentID) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php index cd5e541..e458e56 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/addArchiveSettingsBL.php @@ -11,6 +11,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.i require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc"); require_once("$default->uiDirectory/documentmanagement/documentUI.inc"); require_once("$default->uiDirectory/documentmanagement/archiving/archiveSettingsUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc index c636fa5..ea2ebc8 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/archiving/archiveSettingsUI.inc @@ -18,7 +18,7 @@ require_once("../../../../../config/dmsDefaults.php"); * Display the heading * FIXME: need to refactor this */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -28,7 +28,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ /** * Displays an error message diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php index be6c9de..0966a94 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseBL.php @@ -6,6 +6,7 @@ require_once("$default->fileSystemRoot/lib/browse/Browser.inc"); require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentType.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->uiDirectory/documentmanagement/browseUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc index dd22e8c..264e2c0 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc @@ -17,7 +17,7 @@ require_once("$default->uiDirectory/foldermanagement/addFolderUI.inc"); * @package presentation.lookAndFeel.knowledgeTree.documentmanagement */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -25,7 +25,7 @@ function renderHeading($sHeading) { $sToRender .= "$sHeading\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ /** * Generates radio button selects for document browse by type diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc index 5efdd9b..5416d21 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/deleteDocumentUI.inc @@ -9,7 +9,7 @@ * */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -19,7 +19,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getDocumentPath($iFolderID, $sDocumentName) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc index 1f7838a..20502fe 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/emailUI.inc @@ -8,7 +8,7 @@ * */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -18,7 +18,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getDocumentPath($oDocument) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc index aa14ee6..d1eb726 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/moveDocumentUI.inc @@ -1,6 +1,6 @@ siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -10,7 +10,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getPage($iFolderID, $iDocumentID) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkUI.inc index d0b0055..5a9ef96 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkUI.inc @@ -6,7 +6,7 @@ * @date 22 May 2003 */ -function renderHeading() { +/*function renderHeading() { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -16,7 +16,7 @@ function renderHeading() { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getPage($sParentDocumentName, $sChildDocumentName, $iParentDocumentID) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/templateDocumentBrowseBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/templateDocumentBrowseBL.php index 4fe5a0e..30be250 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/templateDocumentBrowseBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/templateDocumentBrowseBL.php @@ -6,6 +6,7 @@ require_once("$default->fileSystemRoot/lib/browse/Browser.inc"); require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentType.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->uiDirectory/documentmanagement/templateDocumentBrowseUI.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * This page very closely follows browseBL.php. This page is ONLY used when a user diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/templateDocumentBrowseUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/templateDocumentBrowseUI.inc index f46272f..3c29011 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/templateDocumentBrowseUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/templateDocumentBrowseUI.inc @@ -17,7 +17,7 @@ require_once("$default->uiDirectory/foldermanagement/addFolderUI.inc"); * @package presentation.lookAndFeel.knowledgeTree.documentmanagement */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -27,7 +27,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ /** * Generates radio button selects for document browse by type diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php index 245b530..88f6dae 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryBL.php @@ -29,7 +29,7 @@ require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); -//require_once("$default->fileSystemRoot/presentation/Html.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); if (checkSession()) { require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc index 1f238d7..3d3bc2a 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewHistoryUI.inc @@ -9,7 +9,7 @@ * @package presentation.lookAndFeel.knowledgeTree.documentManager */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -19,7 +19,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getDocumentPath($iFolderID, $sDocumentName) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc index 7840309..5c9cc97 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc @@ -13,7 +13,7 @@ * @package presentation.lookAndFeel.knowledgeTree.documentManager */ -function renderHeading() { +/*function renderHeading() { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -23,7 +23,7 @@ function renderHeading() { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function renderDocumentPath($oDocument) { global $default; @@ -229,7 +229,7 @@ function displayActionButtons($oDocument, $bEdit) { function getEditPage($oDocument) { global $default; $iDocumentID = $oDocument->getID(); - $sToRender = renderHeading() . renderDocumentPath($oDocument) . "\n
\n"; + $sToRender = renderHeading("Document Detail") . renderDocumentPath($oDocument) . "\n
\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -340,7 +340,7 @@ function getEditPage($oDocument) { function getViewPage($oDocument) { global $default; $iDocumentID = $oDocument->getID(); - $sToRender = renderHeading() . renderDocumentPath($oDocument) . "\n
\n"; + $sToRender = renderHeading("Document Detail") . renderDocumentPath($oDocument) . "\n
\n"; $sToRender .= "
\n"; $sToRender .= "\n"; @@ -398,7 +398,7 @@ function getViewPage($oDocument) { */ function getCheckOutEditPage($oDocument, $bCheckedOut = false) { global $default; - $sToRender = renderHeading() . renderDocumentPath($oDocument) . "\n
\n"; + $sToRender = renderHeading("Document Detail") . renderDocumentPath($oDocument) . "\n
\n"; $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
\n"; @@ -446,7 +446,7 @@ function getCheckOutEditPage($oDocument, $bCheckedOut = false) { */ function getCheckInEditPage($oDocument) { global $default; - $sToRender = renderHeading() . renderDocumentPath($oDocument) . "\n
\n"; + $sToRender = renderHeading("Document Detail") . renderDocumentPath($oDocument) . "\n
\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
\n"; @@ -483,7 +483,7 @@ function getWebPublishPage($oDocument) { $oPatternListBox = & new PatternListBox($default->owl_web_sites_table, "web_site_name", "id", "fWebSiteID"); - $sToRender = renderHeading() . renderDocumentPath($oDocument) . "\n
\n"; + $sToRender = renderHeading("Document Detail") . renderDocumentPath($oDocument) . "\n
\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php index 5de7499..695fa43 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentBL.php @@ -8,6 +8,7 @@ require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentCollaborat require_once("$default->fileSystemRoot/lib/web/WebDocument.inc"); require_once("$default->fileSystemRoot/lib/web/WebSite.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); require_once("webDocumentUI.inc"); /** diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentUI.inc index 84cbad5..119b346 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/webDocumentUI.inc @@ -12,7 +12,7 @@ * @package presentation.lookAndFeel.knowledgeTree.documentmanagement */ -function renderHeading() { +/*function renderHeading() { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -22,7 +22,7 @@ function renderHeading() { $sToRender .= "
\n"; return $sToRender; -} +}*/ /** * Prompts the user for a checkout comment @@ -35,7 +35,7 @@ function renderUploadPage($oWebDocument) { $oWebSite = WebSite::get($oWebDocument->getWebSiteID()); $oUser = User::get($oDocument->getCreatorID()); - $sToRender = renderHeading(); + $sToRender = renderHeading("Web document"); $sToRender .= "\n"; $sToRender .= ""; $sToRender .= ""; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php index d0960c4..b1a6a8c 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationBL.php @@ -18,6 +18,7 @@ if (checkSession()) { include_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); include_once("$default->fileSystemRoot/lib/security/permission.inc"); include_once("$default->fileSystemRoot/lib/users/User.inc"); + require_once("$default->fileSystemRoot/presentation/Html.inc"); if (Permission::userHasFolderWritePermission($fFolderID)) { //can only create new collaboration steps if the user has folder write permission if (isset($fForStore)) { diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc index 6324cf6..be883e8 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderCollaborationUI.inc @@ -9,7 +9,7 @@ * */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -19,7 +19,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "
'" . $oUser->getName() . "' has requested that the document
" . generateControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID(), $oDocument->getDisplayPath()) . "
\n"; return $sToRender; -} +}*/ function getPage($iFolderID, $iGroupID, $iRoleID, $iSequenceNumber) { diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc index cc24828..47ff8da 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/addFolderDocTypeUI.inc @@ -7,7 +7,7 @@ * @package presentation.lookAndFeel.knowledgeTree.foldermanagement */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -17,7 +17,7 @@ function renderHeading($sHeading) { $sToRender .= "
\n"; return $sToRender; -} +}*/ function getPage($iFolderID, $iDocumentTypeID) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc index fd9b5d9..ad4138b 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/collaborationUI.inc @@ -8,7 +8,7 @@ * */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -18,7 +18,8 @@ function renderHeading($sHeading) { $sToRender .= "
\n"; return $sToRender; -} +}*/ + function getFolderPath($iFolderID) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentUI.inc index f846acc..9c9a1f4 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteDependantDocumentUI.inc @@ -7,7 +7,7 @@ * @package presentation.lookAndFeel.knowledgeTree.foldermanagement */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -17,7 +17,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getPage($iFolderID, $iFolderCollaborationID, $sDocumentTitle, $sUserName, $sTemplateDocument) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php index 731a829..9349136 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationBL.php @@ -22,6 +22,7 @@ if (checkSession()) { include_once("$default->fileSystemRoot/lib/foldermanagement/FolderCollaboration.inc"); include_once("$default->fileSystemRoot/lib/groups/Group.inc"); include_once("$default->fileSystemRoot/lib/roles/Role.inc"); + require_once("$default->fileSystemRoot/presentation/Html.inc"); if (Permission::userHasFolderWritePermission($fFolderID)) { //can only delete new collaboration steps if the user has folder write permission if (isset($fForDelete)) { diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc index f87a702..8faa182 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderCollaborationUI.inc @@ -9,7 +9,7 @@ * */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -19,7 +19,8 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ + function getFolderPath($iFolderID) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc index faf3695..ab2c423 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/deleteFolderUI.inc @@ -10,7 +10,7 @@ * @package presentation.lookAndFeel.knowledgeTree.foldermanagement */ - function renderHeading($sHeading) { + /*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -20,7 +20,7 @@ $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getFolderPath($iFolderID) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc index 862f5f0..7b0c7c9 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/editUI.inc @@ -8,7 +8,7 @@ * */ -function renderHeading() { +/*function renderHeading() { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -18,7 +18,7 @@ function renderHeading() { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getFolderPath($iFolderID) { global $default; @@ -149,7 +149,7 @@ function getFolderGroupAccess($iFolderID) { function getPage($iFolderID, $bCollaboration = false) { global $default; - $sToRender = renderHeading(); + $sToRender = renderHeading("Modify Folder"); $sToRender .= getFolderPath($iFolderID); $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc index 12e7774..5b46766 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/groupFolderLinkUI.inc @@ -9,7 +9,7 @@ */ -function renderHeading($sHeading) { +/*function renderHeading($sHeading) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -19,7 +19,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "
\n"; return $sToRender; -} +}*/ function getFolderPath($iFolderID) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc index ee38bf8..b7f546c 100644 --- a/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/foldermanagement/viewDependantDocumentsUI.inc @@ -1,7 +1,7 @@ siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -11,7 +11,7 @@ function renderHeading($sHeading) { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getFolderPath($iFolderID) { global $default; diff --git a/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsUI.inc b/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsUI.inc index e109d06..01083fd 100644 --- a/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/preferences/editUserPrefsUI.inc @@ -7,7 +7,7 @@ * @package presentation.lookAndFeel.knowledgeTree. * */ -function renderHeading() { +/*function renderHeading() { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -15,7 +15,7 @@ function renderHeading() { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getUserDetailsPage($iUserID) { @@ -35,7 +35,7 @@ function getUserDetailsPage($iUserID) { $oPattern->setColumnsRequired(array(1,0,0,0)); $sToRender .= "\n"; - $sToRender .= renderHeading(); + $sToRender .= renderHeading("Preferenes"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -56,7 +56,7 @@ function getEditPageSuccess() { global $default; $sToRender .= "
Edit User Properties:
\n"; - $sToRender .= renderHeading(); + $sToRender .= renderHeading("Preferences"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; @@ -74,7 +74,7 @@ function getEditPageFail() { global $default; $sToRender .= "
Success!
The User was successfully modified
\n"; - $sToRender .= renderHeading(); + $sToRender .= renderHeading("Preferences"); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php index 817e326..177232b 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php +++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php @@ -17,6 +17,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); require_once("$default->fileSystemRoot/lib/security/permission.inc"); + require_once("$default->fileSystemRoot/presentation/Html.inc"); require_once("advancedSearchUI.inc"); require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc index a1550fe..5b67dd5 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchUI.inc @@ -9,7 +9,7 @@ * */ -function renderHeading() { +/*function renderHeading() { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -17,7 +17,7 @@ function renderHeading() { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getMetaData($aMetaTagIDs) { global $default; @@ -51,7 +51,7 @@ function getMetaData($aMetaTagIDs) { function getSearchPage($sSearchString = "", $aMetaTagIDs = array()) { global $default; $sToRender = "
User modification Failed!
\n"; - $sToRender .= renderHeading(); + $sToRender .= renderHeading("Advanced Search"); $sToRender .= "\n"; $sToRender .= "\n"; @@ -99,7 +99,7 @@ function getSearchResults($sMetaTagIDs, $sSQLSearchString, $iStartIndex) { $oPatternBrowse->setStartIndex($iStartIndex); $sRefreshMessage = "
Search text: \n"; //$sToRender .= "graphicsUrl/search.gif\" value=\"search\" onClick=\"validateAdvancedSearchText()\"/>
If your browser displays a 'Warning: Page has Expired' message when you attempt to return to these search results, please click your browser's 'Refresh' button
"; - return "" . renderHeading() . "
" . $oPatternBrowse->render() . $sRefreshMessage . getSearchVariablesHtml($sSearchText, $sMetaTagIDs); + return "" . renderHeading("Advanced Search") . "
" . $oPatternBrowse->render() . $sRefreshMessage . getSearchVariablesHtml($sSearchText, $sMetaTagIDs); } function getSearchValidationJavaScript() { diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php index ad25e0a..5447482 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php +++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchBL.php @@ -18,7 +18,8 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternBrowsableSearchResults.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); - require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); + require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); + require_once("$default->fileSystemRoot/presentation/Html.inc"); require_once("standardSearchUI.inc"); if (!isset($fStartIndex)) { diff --git a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc index ce6df48..016cb7b 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/search/standardSearchUI.inc @@ -8,7 +8,7 @@ * @package presentation.lookAndFeel.documentmanagement */ -function renderHeading() { +/*function renderHeading() { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sColor = $default->siteMap->getSectionColour($sSectionName, "th"); @@ -16,11 +16,11 @@ function renderHeading() { $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ function getPage($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType, $sFolderIDs, $iStartIndex, $sSQLSearchString, $bSearchByDocument = false) { $sRefreshMessage = "
If your browser displays a 'Warning: Page has Expired' message when you attempt to return to these search results, please click your browser's 'Refresh' button
"; - return "" . renderHeading() . "
" . getSearchResults($sFolderIDs, $sSQLSearchString, $iStartIndex, $bSearchByDocument) . $sRefreshMessage . getSearchVariablesHtml($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType); + return "" . renderHeading("Standard Search") . "
" . getSearchResults($sFolderIDs, $sSQLSearchString, $iStartIndex, $bSearchByDocument) . $sRefreshMessage . getSearchVariablesHtml($sSearchText, $sBrowseType, $iFolderID, $iDocumentID, $sCategoryName, $iDocType); } /*function getSearchResults($sIDs,$sSQLSearchString, $iStartIndex, $bSearchByDocument = false) { diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/addSubscriptionBL.php b/presentation/lookAndFeel/knowledgeTree/subscriptions/addSubscriptionBL.php index c443e25..b045166 100644 --- a/presentation/lookAndFeel/knowledgeTree/subscriptions/addSubscriptionBL.php +++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/addSubscriptionBL.php @@ -3,6 +3,7 @@ require_once("../../../../config/dmsDefaults.php"); require_once("$default->fileSystemRoot/lib/subscriptions/Subscription.inc"); require_once("$default->fileSystemRoot/lib/subscriptions/SubscriptionManager.inc"); +require_once("$default->fileSystemRoot/presentation/Html.inc"); /** * $Id$ diff --git a/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc b/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc index 61a4b5e..d84412a 100644 --- a/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/subscriptions/subscriptionUI.inc @@ -12,14 +12,14 @@ * @package presentation.lookAndFeel.knowledgeTree.subscriptions */ -function renderHeading() { +/*function renderHeading() { global $default; $sColor = $default->siteMap->getSectionColour("Subscriptions", "th"); $sToRender .= "Subscriptions\n"; $sToRender .= "\n"; $sToRender .= "\n"; return $sToRender; -} +}*/ /** * Displays all current subscriptions with remove checkbox @@ -33,7 +33,7 @@ function renderManagePage() { $bNoSubscriptions = ( (count($aFolderSubscriptions) == 0) && (count($aDocumentSubscriptions) == 0) ) ? true : false; $sToRender = "\n"; - $sToRender .= renderHeading(); + $sToRender .= renderHeading("Subscriptions"); if ($bNoSubscriptions) { $sToRender .= "\n"; } else {
You are not subscribed to any documents or folders.