Peter M. Groen / knowledgetree

Commit eaa50460c78314c4ff523895b9f217fe3cf945c6

Authored by michael
1 parent be49054a

(#2670) fixed displaying status message 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2268 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 3 additions and 4 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewBL.php
  View file @eaa5046
@@ -70,7 +70,6 @@ if (checkSession()) { @@ -70,7 +70,6 @@ if (checkSession()) {
70 $sStatusMessage = "You cannot edit a document collaboration step that is completed or currently underway"; 70 $sStatusMessage = "You cannot edit a document collaboration step that is completed or currently underway";
71 $oPatternCustom->setHtml(getStatusPage($oDocument, $sStatusMessage)); 71 $oPatternCustom->setHtml(getStatusPage($oDocument, $sStatusMessage));
72 $main->setDHTMLScrolling(false); 72 $main->setDHTMLScrolling(false);
73 - $main->setFormAction("$default->rootUrl/control.php?action=modifyDocument&fDocumentID=" . $oDocument->getID());  
74 } else if (isset($fBeginCollaboration) && Permission::userHasDocumentWritePermission($fDocumentID)) { 73 } else if (isset($fBeginCollaboration) && Permission::userHasDocumentWritePermission($fDocumentID)) {
75 //begin the collaboration process 74 //begin the collaboration process
76 //first ensure that all steps in the collaboration process are assigned 75 //first ensure that all steps in the collaboration process are assigned
presentation/lookAndFeel/knowledgeTree/documentmanagement/viewUI.inc
  View file @eaa5046
@@ -49,7 +49,7 @@ function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") { @@ -49,7 +49,7 @@ function renderDocumentData($oDocument, $bEditable, $sStatusMessage = "") {
49 49
50 $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) { 51 if ($sStatusMessage) {
52 - $sToRender .= "<tr><td><font color=\"red\">$sStatusMessage</font></td></tr>"; 52 + $sToRender .= "<tr><td>&nbsp;</td></tr><tr><td><font color=\"red\">$sStatusMessage</font></td></tr>";
53 } 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";
@@ -460,7 +460,7 @@ function getStatusPage($oDocument, $sStatusMessage) { @@ -460,7 +460,7 @@ function getStatusPage($oDocument, $sStatusMessage) {
460 $sToRender = "<div id=\"headings\" style=\"position:relative;visibility:visible;top:2px;left:2px;\">"; 460 $sToRender = "<div id=\"headings\" style=\"position:relative;visibility:visible;top:2px;left:2px;\">";
461 $sToRender .= renderHeading("Document Detail"); 461 $sToRender .= renderHeading("Document Detail");
462 $sToRender .= renderDocumentPath($oDocument, false) . "\n\n"; 462 $sToRender .= renderDocumentPath($oDocument, false) . "\n\n";
463 - $sToRender .= "<table border=\"0\" width=\"530\">"; 463 + $sToRender .= "<table border=\"0\" width=\"610\">";
464 464
465 // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable 465 // if we have a status message, then make the section links refresh to viewDocument with the fShowSection variable
466 // ie. effectively removes statusMessage on next click 466 // ie. effectively removes statusMessage on next click
@@ -474,7 +474,7 @@ function getStatusPage($oDocument, $sStatusMessage) { @@ -474,7 +474,7 @@ function getStatusPage($oDocument, $sStatusMessage) {
474 $sToRender .= renderDocumentSection("linkedDocuments", "Linked Documents", $bDisplayLink, $oDocument->getID()); 474 $sToRender .= renderDocumentSection("linkedDocuments", "Linked Documents", $bDisplayLink, $oDocument->getID());
475 $sToRender .= "</table>"; 475 $sToRender .= "</table>";
476 $sToRender .= "</div>"; 476 $sToRender .= "</div>";
477 - $sToRender .= renderSectionDiv("documentData", renderDocumentData($oDocument, false, $sStatusMessage)); 477 + $sToRender .= renderDocumentData($oDocument, false, $sStatusMessage);
478 return $sToRender; 478 return $sToRender;
479 } 479 }
480 480