From 4e91c5b76a4ee9a51f0b76b90c6ee636dc14bd8e Mon Sep 17 00:00:00 2001
From: Michael Joseph <michael@knowledgetree.com>
Date: Mon, 4 Aug 2003 14:44:43 +0000
Subject: [PATCH] (#2832) moved checked out user details to confirmation page

---
 presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc | 10 +++++-----
 presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php   |  8 +++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
index 03744f5..35f1508 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
@@ -21,17 +21,17 @@ function getEditCheckoutPage($fDocumentID){
 	global $default;
 	
 	$oDocument = Document::get($fDocumentID);
+	$oUser = User::get($oDocument->getCheckedOutUserID());
 	$sToRender .= renderHeading("Edit Document Checkout");	
 	$sToRender .= "<table>\n";
-	$sToRender .= "<tr><td>Are you sure you want to Check In this document:</tr></td>";
-	$sToRender .= "<tr><td><b>" . $oDocument->getDisplayPath() . "</b></td></tr>"; 
+	$sToRender .= "<tr><td colspan=\"2\">Are you sure you want to Check In this document:</tr></td>";
+	$sToRender .= "<tr><td width=\"20%\">Path</td><td><b>" . $oDocument->getDisplayPath() . "</b></td></tr>";
+	 $sToRender .= "<tr><td>Checked Out By</td><td><b>" . $oUser->getName() . "</b></td></tr>";
  	$sToRender .= "<input type=\"hidden\" name=\"fUpdate\" value=\"1\">\n";
  	$sToRender .= "<input type=\"hidden\" name=\"fDocumentID\" value=\"$fDocumentID\">\n";
 	$sToRender .= "<tr>\n";
-	$sToRender .= "<td align=right>\n";	
+	$sToRender .= "<td colspan=\"2\" align=right>\n";	
 	$sToRender .= getUpdateButton();	
-	$sToRender .= "</td>\n";
-	$sToRender .= "<td >\n";	
 	$sToRender .= getCancelButton();	
 	$sToRender .= "</td>\n";
 	$sToRender .= "</tr>\n";
diff --git a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
index daf397c..e23098c 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
@@ -20,14 +20,12 @@ if (checkSession()) {
 	$oPatternCustom = & new PatternCustom();
 	$aDocuments = Document::getList("is_checked_out = 1");
 	$sToRender .= renderHeading("Checked out Documents");	
-	$sToRender .= "<table><tr><th width=\"80\">Document</th><th>Checked Out By</th><th>&nbsp;</th>";
+	$sToRender .= "<table><tr><th width=\"80%\">Document</th><th>&nbsp;</th>";
 	if (count($aDocuments) > 0) {
 		for ($i=0; $i<count($aDocuments); $i++) {
 			if ($aDocuments[$i]) {
-				$oUser = User::get($aDocuments[$i]->getCheckedOutUserID());
-				$sToRender .= "<tr><td>" . $aDocuments[$i]->getDisplayPath() . "</td>";
-				$sToRender .= "<td>" . $oUser->getName() . "</td>";
-				$sToRender .= "<td>" . generateControllerLink("editDocCheckout", "fDocumentID=" . $aDocuments[$i]->getID(), "Check In") . "</td>"; 
+				$sToRender .= "<tr><td width=\"80%\">" . $aDocuments[$i]->getDisplayPath() . "</td>";
+				$sToRender .= "<td align=\"right\">" . generateControllerLink("editDocCheckout", "fDocumentID=" . $aDocuments[$i]->getID(), "Check In") . "</td>"; 
 			}
 		}
 	}  else {
--
libgit2 0.21.4