diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php index bda0163..e75031e 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkBL.php @@ -1,16 +1,18 @@ fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); require_once("$default->fileSystemRoot/lib/security/permission.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); + require_once("documentUI.inc"); require_once("addDocumentLinkUI.inc"); if (Permission::userHasDocumentWritePermission($fDocumentID)) { @@ -40,7 +43,6 @@ if (checkSession()) { $main->setHasRequiredFields(true); $main->setErrorMessage("An error occured whilst attempting to link the two documents"); $main->render(); - } } else { //display the add page @@ -53,10 +55,6 @@ if (checkSession()) { $main->setHasRequiredFields(true); $main->render(); } - - } - - + } } - ?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc index 4c39f58..1da82f8 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/addDocumentLinkUI.inc @@ -1,29 +1,20 @@ 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; -}*/ + * $Id$ + * + * Presentation logic used to link one document to another + * + * Licensed under the GNU GPL. For full terms see the file DOCS/COPYING. + * + * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa + * @package presentation.lookAndFeel.knowledgeTree.documentmanagement + */ function getPage($iDocumentID) { global $default; $sToRender = renderHeading("Document Linking"); + $sToRender .= displayDocumentPath($iDocumentID); $sToRender .= ""; $sToRender .= ""; //had a slight problem with netscape 4.7x - it doesn't support disabled. So I had to use @@ -75,8 +66,5 @@ function getNetscapeDisableScript() { $sToRender .= "}\n"; $sToRender .= "//-->\n\n"; return $sToRender; - } - - ?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php index 17c90f1..ae168b8 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationBL.php @@ -1,18 +1,20 @@ fileSystemRoot/presentation/Html.inc"); require_once("$default->fileSystemRoot/lib/security/permission.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc"); + require_once("documentUI.inc"); require_once("collaborationUI.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationUI.inc index f5505ed..6ca0ac5 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/collaborationUI.inc @@ -1,12 +1,14 @@ siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); $sTHBGColour = $default->siteMap->getSectionColour($sSectionName, "th"); - return "
\n" . + return renderHeading("Edit Document Approval Routing") . + displayDocumentPath($fDocumentID) . + "
\n" . "\n" . "\n" . "\n" . diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyBL.php index 7b0c3ea..9d9691f 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyBL.php @@ -1,19 +1,21 @@ fileSystemRoot/lib/visualpatterns/PatternEditableTableSqlQuery.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc"); + require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/documentmanagement/documentUI.inc"); require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php index b3a0aff..21585ea 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataBL.php @@ -1,13 +1,15 @@ fileSystemRoot/lib/visualpatterns/PatternEditableTableSqlQuery.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMetaData.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); + require_once("documentUI.inc"); require_once("modifyGenericMetaDataUI.inc"); if (Permission::userHasDocumentWritePermission($fDocumentID)) { diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataUI.inc index 7437a39..6004fc4 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyGenericMetaDataUI.inc @@ -1,5 +1,13 @@ \n"; + + $sToRender .= renderHeading("Edit Generic Meta Data"); + $sToRender .= displayDocumentPath($iDocumentID); + $sToRender .= "
Document Routing
Group".getGroupRow($iGroupID)."
\n"; $sToRender .= "\n"; $sToRender .= "
\n"; $sToRender .= getEditableGenericMetaData($iDocumentID, $iDocumentTypeID); @@ -54,5 +65,4 @@ function getPage($iDocumentID, $iDocumentTypeID, $fFirstEdit) { return $sToRender; } - -?> +?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php index 25b89cb..d932542 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataBL.php @@ -1,16 +1,16 @@ fileSystemRoot/lib/security/permission.inc"); require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc"); require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc"); @@ -18,6 +18,7 @@ if (checkSession()) { require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableTableSqlQuery.inc"); require_once("$default->fileSystemRoot/lib/visualpatterns/PatternMetaData.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); + require_once("documentUI.inc"); require_once("modifySpecificMetaDataUI.inc"); if (Permission::userHasDocumentWritePermission($fDocumentID)) { @@ -30,7 +31,5 @@ if (checkSession()) { $main->setHasRequiredFields(true); $main->render(); } - } - -?> +?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataUI.inc index bf71563..5e814c0 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifySpecificMetaDataUI.inc @@ -1,12 +1,12 @@ \n"; + $sToRender .= renderHeading("Edit Type Specific Meta Data"); + $sToRender .= displayDocumentPath($iDocumentID); + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
\n"; $sToRender .= getEditableTypeSpecificMetaData($iDocumentID, $iDocumentTypeID); @@ -62,7 +64,4 @@ function getPage($iDocumentID, $iDocumentTypeID, $bFirstEdit) { return $sToRender; } - -?> - - +?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc index 2626601..7227e24 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/modifyUI.inc @@ -1,13 +1,14 @@ getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID())) . " > " . $oDocument->getName(); @@ -21,8 +22,8 @@ function renderEditableDocumentData($oDocument, $iDocumentTypeID) { $sToRender; if ($oDocument) { - $sToRender = "\n"; - $sToRender .= "\n"; + $sToRender .= "
Document Data
\n"; + $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "
Document Data
\n"; $sToRender .= "Document Title \n"; @@ -62,7 +63,9 @@ function getDocumentType($iFolderID, $iDocumentTypeID) { function renderPage($oDocument, $iDocumentTypeID, $fFirstEdit) { global $default; - $sToRender = "\n"; + $sToRender = renderHeading("Edit Document Details"); + $sToRender .= displayDocumentPath($oDocument->getID()); + $sToRender .= "
\n"; $sToRender .= "\n"; $sToRender .= "
\n"; $sToRender .= renderEditableDocumentData($oDocument, $iDocumentTypeID) . "\n"; diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkBL.php b/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkBL.php index cc94d5b..3ac6397 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkBL.php +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkBL.php @@ -1,19 +1,20 @@ fileSystemRoot/lib/documentmanagement/Document.inc"); require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentLink.inc"); require_once("$default->fileSystemRoot/presentation/Html.inc"); + require_once("documentUI.inc"); require_once("removeDocumentLinkUI.inc"); - - + if (Permission::userHasDocumentWritePermission($fParentDocumentID)) { if (isset($fForDelete)) { //deleting a document link @@ -69,6 +70,4 @@ if (checkSession()) { $main->render(); } } - - ?> \ No newline at end of file diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkUI.inc index 582916e..7baca2e 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/removeDocumentLinkUI.inc @@ -21,6 +21,7 @@ function getPage($sParentDocumentName, $sChildDocumentName, $iParentDocumentID) { global $default; $sToRender = renderHeading("Unlink document"); + $sToRender .= displayDocumentPath($iParentDocumentID); $sToRender .= "\n"; $sToRender .= "\n"; $sToRender .= "\n";
You have chosen to delete the link between the document '$sParentDocumentName' and the document '$sChildDocumentName'