From 8833aaa221eff1e2d15001a4f4519f7d180c2c79 Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Wed, 11 Jun 2003 15:28:59 +0000 Subject: [PATCH] latest layout changes --- tests/documentmanagement/viewBL.php | 2 +- tests/documentmanagement/viewUI.inc | 257 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------- 2 files changed, 140 insertions(+), 119 deletions(-) diff --git a/tests/documentmanagement/viewBL.php b/tests/documentmanagement/viewBL.php index b3b5fda..b886771 100644 --- a/tests/documentmanagement/viewBL.php +++ b/tests/documentmanagement/viewBL.php @@ -238,7 +238,7 @@ if (checkSession()) { $main->setErrorMessage("This document has been archived."); } $main->setCentralPayload($oPatternCustom); - //$main->setOnLoadJavaScript("switchDiv('documentData')"); + $main->setOnLoadJavaScript("switchDiv('documentData')"); $main->setFormAction("$default->rootUrl/control.php?action=modifyDocument&fDocumentID=" . $oDocument->getID()); $main->render(); } else { diff --git a/tests/documentmanagement/viewUI.inc b/tests/documentmanagement/viewUI.inc index a0d0394..c7ceee8 100644 --- a/tests/documentmanagement/viewUI.inc +++ b/tests/documentmanagement/viewUI.inc @@ -11,7 +11,7 @@ * * @author Rob Cherry, Jam Warehouse (Pty) Ltd, South Africa * @date 21 January 2003 - * @package presentation.lookAndFeel.knowledgeTree.documentManager + * @package presentation.lookAndFeel.knowledgeTree.documentmanagement */ function renderDocumentPath($oDocument) { @@ -20,10 +20,10 @@ function renderDocumentPath($oDocument) { $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > "; $sDocumentPath .= "rootUrl/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php?fDocumentID=" . $oDocument->getID() . "&fForInlineView=1\">" . $oDocument->getName() . ""; - return "
$sDocumentPath
\n"; + return "
$sDocumentPathActions
\n"; } -function renderDocumentData($oDocument, $bEditable) { +function renderDocumentData($oDocument, $sDivName, $bEditable) { global $default; $sQuery = "SELECT D.name, D.modified, DTT.datetime AS created, U.name AS initiator, CONCAT(CONCAT(D.major_version, '.'), D.minor_version) AS version, WDSL.name AS status, DTL.name AS document_type, D.is_checked_out, COALESCE(U2.name, '') AS c_user " . "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_web_documents_table AS WD ON WD.document_id = D.ID " . @@ -41,73 +41,24 @@ function renderDocumentData($oDocument, $bEditable) { $aColumnTypes = array(1,1,1,1,1,1,1,1); $oPatternListFromQuery = & new PatternListFromQuery($sQuery, $aColumns, $aColumnNames, $aColumnTypes); $oPatternListFromQuery->setTableHeading("Document Data"); - $oPatternListFromQuery->setTableWidth("100%"); - - $sToRender = ""; - return $sToRender; -} - -function renderEditableLinkedDocuments($oDocument) { - global $default; - - $sQuery = "SELECT D.id AS child_document_id, D.name, DL.id as document_link_id, DL.parent_document_id AS parent_document_id, 'Unlink' AS unlink " . - "FROM documents AS D INNER JOIN document_link AS DL ON D.id = DL.child_document_id " . - "WHERE DL.parent_document_id = " . $oDocument->getID(); - - $aColumns = array("name", "unlink"); - $aColumnHeaders = array("Document"); - $aColumnTypes = array(3,3); - $aDBColumnArray = array("parent_document_id", "child_document_id","document_link_id"); - $aQueryStringVariableNames = array("fParentDocumentID","fChildDocumentID", "fDocumentLinkID"); - $aLinkURLs = array(0=>"$default->rootUrl/control.php?action=viewDocument", 1=>"$default->rootUrl/control.php?action=removeDocumentLink"); - - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "100%", $aLinkURLs,$aDBColumnArray,$aQueryStringVariableNames); - $oPatternTableSqlQuery->setTableHeading("Linked documents"); - $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - - $sToRender .= ""; - return $sToRender; -} -function renderNonEditableLinkedDocuments($oDocument) { - global $default; - - $sQuery = "SELECT D.id, D.name, 'Delete' AS del " . - "FROM documents AS D INNER JOIN document_link AS DL ON D.id = DL.child_document_id " . - "WHERE DL.parent_document_id = " . $oDocument->getID(); - - $aColumns = array("name","del"); - $aColumnNames = array("Document"); - $aColumnTypes = array(1,3); - - $oPatternListFromQuery = & new PatternListFromQuery($sQuery, $aColumns, $aColumnNames, $aColumnTypes); - $oPatternListFromQuery->setTableHeading("Linked documents"); - $oPatternListFromQuery->setTableWidth("100%"); - return $oPatternListFromQuery->render(); + return renderDiv($sDivName, $sToRender); } -function renderGenericMetaData($oDocument) { +function renderGenericMetaData($oDocument, $sDivName) { global $default; $sQuery = "SELECT DF.name AS name, DFL.value as value " . "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_fields_table AS DFL ON D.id = DFL.document_id " . @@ -117,23 +68,22 @@ function renderGenericMetaData($oDocument) { $aColumns = array("name", "value"); $aColumnHeaders = array("Tag", "Value"); $aColumnTypes = array(1,1); - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "100%"); + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540"); $oPatternTableSqlQuery->setTableHeading("Generic Meta Data"); - $sToRender .= ""; - return $sToRender; + + return renderDiv($sDivName, $sToRender); } -function renderTypeSpecificMetaData($oDocument) { +function renderTypeSpecificMetaData($oDocument, $sDivName) { global $default; $sQuery = "SELECT DF.name AS name, DFL.value AS value " . @@ -146,24 +96,55 @@ function renderTypeSpecificMetaData($oDocument) { $aColumns = array("name", "value"); $aColumnHeaders = array("Tag", "Value"); $aColumnTypes = array(1,1); - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "100%"); + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540"); $oPatternTableSqlQuery->setTableHeading("Type Specific Meta Data"); $oPatternTableSqlQuery->setEmptyTableMessage("No Type Specific Meta Data"); - $sToRender .= ""; - return $sToRender; + return renderDiv($sDivName, $sToRender); +} + +function renderDocumentArchiveSettings($oDocument, $sDivName) { + global $default; + $sQuery = "SELECT d.id, atl.name, 'Edit' AS edit FROM $default->owl_document_archiving_table AS da " . + "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " . + "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " . + "WHERE d.id = " . $oDocument->getID(); + + $aColumns = array("name", "edit"); + $aColumnHeaders = array("Archiving Type"); + $aColumnTypes = array(1,3); + $aDBColumnArray = array("id"); + $aQueryStringVariableNames = array("fDocumentID"); + $aLinkURLs = array(1=>"$default->rootUrl/control.php?action=modifyDocumentArchiveSettings"); + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540", $aLinkURLs ,$aDBColumnArray,$aQueryStringVariableNames); + $oPatternTableSqlQuery->setTableHeading("Archiving Settings"); + $oPatternTableSqlQuery->setEmptyTableMessage("No archiving settings"); + $oPatternTableSqlQuery->setDisplayColumnHeadings(true); + + + $sToRender .= "\t\n"; + $sToRender .= "\t\n"; + $sToRender .= "\t\t\n"; + $sToRender .= "\t"; + $sToRender .= "\t \n"; + // if there are no archiving settings then allow their addition + $oDocumentArchiving = DocumentArchiving::getFromDocumentID($oDocument->getID()); + $sToRender .= "\t\t\n"; + $sToRender .= "\t"; + $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
" . ($oDocumentArchiving ? "" : generateControllerLink("addDocumentArchiveSettings", "fDocumentID=" . $oDocument->getID(), "graphicsUrl/widgets/add.gif\" border=\"0\"/>")) . "
\n"; + + return renderDiv($sDivName, $sToRender); } -function renderEditableDocumentRouting($oDocument) { +function renderEditableDocumentRouting($oDocument, $sDivName) { global $default; $sQuery = "SELECT D.id as document_id, GFAL.id as id, R.name AS role_name, COALESCE(U.Name, 'Not assigned') AS name, GFAL.precedence AS precedence, COALESCE(FURL.active,0) AS active, COALESCE(FURL.done, 0) AS done, 'Edit' as edit " . "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . @@ -179,11 +160,10 @@ function renderEditableDocumentRouting($oDocument) { $aQueryStringVariableNames = array("fFolderCollaborationID", "fDocumentID","fIsActive","fIsDone"); $aLinkURLs = array(5=>"$default->rootUrl/control.php?action=modifyDocumentRouting"); - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "100%", $aLinkURLs,$aDBColumnArray,$aQueryStringVariableNames); + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540", $aLinkURLs,$aDBColumnArray,$aQueryStringVariableNames); $oPatternTableSqlQuery->setTableHeading("Document Routing"); $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - $sToRender .= ""; - return $sToRender; - + + return renderDiv($sDivName, $sToRender); } function renderNonEditableDocumentRouting($oDocument) { @@ -240,46 +219,66 @@ function renderNonEditableDocumentRouting($oDocument) { $aColumns = array("role_name", "name", "precedence", "active", "done"); $aColumnHeaders = array("Role", "User", "Seq", "Active", "Done"); $aColumnTypes = array(1,1,1,1,1); - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "100%", "$default->rootUrl/control.php?action=modifyDocumentRouting",$aDBColumnArray,$aQueryStringVariableNames); + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540", "$default->rootUrl/control.php?action=modifyDocumentRouting",$aDBColumnArray,$aQueryStringVariableNames); $oPatternTableSqlQuery->setTableHeading("Document Routing"); $oPatternTableSqlQuery->setDisplayColumnHeadings(true); return $oPatternTableSqlQuery->render(); } -function renderDocumentArchiveSettings($oDocument) { - global $default; - $sQuery = "SELECT d.id, atl.name, 'Edit' AS edit FROM $default->owl_document_archiving_table AS da " . - "INNER JOIN $default->owl_archiving_type_lookup_table AS atl ON da.archiving_type_id=atl.id " . - "INNER JOIN $default->owl_documents_table AS d ON da.document_id=d.id " . - "WHERE d.id = " . $oDocument->getID(); +function renderEditableLinkedDocuments($oDocument, $sDivName) { + global $default; + + $sQuery = "SELECT D.id AS child_document_id, D.name, DL.id as document_link_id, DL.parent_document_id AS parent_document_id, 'Unlink' AS unlink " . + "FROM documents AS D INNER JOIN document_link AS DL ON D.id = DL.child_document_id " . + "WHERE DL.parent_document_id = " . $oDocument->getID(); + + $aColumns = array("name", "unlink"); + $aColumnHeaders = array("Document"); + $aColumnTypes = array(3,3); + $aDBColumnArray = array("parent_document_id", "child_document_id","document_link_id"); + $aQueryStringVariableNames = array("fParentDocumentID","fChildDocumentID", "fDocumentLinkID"); + $aLinkURLs = array(0=>"$default->rootUrl/control.php?action=viewDocument", 1=>"$default->rootUrl/control.php?action=removeDocumentLink"); + + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540", $aLinkURLs,$aDBColumnArray,$aQueryStringVariableNames); + $oPatternTableSqlQuery->setTableHeading("Linked documents"); + $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - $aColumns = array("name", "edit"); - $aColumnHeaders = array("Archiving Type"); + $sToRender .= "\t\n"; + $sToRender .= "\t\n"; + $sToRender .= "\t\t\n"; + $sToRender .= "\t"; + $sToRender .= "\t\n"; + $sToRender .= "\n"; + $sToRender .= "\t"; + $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
rootUrl/control.php?action=addDocumentLink&fDocumentID=" . $oDocument->getID() ."\">graphicsUrl/widgets/add.gif\" border=\"0\"/>
\n"; + return renderDiv($sDivName, $sToRender); +} + +function renderNonEditableLinkedDocuments($oDocument, $sDivName) { + global $default; + + $sQuery = "SELECT D.id, D.name, 'Delete' AS del " . + "FROM documents AS D INNER JOIN document_link AS DL ON D.id = DL.child_document_id " . + "WHERE DL.parent_document_id = " . $oDocument->getID(); + + $aColumns = array("name","del"); + $aColumnNames = array("Document"); $aColumnTypes = array(1,3); - $aDBColumnArray = array("id"); - $aQueryStringVariableNames = array("f "); - $aLinkURLs = array(1=>"$default->rootUrl/control.php?action=modifyDocumentArchiveSettings"); - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "100%", $aLinkURLs ,$aDBColumnArray,$aQueryStringVariableNames); - $oPatternTableSqlQuery->setTableHeading("Archiving Settings"); - $oPatternTableSqlQuery->setEmptyTableMessage("No archiving settings"); - $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - $sToRender .= ""; - return $sToRender; + return renderDiv($sDivName, $sToRender); } + function displayActionButtons($oDocument, $bEdit) { global $default; if ($bEdit) { @@ -319,31 +318,53 @@ function displayActionButtons($oDocument, $bEdit) { } function renderDiv($sDivName, $sHtml) { - return ""; + global $default; + + if ( in_array($default->browser, array("moz", "ns")) ) { + return ""; + } else { + return ""; + } } +function renderDocumentSection($sHeading) { + return "$sHeading\n"; +} + function getEditPage($oDocument) { global $default; - $iDocumentID = $oDocument->getID(); - - $sToRender = renderHeading("Document Detail") . renderDocumentPath($oDocument) . "\n\n"; + +// if ( ($default->browser == "moz") && ($default->version <= 4.79) ) { + $sToRender = "
"; +// } else { +// $sToRender = "
"; +// } + + $sToRender .= renderHeading("Document Detail"); + $sToRender .= renderDocumentPath($oDocument) . "\n\n"; + $sToRender .= ""; + $sToRender .= renderDocumentSection("Document Data"); + $sToRender .= renderDocumentSection("Generic Meta Data"); + $sToRender .= renderDocumentSection("Type Specific Meta Data"); + $sToRender .= renderDocumentSection("Archive Settings"); + $sToRender .= renderDocumentSection("Document Routing"); + $sToRender .= renderDocumentSection("Linked Documents"); + $sToRender .= "
"; + $sToRender .= "
"; - $sToRender .= renderHeading("Document Data"); - $sToRender .= renderHeading("Generic Meta Data"); - $sToRender .= renderHeading("Type Specific Meta Data"); - $sToRender .= renderHeading("Archive Settings"); - $sToRender .= renderHeading("Document Routing"); - $sToRender .= renderHeading("Linked Documents"); - - $sToRender .= renderDocumentData($oDocument, true); - $sToRender .= renderTypeSpecificMetaData($oDocument); - $sToRender .= renderDocumentArchiveSettings($oDocument); - $sToRender .= renderEditableLinkedDocuments($oDocument); - $sToRender .= renderEditableDocumentRouting($oDocument); - $sToRender .= renderGenericMetaData($oDocument); + $sToRender .= renderDocumentData($oDocument, "documentData", true); + $sToRender .= renderDocumentArchiveSettings($oDocument, "archiveSettings"); + $sToRender .= renderEditableDocumentRouting($oDocument, "documentRouting"); + $sToRender .= renderGenericMetaData($oDocument, "genericMetaData"); + $sToRender .= renderEditableLinkedDocuments($oDocument, "linkedDocuments"); + $sToRender .= renderTypeSpecificMetaData($oDocument, "typeSpecificMetaData"); - $sToRender .= "
"; - $sToRender .= "\n"; +// if ( ($default->browser == "moz") && ($default->version <= 4.79) ) { +// $sToRender .= "
"; +// } else { + $sToRender .= "
"; +// } + $sToRender .= "
\n"; $sToRender .= displayActionButtons($oDocument, true); $sToRender .= "
\n"; $sToRender .= "
"; -- libgit2 0.21.4