From a9727a000872d0b3be492347f3687d21fa373fea Mon Sep 17 00:00:00 2001 From: Michael Joseph Date: Fri, 20 Jun 2003 09:05:43 +0000 Subject: [PATCH] added status message method, and fixed formatting for multi-line folder paths --- presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc | 205 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------ 1 file changed, 115 insertions(+), 90 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc index 3ab0b00..64380d7 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc @@ -14,21 +14,20 @@ * @package presentation.lookAndFeel.knowledgeTree.documentmanagement */ -function renderDocumentPath($oDocument, $bDisplayActions) { +function renderDocumentPath($oDocument, $bDisplayActions = false) { global $default; $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); if ($bDisplayActions) { $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > "; - $sDocumentPath .= "" . $oDocument->getName() . ""; - //$sDocumentPath .= generateControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID() . "&fForInlineView=1", $oDocument->getName()); + $sDocumentPath .= "" . $oDocument->getName() . ""; } else { $sDocumentPath = $oDocument->getDisplayPath(); } - return "" . ($bDisplayActions ? "" : "") . "
$sDocumentPathActions
\n"; + return "" . ($bDisplayActions ? "" : "") . "
$sDocumentPathActions
\n"; } -function renderDocumentData($oDocument, $bEditable) { +function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") { 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 " . @@ -48,7 +47,10 @@ function renderDocumentData($oDocument, $bEditable) { $oPatternListFromQuery->setTableHeading("Document Data"); $oPatternListFromQuery->setTableWidth("400"); - $sToRender .= "\t\n"; + if ($sStatusMessage) { + $sToRender .= "$sStatusMessage"; + } + $sToRender .= "\t
\n"; $sToRender .= "\t\n"; $sToRender .= "\t\t\n"; $sToRender .= "\t\n"; @@ -63,7 +65,7 @@ function renderDocumentData($oDocument, $bEditable) { } -function renderGenericMetaData($oDocument, $sDivName, $bEditable) { +function renderGenericMetaData($oDocument, $bEditable) { 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 " . @@ -76,7 +78,7 @@ function renderGenericMetaData($oDocument, $sDivName, $bEditable) { $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "500"); $oPatternTableSqlQuery->setTableHeading("Generic Meta Data"); - $sToRender .= "\t
" . $oPatternListFromQuery->render() . "
\n"; + $sToRender .= "\t
\n"; $sToRender .= "\t\n"; $sToRender .= "\t\n"; $sToRender .= "\t\n"; @@ -87,10 +89,10 @@ function renderGenericMetaData($oDocument, $sDivName, $bEditable) { } $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
\n"; - return renderSectionDiv($sDivName, $sToRender); + return $sToRender; } -function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) { +function renderTypeSpecificMetaData($oDocument, $bEditable) { global $default; $sQuery = "SELECT DF.name AS name, DFL.value AS value " . @@ -103,11 +105,11 @@ function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) { $aColumns = array("name", "value"); $aColumnHeaders = array("Tag", "Value"); $aColumnTypes = array(1,1); - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540"); + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "500"); $oPatternTableSqlQuery->setTableHeading("Type Specific Meta Data"); $oPatternTableSqlQuery->setEmptyTableMessage("No Type Specific Meta Data"); - $sToRender .= "\t\n"; + $sToRender .= "\t
\n"; $sToRender .= "\t\n"; $sToRender .= "\t\t\n"; $sToRender .= "\t\n"; @@ -117,7 +119,7 @@ function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) { $sToRender .= "\t\n"; } $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
\n"; - return renderSectionDiv($sDivName, $sToRender); + return $sToRender; } function renderEditableDocumentArchiveSettings($oDocument) { @@ -157,10 +159,10 @@ function renderNonEditableDocumentArchiveSettings($oDocument) { return $oPatternTableSqlQuery->render(); } -function renderDocumentArchiveSettings($oDocument, $sDivName, $bEditable) { +function renderDocumentArchiveSettings($oDocument, $bEditable) { global $default; - $sToRender .= "\t\n"; + $sToRender .= "\t
\n"; $sToRender .= "\t\n"; $sToRender .= "\t\t\n"; $sToRender .= "\t"; @@ -173,10 +175,10 @@ function renderDocumentArchiveSettings($oDocument, $sDivName, $bEditable) { } $sToRender .= "\t
" . ($bEditable ? renderEditableDocumentArchiveSettings($oDocument) : renderNonEditableDocumentArchiveSettings($oDocument)) . "
\n"; - return renderSectionDiv($sDivName, $sToRender); + return $sToRender; } -function renderEditableDocumentRouting($oDocument, $sDivName) { +function renderEditableDocumentRouting($oDocument) { 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 " . @@ -196,7 +198,7 @@ function renderEditableDocumentRouting($oDocument, $sDivName) { $oPatternTableSqlQuery->setTableHeading("Document Routing"); $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - $sToRender .= "\t\n"; + $sToRender .= "\t
\n"; $sToRender .= "\t\n"; $sToRender .= "\t\t\n"; $sToRender .= "\t"; @@ -235,10 +237,10 @@ function renderEditableDocumentRouting($oDocument, $sDivName) { $sToRender .= "\t"; $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
\n"; - return renderSectionDiv($sDivName, $sToRender); + return $sToRender; } -function renderNonEditableDocumentRouting($oDocument, $sDivName) { +function renderNonEditableDocumentRouting($oDocument) { 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 " . "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . @@ -255,7 +257,7 @@ function renderNonEditableDocumentRouting($oDocument, $sDivName) { $oPatternTableSqlQuery->setTableHeading("Document Routing"); $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - $sToRender .= "\t\n"; + $sToRender .= "\t
\n"; $sToRender .= "\t\n"; $sToRender .= "\t\t\n"; $sToRender .= "\t"; @@ -271,10 +273,10 @@ function renderNonEditableDocumentRouting($oDocument, $sDivName) { $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
\n"; - return renderSectionDiv($sDivName, $sToRender); + return $sToRender; } -function renderEditableLinkedDocuments($oDocument, $sDivName) { +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 " . @@ -292,7 +294,7 @@ function renderEditableLinkedDocuments($oDocument, $sDivName) { $oPatternTableSqlQuery->setTableHeading("Linked documents"); $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - $sToRender .= "\t\n"; + $sToRender .= "\t
\n"; $sToRender .= "\t\n"; $sToRender .= "\t\t\n"; $sToRender .= "\t"; @@ -300,10 +302,10 @@ function renderEditableLinkedDocuments($oDocument, $sDivName) { $sToRender .= "\n"; $sToRender .= "\t"; $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
rootUrl/control.php?action=addDocumentLink&fDocumentID=" . $oDocument->getID() ."\">graphicsUrl/widgets/add.gif\" border=\"0\"/>
\n"; - return renderSectionDiv($sDivName, $sToRender); + return $sToRender; } -function renderNonEditableLinkedDocuments($oDocument, $sDivName) { +function renderNonEditableLinkedDocuments($oDocument) { global $default; $sQuery = "SELECT D.id, D.name " . @@ -321,12 +323,12 @@ function renderNonEditableLinkedDocuments($oDocument, $sDivName) { $oPatternTableSqlQuery->setTableHeading("Linked documents"); $oPatternTableSqlQuery->setDisplayColumnHeadings(true); - $sToRender .= "\t\n"; + $sToRender .= "\t
\n"; $sToRender .= "\t\n"; $sToRender .= "\t\t\n"; $sToRender .= "\t"; $sToRender .= "\t
" . $oPatternTableSqlQuery->render() . "
\n"; - return renderSectionDiv($sDivName, $sToRender); + return $sToRender; } @@ -371,81 +373,103 @@ function displayActionButtons($oDocument, $bEdit) { function renderSectionDiv($sDivName, $sHtml) { global $default; - - if ( $default->browser == "ie" ) { - return ""; + $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79")); + if ($bNN4) { + return ""; } else { - return ""; - } + return ""; + } } -function renderDocumentSection($sHeading) { - return "$sHeading\n"; +function renderDocumentSection($sSectionName, $sHeadingText, $bDisplayLink, $iDocumentID) { + if ($bDisplayLink) { + $sLink = generateControllerLink("viewDocument", "fDocumentID=$iDocumentID&fShowSection=$sSectionName", $sHeadingText); + } else { + $sLink = "$sHeadingText"; + } + return "$sLink\n"; } -function getPage($oDocument, $bEdit, $sHtml = "") { +function getPage($oDocument, $bEdit, $sStatusMessage = "") { global $default; - - if ($sHtml <> "") { - $sToRender .= renderHeading("Document Detail"); - $sToRender .= renderDocumentPath($oDocument, ($sHtml == "")) . "\n\n"; - $sToRender .= $sHtml; - $sToRender .= renderDocumentData($oDocument, $bEdit); - } else { - - if ( $default->browser == "ie" ) { - $sToRender = "
"; - } else { - $sToRender = "
"; - } - $sToRender .= renderHeading("Document Detail"); - $sToRender .= renderDocumentPath($oDocument, ($sHtml == "")) . "\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 .= renderSectionDiv("documentData", renderDocumentData($oDocument, $bEdit)); - $sToRender .= renderDocumentArchiveSettings($oDocument, "archiveSettings", $bEdit); - if ($bEdit) { - $sToRender .= renderEditableDocumentRouting($oDocument, "documentRouting"); - } else { - $sToRender .= renderNonEditableDocumentRouting($oDocument, "documentRouting"); - } - - $sToRender .= renderGenericMetaData($oDocument, "genericMetaData", $bEdit); - if ($bEdit) { - $sToRender .= renderEditableLinkedDocuments($oDocument, "linkedDocuments"); - } else { - $sToRender .= renderNonEditableLinkedDocuments($oDocument, "linkedDocuments", $bEdit); - } - $sToRender .= renderTypeSpecificMetaData($oDocument, "typeSpecificMetaData", $bEdit); - - if ( $default->browser == "ie" ) { - $sToRender .= "
"; - } else { - $sToRender .= "
"; - } - $sToRender .= "\n"; - $sToRender .= displayActionButtons($oDocument, $bEdit); - $sToRender .= "
\n"; - $sToRender .= "
"; - } + + $sToRender = "
"; + $sToRender .= renderHeading("Document Detail"); + $sToRender .= renderDocumentPath($oDocument, true) . "\n\n"; + $sToRender .= ""; + $sToRender .= ""; + $sToRender .= "
"; + $sToRender .= ""; + + // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable + // ie. effectively removes statusMessage on next click + $bDisplayLink = ($sStatusMessage) ? true : false; + $sToRender .= renderDocumentSection("documentData", "Document Data", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("genericMetaData", "Generic Meta Data", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("typeSpecificMetaData", "Type Specific Meta Data", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("archiveSettings", "Archive Settings", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("documentRouting", "Document Routing", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("linkedDocuments", "Linked Documents", $bDisplayLink, $oDocument->getID()); + $sToRender .= "
"; + $sToRender .= "		"; + $sToRender .= "\n"; + $sToRender .= displayActionButtons($oDocument, $bEdit); + $sToRender .= "
\n"; + $sToRender .= "
"; + $sToRender .= "
"; + + // ugly netscape hacks + $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79")); + if (!$bNN4) { + $sToRender .= ""; + } return $sToRender; } +function getStatusPage($oDocument, $sStatusMessage) { + global $default; + + $sToRender .= renderHeading("Document Detail"); + $sToRender .= renderDocumentPath($oDocument, false) . "\n\n"; + $sToRender .= ""; + + // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable + // ie. effectively removes statusMessage on next click + $bDisplayLink = ($sStatusMessage) ? true : false; + + $sToRender .= renderDocumentSection("documentData", "Document Data", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("genericMetaData", "Generic Meta Data", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("typeSpecificMetaData", "Type Specific Meta Data", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("archiveSettings", "Archive Settings", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("documentRouting", "Document Routing", $bDisplayLink, $oDocument->getID()); + $sToRender .= renderDocumentSection("linkedDocuments", "Linked Documents", $bDisplayLink, $oDocument->getID()); + $sToRender .= "
"; + $sToRender .= renderDocumentData($oDocument, false, $sStatusMessage); + return $sToRender; +} function getWebPublishPage($oDocument) { global $default; $oPatternListBox = & new PatternListBox($default->owl_web_sites_table, "web_site_name", "id", "fWebSiteID"); + $sToRender .= renderHeading("Document Detail"); + $sToRender .= renderDocumentPath($oDocument, false) . "\n\n"; + $sToRender .= "\n"; $sToRender .= "\t"; $sToRender .= "\t\t\n"; @@ -476,11 +500,12 @@ function getWebPublishPage($oDocument) { $sToRender .= "return true;\n}\n"; $sToRender .= "//-->\n\n\n"; - return getPage($oDocument, false, $sToRender); + $sToRender .= renderDocumentData($oDocument, $bEdit); + + return $sToRender; } function wrapInTable($sHtml) { return "\n\t\t\t
Choose the website to publish to:
$sHtml
\n"; } - ?> \ No newline at end of file -- libgit2 0.21.4