Commit d7892c7698b3644fd2af2702c76d0a7755f2bed5
1 parent
909f9d2c
fixed alignment bug
other layout tweaks git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2227 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
10 additions
and
7 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
| @@ -24,7 +24,7 @@ function renderDocumentPath($oDocument, $bDisplayActions = false) { | @@ -24,7 +24,7 @@ function renderDocumentPath($oDocument, $bDisplayActions = false) { | ||
| 24 | } else { | 24 | } else { |
| 25 | $sDocumentPath = $oDocument->getDisplayPath(); | 25 | $sDocumentPath = $oDocument->getDisplayPath(); |
| 26 | } | 26 | } |
| 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"; | 27 | + return "<table border=\"0\" cellpadding=\"5\" width=\"610\"><tr bgcolor=\"$sTDBGColour\"><td width=\"87%\">$sDocumentPath</td>" . ($bDisplayActions ? "<td width=\"15%\" align=\"center\" valign=\"middle\"><strong>Actions</strong></td>" : "") . "</tr></table>\n"; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") { | 30 | function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") { |
| @@ -47,10 +47,10 @@ function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") { | @@ -47,10 +47,10 @@ function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") { | ||
| 47 | $oPatternListFromQuery->setTableHeading("Document Data"); | 47 | $oPatternListFromQuery->setTableHeading("Document Data"); |
| 48 | $oPatternListFromQuery->setTableWidth("400"); | 48 | $oPatternListFromQuery->setTableWidth("400"); |
| 49 | 49 | ||
| 50 | - if ($sStatusMessage) { | ||
| 51 | - $sToRender .= "<font color=\"red\">$sStatusMessage</font>"; | ||
| 52 | - } | ||
| 53 | $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n"; | 50 | $sToRender .= "\t<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n"; |
| 51 | + if ($sStatusMessage) { | ||
| 52 | + $sToRender .= "<tr><td><font color=\"red\">$sStatusMessage</font></td></tr>"; | ||
| 53 | + } | ||
| 54 | $sToRender .= "\t<tr>\n"; | 54 | $sToRender .= "\t<tr>\n"; |
| 55 | $sToRender .= "\t\t<td>" . $oPatternListFromQuery->render() . "</td>\n"; | 55 | $sToRender .= "\t\t<td>" . $oPatternListFromQuery->render() . "</td>\n"; |
| 56 | $sToRender .= "\t</tr>\n"; | 56 | $sToRender .= "\t</tr>\n"; |
| @@ -422,7 +422,7 @@ function getPage($oDocument, $bEdit, $sStatusMessage = "") { | @@ -422,7 +422,7 @@ function getPage($oDocument, $bEdit, $sStatusMessage = "") { | ||
| 422 | // ugly netscape hacks | 422 | // ugly netscape hacks |
| 423 | $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79")); | 423 | $bNN4 = (($default->browser == "moz") && ($default->version <= "4.79")); |
| 424 | if (!$bNN4) { | 424 | if (!$bNN4) { |
| 425 | - $sToRender .= "<div id=\"contentDiv\" style=\"position:relative;visibility:hidden;top:-8px;\">"; | 425 | + $sToRender .= "<div id=\"contentDiv\" style=\"position:relative;visibility:hidden;top:-80px;width:500px;\">"; |
| 426 | } | 426 | } |
| 427 | $sToRender .= renderSectionDiv("documentData", renderDocumentData($oDocument, $bEdit, $sStatusMessage)); | 427 | $sToRender .= renderSectionDiv("documentData", renderDocumentData($oDocument, $bEdit, $sStatusMessage)); |
| 428 | $sToRender .= renderSectionDiv("genericMetaData", renderGenericMetaData($oDocument, $bEdit)); | 428 | $sToRender .= renderSectionDiv("genericMetaData", renderGenericMetaData($oDocument, $bEdit)); |
| @@ -440,12 +440,14 @@ function getPage($oDocument, $bEdit, $sStatusMessage = "") { | @@ -440,12 +440,14 @@ function getPage($oDocument, $bEdit, $sStatusMessage = "") { | ||
| 440 | } | 440 | } |
| 441 | return $sToRender; | 441 | return $sToRender; |
| 442 | } | 442 | } |
| 443 | + | ||
| 443 | function getStatusPage($oDocument, $sStatusMessage) { | 444 | function getStatusPage($oDocument, $sStatusMessage) { |
| 444 | global $default; | 445 | global $default; |
| 445 | 446 | ||
| 447 | + $sToRender = "<div id=\"headings\" style=\"position:relative;visibility:visible;top:2px;left:2px;\">"; | ||
| 446 | $sToRender .= renderHeading("Document Detail"); | 448 | $sToRender .= renderHeading("Document Detail"); |
| 447 | $sToRender .= renderDocumentPath($oDocument, false) . "\n\n"; | 449 | $sToRender .= renderDocumentPath($oDocument, false) . "\n\n"; |
| 448 | - $sToRender .= "<table cellspacing=\"0\" cellpadding=\"0\">"; | 450 | + $sToRender .= "<table border=\"0\" width=\"530\">"; |
| 449 | 451 | ||
| 450 | // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable | 452 | // 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 | 453 | // ie. effectively removes statusMessage on next click |
| @@ -458,7 +460,8 @@ function getStatusPage($oDocument, $sStatusMessage) { | @@ -458,7 +460,8 @@ function getStatusPage($oDocument, $sStatusMessage) { | ||
| 458 | $sToRender .= renderDocumentSection("documentRouting", "Document Routing", $bDisplayLink, $oDocument->getID()); | 460 | $sToRender .= renderDocumentSection("documentRouting", "Document Routing", $bDisplayLink, $oDocument->getID()); |
| 459 | $sToRender .= renderDocumentSection("linkedDocuments", "Linked Documents", $bDisplayLink, $oDocument->getID()); | 461 | $sToRender .= renderDocumentSection("linkedDocuments", "Linked Documents", $bDisplayLink, $oDocument->getID()); |
| 460 | $sToRender .= "</table>"; | 462 | $sToRender .= "</table>"; |
| 461 | - $sToRender .= renderDocumentData($oDocument, false, $sStatusMessage); | 463 | + $sToRender .= "</div>"; |
| 464 | + $sToRender .= renderSectionDiv("documentData", renderDocumentData($oDocument, false, $sStatusMessage)); | ||
| 462 | return $sToRender; | 465 | return $sToRender; |
| 463 | } | 466 | } |
| 464 | 467 |