From c9a4da98deb87152df5701c83faa9317edf88211 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Thu, 23 Dec 2004 13:39:07 +0000
Subject: [PATCH] Use the browser columns method to determine table width for table-wide announcements.

---
 presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc
index 8cef6f0..553455c 100644
--- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc
@@ -91,6 +91,7 @@ function displayCategoryLink($sCategoryName) {
  * @param array the category browse results
  */
 function renderCategoryResults($aResults) {    
+    global $oBrowser;
     $sToRender = "";
 
     //var_dump($aResults["categories"][0]);
@@ -119,7 +120,7 @@ function renderCategoryResults($aResults) {
             // else the first entry is the category name, so display the documents in the category
             $sToRender .= renderDocumentList($aResults, _("This category contains no documents"), _("You don't have access to the documents in this category"));
         } else {
-            $sToRender .= "<tr><td colspan=\"5\"><font color=\"red\">" . _("There is no Category Document Field- contact a System Administrator.") . "</font></td></tr>";
+            $sToRender .= "<tr><td colspan=\"" . ($oBrowser->columns() + 1) . "\"><font color=\"red\">" . _("There is no Category Document Field- contact a System Administrator.") . "</font></td></tr>";
         }
     }
     return $sToRender;
@@ -220,7 +221,7 @@ function renderFolderResults($aResults, $bTemplateBrowsing = false) {
             $sToRender .= "</tr>\n";
         }
     } else {
-        $sToRender .= "<tr><td colspan=\"5\">" . _("This folder contains no sub folders") . "</td></tr>";
+        $sToRender .= "<tr><td colspan=\"" . ($oBrowser->columns() + 1) . "\">" . _("This folder contains no sub folders") . "</td></tr>";
     }
 
     $sToRender .= renderDocumentList($aResults, _("This folder contains no documents"),
@@ -327,10 +328,10 @@ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessa
         $sSectionName = $default->siteMap->getSectionName(substr($_SERVER["PHP_SELF"], strlen($default->rootUrl), strlen($_SERVER["PHP_SELF"])));
         $sTDBGColour = $default->siteMap->getSectionColour($sSectionName, "td");
 
-        $sToRender .= "<tr bgcolor=\"". $sTDBGColour . "\"><td colspan=\"5\" valign=\"bottom\">" .
+        $sToRender .= "<tr bgcolor=\"". $sTDBGColour . "\"><td colspan=\"" . ($oBrowser->columns() + 1) . "\" valign=\"bottom\">" .
                       "<input type=\"checkbox\" name=\"selectall\" onClick=\"selectAll()\"/> " . _("Select all documents") . "</td></tr>";
 
-        $sToRender .= "<tr><td colspan=\"5\" >";
+        $sToRender .= "<tr><td colspan=\"" . ($oBrowser->columns() + 1) . "\" >";
         $sToRender .= "<input type=\"hidden\" name=\"fActions\">";
 
         $sToRender .= "<input type=\"image\" onclick=\"document.MainForm.fActions.value='move'; document.MainForm.submit()\" src=\"" . KTHtml::getMoveButton() . "\" border=\"0\"/>";
@@ -340,9 +341,9 @@ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessa
 
 
     } else if ($aResults["accessDenied"]) {
-        $sToRender .= "<tr><td colspan=\"5\">$sNoPermissionMessage</td></tr>";
+        $sToRender .= "<tr><td colspan=\"" . ($oBrowser->columns() + 1) . "\">$sNoPermissionMessage</td></tr>";
     } else {
-        $sToRender .= "<tr><td colspan=\"5\">$sNoDocumentsMessage</td></tr>";
+        $sToRender .= "<tr><td colspan=\"" . ($oBrowser->columns() + 1) . "\">$sNoDocumentsMessage</td></tr>";
     }
     return $sToRender;
 }
--
libgit2 0.21.4