Peter M. Groen / knowledgetree

Commit a9727a000872d0b3be492347f3687d21fa373fea

Authored by Michael Joseph
1 parent 409b59e6

added status message method, and fixed formatting for multi-line folder paths 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2201 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 115 additions and 90 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @a9727a0
@@ -14,21 +14,20 @@ @@ -14,21 +14,20 @@
14 * @package presentation.lookAndFeel.knowledgeTree.documentmanagement 14 * @package presentation.lookAndFeel.knowledgeTree.documentmanagement
15 */ 15 */
16 16
17 -function renderDocumentPath($oDocument, $bDisplayActions) { 17 +function renderDocumentPath($oDocument, $bDisplayActions = false) {
18 global $default; 18 global $default;
19 $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"]))); 19 $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
20 $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td"); 20 $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
21 if ($bDisplayActions) { 21 if ($bDisplayActions) {
22 $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > "; 22 $sDocumentPath = displayFolderPathLink(Folder::getFolderPathAsArray($oDocument->getFolderID()), Folder::getFolderPathNamesAsArray($oDocument->getFolderID()), "$default->rootUrl/control.php?action=browse") . " > ";
23 - $sDocumentPath .= "<a onClick=\"alert('This will view a copy of the document current in the DMS. Any changes to this file will not be managed in the DMS.'); return true;\" href=\"" . generateControllerUrl("downloadDocument", "fDocumentID=" . $oDocument->getID() . "&fForInlineView=1") . "\">" . $oDocument->getName() . "</a>";  
24 - //$sDocumentPath .= generateControllerLink("viewDocument", "fDocumentID=" . $oDocument->getID() . "&fForInlineView=1", $oDocument->getName()); 23 + $sDocumentPath .= "<a onClick=\"alert('This will view a copy of the current version of this document in the DMS. Any changes to this file will not be managed in the DMS.'); return true;\" href=\"" . generateControllerUrl("downloadDocument", "fDocumentID=" . $oDocument->getID() . "&fForInlineView=1") . "\">" . $oDocument->getName() . "</a>";
25 } else { 24 } else {
26 $sDocumentPath = $oDocument->getDisplayPath(); 25 $sDocumentPath = $oDocument->getDisplayPath();
27 } 26 }
28 - return "<table border=0 cellpadding=\"5\" width=\"610\"><tr bgcolor=\"$sTDBGColour\"><td width=\"87%\">$sDocumentPath</td>" . ($bDisplayActions ? "<td width=\"15%\">Actions</td>" : "") . "</tr></table>\n"; 27 + return "<table border=0 cellpadding=\"0\" width=\"610\"><tr bgcolor=\"$sTDBGColour\"><td width=\"87%\">$sDocumentPath</td>" . ($bDisplayActions ? "<td width=\"15%\" align=\"center\" valign=\"top\">Actions</td>" : "") . "</tr></table>\n";
29 } 28 }
30 29
31 -function renderDocumentData($oDocument, $bEditable) { 30 +function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") {
32 global $default; 31 global $default;
33 $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 " . 32 $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 " .
34 "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_web_documents_table AS WD ON WD.document_id = D.ID " . 33 "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) { @@ -48,7 +47,10 @@ function renderDocumentData($oDocument, $bEditable) {
48 $oPatternListFromQuery->setTableHeading("Document Data"); 47 $oPatternListFromQuery->setTableHeading("Document Data");
49 $oPatternListFromQuery->setTableWidth("400"); 48 $oPatternListFromQuery->setTableWidth("400");
50 49
51 - $sToRender .= "\t<table border=\"0\" width=\"100%\">\n"; 50 + if ($sStatusMessage) {
  51 + $sToRender .= "<font color=\"red\">$sStatusMessage</font>";
  52 + }
  53 + $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
52 $sToRender .= "\t<tr>\n"; 54 $sToRender .= "\t<tr>\n";
53 $sToRender .= "\t\t<td>" . $oPatternListFromQuery->render() . "</td>\n"; 55 $sToRender .= "\t\t<td>" . $oPatternListFromQuery->render() . "</td>\n";
54 $sToRender .= "\t</tr>\n"; 56 $sToRender .= "\t</tr>\n";
@@ -63,7 +65,7 @@ function renderDocumentData($oDocument, $bEditable) { @@ -63,7 +65,7 @@ function renderDocumentData($oDocument, $bEditable) {
63 } 65 }
64 66
65 67
66 -function renderGenericMetaData($oDocument, $sDivName, $bEditable) { 68 +function renderGenericMetaData($oDocument, $bEditable) {
67 global $default; 69 global $default;
68 $sQuery = "SELECT DF.name AS name, DFL.value as value " . 70 $sQuery = "SELECT DF.name AS name, DFL.value as value " .
69 "FROM $default->owl_documents_table AS D INNER JOIN $default->owl_document_fields_table AS DFL ON D.id = DFL.document_id " . 71 "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) { @@ -76,7 +78,7 @@ function renderGenericMetaData($oDocument, $sDivName, $bEditable) {
76 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "500"); 78 $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "500");
77 $oPatternTableSqlQuery->setTableHeading("Generic Meta Data"); 79 $oPatternTableSqlQuery->setTableHeading("Generic Meta Data");
78 80
79 - $sToRender .= "\t<table border=\"0\" width=\"100%\">\n"; 81 + $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
80 $sToRender .= "\t<tr>\n"; 82 $sToRender .= "\t<tr>\n";
81 $sToRender .= "\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n"; 83 $sToRender .= "\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n";
82 $sToRender .= "\t</tr>\n"; 84 $sToRender .= "\t</tr>\n";
@@ -87,10 +89,10 @@ function renderGenericMetaData($oDocument, $sDivName, $bEditable) { @@ -87,10 +89,10 @@ function renderGenericMetaData($oDocument, $sDivName, $bEditable) {
87 } 89 }
88 $sToRender .= "\t</table>\n"; 90 $sToRender .= "\t</table>\n";
89 91
90 - return renderSectionDiv($sDivName, $sToRender); 92 + return $sToRender;
91 } 93 }
92 94
93 -function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) { 95 +function renderTypeSpecificMetaData($oDocument, $bEditable) {
94 global $default; 96 global $default;
95 97
96 $sQuery = "SELECT DF.name AS name, DFL.value AS value " . 98 $sQuery = "SELECT DF.name AS name, DFL.value AS value " .
@@ -103,11 +105,11 @@ function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) { @@ -103,11 +105,11 @@ function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) {
103 $aColumns = array("name", "value"); 105 $aColumns = array("name", "value");
104 $aColumnHeaders = array("Tag", "Value"); 106 $aColumnHeaders = array("Tag", "Value");
105 $aColumnTypes = array(1,1); 107 $aColumnTypes = array(1,1);
106 - $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "540"); 108 + $oPatternTableSqlQuery = & new PatternTableSqlQuery($sQuery, $aColumns, $aColumnTypes, $aColumnHeaders, "500");
107 $oPatternTableSqlQuery->setTableHeading("Type Specific Meta Data"); 109 $oPatternTableSqlQuery->setTableHeading("Type Specific Meta Data");
108 $oPatternTableSqlQuery->setEmptyTableMessage("No Type Specific Meta Data"); 110 $oPatternTableSqlQuery->setEmptyTableMessage("No Type Specific Meta Data");
109 111
110 - $sToRender .= "\t<table border=\"0\" width=\"100%\">\n"; 112 + $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
111 $sToRender .= "\t<tr>\n"; 113 $sToRender .= "\t<tr>\n";
112 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n"; 114 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n";
113 $sToRender .= "\t</tr>\n"; 115 $sToRender .= "\t</tr>\n";
@@ -117,7 +119,7 @@ function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) { @@ -117,7 +119,7 @@ function renderTypeSpecificMetaData($oDocument, $sDivName, $bEditable) {
117 $sToRender .= "\t</tr>\n"; 119 $sToRender .= "\t</tr>\n";
118 } 120 }
119 $sToRender .= "\t</table>\n"; 121 $sToRender .= "\t</table>\n";
120 - return renderSectionDiv($sDivName, $sToRender); 122 + return $sToRender;
121 } 123 }
122 124
123 function renderEditableDocumentArchiveSettings($oDocument) { 125 function renderEditableDocumentArchiveSettings($oDocument) {
@@ -157,10 +159,10 @@ function renderNonEditableDocumentArchiveSettings($oDocument) { @@ -157,10 +159,10 @@ function renderNonEditableDocumentArchiveSettings($oDocument) {
157 return $oPatternTableSqlQuery->render(); 159 return $oPatternTableSqlQuery->render();
158 } 160 }
159 161
160 -function renderDocumentArchiveSettings($oDocument, $sDivName, $bEditable) { 162 +function renderDocumentArchiveSettings($oDocument, $bEditable) {
161 global $default; 163 global $default;
162 164
163 - $sToRender .= "\t<table border=\"0\" width=\"100%\">\n"; 165 + $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
164 $sToRender .= "\t<tr>\n"; 166 $sToRender .= "\t<tr>\n";
165 $sToRender .= "\t\t<td>" . ($bEditable ? renderEditableDocumentArchiveSettings($oDocument) : renderNonEditableDocumentArchiveSettings($oDocument)) . "</td>\n"; 167 $sToRender .= "\t\t<td>" . ($bEditable ? renderEditableDocumentArchiveSettings($oDocument) : renderNonEditableDocumentArchiveSettings($oDocument)) . "</td>\n";
166 $sToRender .= "\t</tr>"; 168 $sToRender .= "\t</tr>";
@@ -173,10 +175,10 @@ function renderDocumentArchiveSettings($oDocument, $sDivName, $bEditable) { @@ -173,10 +175,10 @@ function renderDocumentArchiveSettings($oDocument, $sDivName, $bEditable) {
173 } 175 }
174 $sToRender .= "\t</table>\n"; 176 $sToRender .= "\t</table>\n";
175 177
176 - return renderSectionDiv($sDivName, $sToRender); 178 + return $sToRender;
177 } 179 }
178 180
179 -function renderEditableDocumentRouting($oDocument, $sDivName) { 181 +function renderEditableDocumentRouting($oDocument) {
180 global $default; 182 global $default;
181 $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 " . 183 $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 " .
182 "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . 184 "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) { @@ -196,7 +198,7 @@ function renderEditableDocumentRouting($oDocument, $sDivName) {
196 $oPatternTableSqlQuery->setTableHeading("Document Routing"); 198 $oPatternTableSqlQuery->setTableHeading("Document Routing");
197 $oPatternTableSqlQuery->setDisplayColumnHeadings(true); 199 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
198 200
199 - $sToRender .= "\t<table border=\"0\" width=\"100%\">\n"; 201 + $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
200 $sToRender .= "\t<tr>\n"; 202 $sToRender .= "\t<tr>\n";
201 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n"; 203 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n";
202 $sToRender .= "\t</tr>"; 204 $sToRender .= "\t</tr>";
@@ -235,10 +237,10 @@ function renderEditableDocumentRouting($oDocument, $sDivName) { @@ -235,10 +237,10 @@ function renderEditableDocumentRouting($oDocument, $sDivName) {
235 $sToRender .= "\t</tr>"; 237 $sToRender .= "\t</tr>";
236 $sToRender .= "\t</table>\n"; 238 $sToRender .= "\t</table>\n";
237 239
238 - return renderSectionDiv($sDivName, $sToRender); 240 + return $sToRender;
239 } 241 }
240 242
241 -function renderNonEditableDocumentRouting($oDocument, $sDivName) { 243 +function renderNonEditableDocumentRouting($oDocument) {
242 global $default; 244 global $default;
243 $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 " . 245 $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 " .
244 "FROM documents AS D INNER JOIN $default->owl_groups_folders_approval_table AS GFAL ON D.folder_id = GFAL.folder_id " . 246 "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) { @@ -255,7 +257,7 @@ function renderNonEditableDocumentRouting($oDocument, $sDivName) {
255 $oPatternTableSqlQuery->setTableHeading("Document Routing"); 257 $oPatternTableSqlQuery->setTableHeading("Document Routing");
256 $oPatternTableSqlQuery->setDisplayColumnHeadings(true); 258 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
257 259
258 - $sToRender .= "\t<table border=\"0\" width=\"100%\">\n"; 260 + $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
259 $sToRender .= "\t<tr>\n"; 261 $sToRender .= "\t<tr>\n";
260 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n"; 262 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n";
261 $sToRender .= "\t</tr>"; 263 $sToRender .= "\t</tr>";
@@ -271,10 +273,10 @@ function renderNonEditableDocumentRouting($oDocument, $sDivName) { @@ -271,10 +273,10 @@ function renderNonEditableDocumentRouting($oDocument, $sDivName) {
271 273
272 $sToRender .= "\t</table>\n"; 274 $sToRender .= "\t</table>\n";
273 275
274 - return renderSectionDiv($sDivName, $sToRender); 276 + return $sToRender;
275 } 277 }
276 278
277 -function renderEditableLinkedDocuments($oDocument, $sDivName) { 279 +function renderEditableLinkedDocuments($oDocument) {
278 global $default; 280 global $default;
279 281
280 $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 " . 282 $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) { @@ -292,7 +294,7 @@ function renderEditableLinkedDocuments($oDocument, $sDivName) {
292 $oPatternTableSqlQuery->setTableHeading("Linked documents"); 294 $oPatternTableSqlQuery->setTableHeading("Linked documents");
293 $oPatternTableSqlQuery->setDisplayColumnHeadings(true); 295 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
294 296
295 - $sToRender .= "\t<table border=\"0\" width=\"100%\">\n"; 297 + $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
296 $sToRender .= "\t<tr>\n"; 298 $sToRender .= "\t<tr>\n";
297 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n"; 299 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n";
298 $sToRender .= "\t</tr>"; 300 $sToRender .= "\t</tr>";
@@ -300,10 +302,10 @@ function renderEditableLinkedDocuments($oDocument, $sDivName) { @@ -300,10 +302,10 @@ function renderEditableLinkedDocuments($oDocument, $sDivName) {
300 $sToRender .= "<td><a href=\"$default->rootUrl/control.php?action=addDocumentLink&fDocumentID=" . $oDocument->getID() ."\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"/></a></td>\n"; 302 $sToRender .= "<td><a href=\"$default->rootUrl/control.php?action=addDocumentLink&fDocumentID=" . $oDocument->getID() ."\"><img src=\"$default->graphicsUrl/widgets/add.gif\" border=\"0\"/></a></td>\n";
301 $sToRender .= "\t</tr>"; 303 $sToRender .= "\t</tr>";
302 $sToRender .= "\t</table>\n"; 304 $sToRender .= "\t</table>\n";
303 - return renderSectionDiv($sDivName, $sToRender); 305 + return $sToRender;
304 } 306 }
305 307
306 -function renderNonEditableLinkedDocuments($oDocument, $sDivName) { 308 +function renderNonEditableLinkedDocuments($oDocument) {
307 global $default; 309 global $default;
308 310
309 $sQuery = "SELECT D.id, D.name " . 311 $sQuery = "SELECT D.id, D.name " .
@@ -321,12 +323,12 @@ function renderNonEditableLinkedDocuments($oDocument, $sDivName) { @@ -321,12 +323,12 @@ function renderNonEditableLinkedDocuments($oDocument, $sDivName) {
321 $oPatternTableSqlQuery->setTableHeading("Linked documents"); 323 $oPatternTableSqlQuery->setTableHeading("Linked documents");
322 $oPatternTableSqlQuery->setDisplayColumnHeadings(true); 324 $oPatternTableSqlQuery->setDisplayColumnHeadings(true);
323 325
324 - $sToRender .= "\t<table border=\"0\" width=\"100%\">\n"; 326 + $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
325 $sToRender .= "\t<tr>\n"; 327 $sToRender .= "\t<tr>\n";
326 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n"; 328 $sToRender .= "\t\t<td>" . $oPatternTableSqlQuery->render() . "</td>\n";
327 $sToRender .= "\t</tr>"; 329 $sToRender .= "\t</tr>";
328 $sToRender .= "\t</table>\n"; 330 $sToRender .= "\t</table>\n";
329 - return renderSectionDiv($sDivName, $sToRender); 331 + return $sToRender;
330 } 332 }
331 333
332 334
@@ -371,81 +373,103 @@ function displayActionButtons($oDocument, $bEdit) { @@ -371,81 +373,103 @@ function displayActionButtons($oDocument, $bEdit) {
371 373
372 function renderSectionDiv($sDivName, $sHtml) { 374 function renderSectionDiv($sDivName, $sHtml) {
373 global $default; 375 global $default;
374 -  
375 - if ( $default->browser == "ie" ) {  
376 - return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;top:280px;left:135px;\">$sHtml</div>"; 376 + $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79"));
  377 + if ($bNN4) {
  378 + return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;left:135px;\">$sHtml</div>";
377 } else { 379 } else {
378 - return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;top:260px;left:133px;\">$sHtml</div>";  
379 - } 380 + return "<div id=\"$sDivName\" style=\"position:absolute;visibility:hidden;left:5px;\">$sHtml</div>";
  381 + }
380 } 382 }
381 383
382 -function renderDocumentSection($sHeading) {  
383 - return "<tr bgcolor=\"" . getColour($iColour) . "\"><td width=\"100%\">$sHeading</td></tr>\n"; 384 +function renderDocumentSection($sSectionName, $sHeadingText, $bDisplayLink, $iDocumentID) {
  385 + if ($bDisplayLink) {
  386 + $sLink = generateControllerLink("viewDocument", "fDocumentID=$iDocumentID&fShowSection=$sSectionName", $sHeadingText);
  387 + } else {
  388 + $sLink = "<a href=\"javascript:void();\" onClick=\"switchDiv('$sSectionName', 'document');\">$sHeadingText</a>";
  389 + }
  390 + return "<tr bgcolor=\"" . getColour($iColour) . "\"><td width=\"100%\">$sLink</td></tr>\n";
384 } 391 }
385 392
386 -function getPage($oDocument, $bEdit, $sHtml = "") { 393 +function getPage($oDocument, $bEdit, $sStatusMessage = "") {
387 global $default; 394 global $default;
388 -  
389 - if ($sHtml <> "") {  
390 - $sToRender .= renderHeading("Document Detail");  
391 - $sToRender .= renderDocumentPath($oDocument, ($sHtml == "")) . "\n\n";  
392 - $sToRender .= $sHtml;  
393 - $sToRender .= renderDocumentData($oDocument, $bEdit);  
394 - } else {  
395 -  
396 - if ( $default->browser == "ie" ) {  
397 - $sToRender = "<div id=\"headings\" style=\"position:absolute;visibility:visible;top:120px;left:134px;\">";  
398 - } else {  
399 - $sToRender = "<div id=\"headings\" style=\"position:absolute;visibility:visible;top:106px;left:134px;\">";  
400 - }  
401 - $sToRender .= renderHeading("Document Detail");  
402 - $sToRender .= renderDocumentPath($oDocument, ($sHtml == "")) . "\n\n";  
403 -  
404 - $sToRender .= "<table border=\"0\" width=\"530\">";  
405 - $sToRender .= renderDocumentSection("<a href=\"javascript:void();\" onClick=\"switchDiv('documentData', 'document');\">Document Data</a>");  
406 - $sToRender .= renderDocumentSection("<a href=\"javascript:void();\" onClick=\"switchDiv('genericMetaData', 'document');\">Generic Meta Data</a>");  
407 - $sToRender .= renderDocumentSection("<a href=\"javascript:void();\" onClick=\"switchDiv('typeSpecificMetaData', 'document');\">Type Specific Meta Data</a>");  
408 - $sToRender .= renderDocumentSection("<a href=\"javascript:void();\" onClick=\"switchDiv('archiveSettings', 'document');\">Archive Settings</a>");  
409 - $sToRender .= renderDocumentSection("<a href=\"javascript:void();\" onClick=\"switchDiv('documentRouting', 'document');\">Document Routing</a>");  
410 - $sToRender .= renderDocumentSection("<a href=\"javascript:void();\" onClick=\"switchDiv('linkedDocuments', 'document');\">Linked Documents</a>");  
411 - $sToRender .= "</table>";  
412 - $sToRender .= "</div>";  
413 -  
414 - $sToRender .= renderSectionDiv("documentData", renderDocumentData($oDocument, $bEdit));  
415 - $sToRender .= renderDocumentArchiveSettings($oDocument, "archiveSettings", $bEdit);  
416 - if ($bEdit) {  
417 - $sToRender .= renderEditableDocumentRouting($oDocument, "documentRouting");  
418 - } else {  
419 - $sToRender .= renderNonEditableDocumentRouting($oDocument, "documentRouting");  
420 - }  
421 -  
422 - $sToRender .= renderGenericMetaData($oDocument, "genericMetaData", $bEdit);  
423 - if ($bEdit) {  
424 - $sToRender .= renderEditableLinkedDocuments($oDocument, "linkedDocuments");  
425 - } else {  
426 - $sToRender .= renderNonEditableLinkedDocuments($oDocument, "linkedDocuments", $bEdit);  
427 - }  
428 - $sToRender .= renderTypeSpecificMetaData($oDocument, "typeSpecificMetaData", $bEdit);  
429 -  
430 - if ( $default->browser == "ie" ) {  
431 - $sToRender .= "<div id=\"actionButtons\" style=\"position:absolute;visibility:visible;top:170px;left:665px;\">";  
432 - } else {  
433 - $sToRender .= "<div id=\"actionButtons\" style=\"position:absolute;visibility:visible;top:155px;left:665px;\">";  
434 - }  
435 - $sToRender .= "<table cellspacing=\"0\" cellpadding=\"0\">\n";  
436 - $sToRender .= displayActionButtons($oDocument, $bEdit);  
437 - $sToRender .= "</table>\n";  
438 - $sToRender .= "</div>";  
439 - } 395 +
  396 + $sToRender = "<div id=\"headings\" style=\"position:relative;visibility:visible;top:2px;left:2px;\">";
  397 + $sToRender .= renderHeading("Document Detail");
  398 + $sToRender .= renderDocumentPath($oDocument, true) . "\n\n";
  399 + $sToRender .= "<table cellspacing=\"0\" cellpadding=\"0\" id=\"headingTable\">";
  400 + $sToRender .= "<tr><td valign=\"top\">";
  401 + $sToRender .= "<table border=\"0\" width=\"530\">";
  402 +
  403 + // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable
  404 + // ie. effectively removes statusMessage on next click
  405 + $bDisplayLink = ($sStatusMessage) ? true : false;
440 406
  407 + $sToRender .= renderDocumentSection("documentData", "Document Data", $bDisplayLink, $oDocument->getID());
  408 + $sToRender .= renderDocumentSection("genericMetaData", "Generic Meta Data", $bDisplayLink, $oDocument->getID());
  409 + $sToRender .= renderDocumentSection("typeSpecificMetaData", "Type Specific Meta Data", $bDisplayLink, $oDocument->getID());
  410 + $sToRender .= renderDocumentSection("archiveSettings", "Archive Settings", $bDisplayLink, $oDocument->getID());
  411 + $sToRender .= renderDocumentSection("documentRouting", "Document Routing", $bDisplayLink, $oDocument->getID());
  412 + $sToRender .= renderDocumentSection("linkedDocuments", "Linked Documents", $bDisplayLink, $oDocument->getID());
  413 + $sToRender .= "</table>";
  414 + $sToRender .= "</td><td>";
  415 + $sToRender .= "<table cellspacing=\"0\" cellpadding=\"0\">\n";
  416 + $sToRender .= displayActionButtons($oDocument, $bEdit);
  417 + $sToRender .= "</table>\n";
  418 + $sToRender .= "</td></tr>";
  419 + $sToRender .= "</table>";
  420 + $sToRender .= "</div>";
  421 +
  422 + // ugly netscape hacks
  423 + $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79"));
  424 + if (!$bNN4) {
  425 + $sToRender .= "<div id=\"contentDiv\" style=\"position:relative;visibility:hidden;top:-8px;\">";
  426 + }
  427 + $sToRender .= renderSectionDiv("documentData", renderDocumentData($oDocument, $bEdit, $sStatusMessage));
  428 + $sToRender .= renderSectionDiv("genericMetaData", renderGenericMetaData($oDocument, $bEdit));
  429 + $sToRender .= renderSectionDiv("typeSpecificMetaData", renderTypeSpecificMetaData($oDocument, $bEdit));
  430 + $sToRender .= renderSectionDiv("archiveSettings", renderDocumentArchiveSettings($oDocument, $bEdit));
  431 + if ($bEdit) {
  432 + $sToRender .= renderSectionDiv("documentRouting", renderEditableDocumentRouting($oDocument));
  433 + $sToRender .= renderSectionDiv("linkedDocuments", renderEditableLinkedDocuments($oDocument));
  434 + } else {
  435 + $sToRender .= renderSectionDiv("documentRouting", renderNonEditableDocumentRouting($oDocument));
  436 + $sToRender .= renderSectionDiv("linkedDocuments", renderNonEditableLinkedDocuments($oDocument, $bEdit));
  437 + }
  438 + if (!$bNN4) {
  439 + $sToRender .= "</div>";
  440 + }
441 return $sToRender; 441 return $sToRender;
442 } 442 }
  443 +function getStatusPage($oDocument, $sStatusMessage) {
  444 + global $default;
  445 +
  446 + $sToRender .= renderHeading("Document Detail");
  447 + $sToRender .= renderDocumentPath($oDocument, false) . "\n\n";
  448 + $sToRender .= "<table cellspacing=\"0\" cellpadding=\"0\">";
  449 +
  450 + // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable
  451 + // ie. effectively removes statusMessage on next click
  452 + $bDisplayLink = ($sStatusMessage) ? true : false;
  453 +
  454 + $sToRender .= renderDocumentSection("documentData", "Document Data", $bDisplayLink, $oDocument->getID());
  455 + $sToRender .= renderDocumentSection("genericMetaData", "Generic Meta Data", $bDisplayLink, $oDocument->getID());
  456 + $sToRender .= renderDocumentSection("typeSpecificMetaData", "Type Specific Meta Data", $bDisplayLink, $oDocument->getID());
  457 + $sToRender .= renderDocumentSection("archiveSettings", "Archive Settings", $bDisplayLink, $oDocument->getID());
  458 + $sToRender .= renderDocumentSection("documentRouting", "Document Routing", $bDisplayLink, $oDocument->getID());
  459 + $sToRender .= renderDocumentSection("linkedDocuments", "Linked Documents", $bDisplayLink, $oDocument->getID());
  460 + $sToRender .= "</table>";
  461 + $sToRender .= renderDocumentData($oDocument, false, $sStatusMessage);
  462 + return $sToRender;
  463 +}
443 464
444 function getWebPublishPage($oDocument) { 465 function getWebPublishPage($oDocument) {
445 global $default; 466 global $default;
446 467
447 $oPatternListBox = & new PatternListBox($default->owl_web_sites_table, "web_site_name", "id", "fWebSiteID"); 468 $oPatternListBox = & new PatternListBox($default->owl_web_sites_table, "web_site_name", "id", "fWebSiteID");
448 469
  470 + $sToRender .= renderHeading("Document Detail");
  471 + $sToRender .= renderDocumentPath($oDocument, false) . "\n\n";
  472 +
449 $sToRender .= "<table>\n"; 473 $sToRender .= "<table>\n";
450 $sToRender .= "\t<tr>"; 474 $sToRender .= "\t<tr>";
451 $sToRender .= "\t\t<th align=\"left\">Choose the website to publish to:</th>\n"; 475 $sToRender .= "\t\t<th align=\"left\">Choose the website to publish to:</th>\n";
@@ -476,11 +500,12 @@ function getWebPublishPage($oDocument) { @@ -476,11 +500,12 @@ function getWebPublishPage($oDocument) {
476 $sToRender .= "return true;\n}\n"; 500 $sToRender .= "return true;\n}\n";
477 $sToRender .= "//-->\n</script>\n\n"; 501 $sToRender .= "//-->\n</script>\n\n";
478 502
479 - return getPage($oDocument, false, $sToRender); 503 + $sToRender .= renderDocumentData($oDocument, $bEdit);
  504 +
  505 + return $sToRender;
480 } 506 }
481 507
482 function wrapInTable($sHtml) { 508 function wrapInTable($sHtml) {
483 return "\n\t\t\t<table border = 1, width = 100%><tr><td>$sHtml</td></tr></table>\n"; 509 return "\n\t\t\t<table border = 1, width = 100%><tr><td>$sHtml</td></tr></table>\n";
484 } 510 }
485 -  
486 ?> 511 ?>
487 \ No newline at end of file 512 \ No newline at end of file