From fe2a0eea13f46115559ef78ee52002ca8b01f110 Mon Sep 17 00:00:00 2001 From: nbm Date: Wed, 22 Dec 2004 10:32:15 +0000 Subject: [PATCH] Fix some broken HTML in tables, and move checkboxes into their own column. --- presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc index 5cf2344..831dcc6 100644 --- a/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc +++ b/presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc @@ -99,6 +99,7 @@ function renderCategoryResults($aResults) { // loop through categories and display them for ($i=1; $i"; + $sToRender .= " \n"; // for the checkboxes // category name $sToRender .= "" . displayCategoryLink($aResults["categories"][$i]) . ""; @@ -167,17 +168,18 @@ function renderDocumentTypeResults($aResults) { if ($aResults["documentTypes"][0]["name"] == "Document Types") { // loop through document types and display them for ($i=1; $i"; + $sToRender .= "\n"; + $sToRender .= " \n"; // for the checkboxes // document type name - $sToRender .= "" . displayDocumentTypeLink($aResults["documentTypes"][$i]) . ""; + $sToRender .= "" . displayDocumentTypeLink($aResults["documentTypes"][$i]) . "\n"; // blank filename - $sToRender .= " "; + $sToRender .= " \n"; // creator name - $sToRender .= " "; + $sToRender .= " \n"; // modified date - $sToRender .= " "; + $sToRender .= " \n"; // document type - $sToRender .= " "; + $sToRender .= " \n"; $sToRender .= "\n"; } } else { @@ -206,27 +208,27 @@ function renderFolderResults($aResults, $bTemplateBrowsing = false) { $oCreator = User::get($aResults["folders"][$i]->getCreatorID()); // the first element of the array contains the current folder name - $sToRender .= ""; + $sToRender .= "\n"; + $sToRender .= " \n"; // for the checkboxes // folder name - $sToRender .= "" . $sFolderLink . ""; + $sToRender .= "" . $sFolderLink . "\n"; // blank filename (folder description?) - $sToRender .= "" . $aResults["folders"][$i]->getDescription() . ""; + $sToRender .= "" . $aResults["folders"][$i]->getDescription() . "\n"; // creator name - $sToRender .= "" . ($oCreator ? $oCreator->getName() : " ") . ""; + $sToRender .= "" . ($oCreator ? $oCreator->getName() : " ") . "\n"; // modified date (TODO: add to db) - $sToRender .= " "; + $sToRender .= " \n"; // document type (??: display one of the mapped document types? which one?) - $sToRender .= " "; + $sToRender .= " \n"; $sToRender .= "\n"; } } else { $sToRender .= "" . _("This folder contains no sub folders") . ""; } - $sToRender .= "" . renderDocumentList($aResults, _("This folder contains no documents"), + $sToRender .= renderDocumentList($aResults, _("This folder contains no documents"), _("You don't have access to the documents in this folder"), - false, $bTemplateBrowsing) . - "\n"; + false, $bTemplateBrowsing) . "\n"; return $sToRender; } @@ -248,7 +250,8 @@ function renderSortHeadings($sSortBy, $sSortDirection) { // need list of display criteria and sort name $aSortCriteria = $oBrowser->getSortCriteria(); - $sToRender .= ""; + $sToRender .= "\n"; + $sToRender .= " \n"; // For the checkboxes while (list($key, $value) = each ($aSortCriteria)) { $sCurrentSortDirection = "asc"; $displayText = $value["display"]; @@ -268,7 +271,7 @@ function renderSortHeadings($sSortBy, $sSortDirection) { $queryString = "fDocumentTypeID=$fDocumentTypeID"; break; } - $sToRender .= "" . generateLink($_SERVER["PHP_SELF"], "fBrowseType=$fBrowseType&$queryString&fSortBy=$key&fSortDirection=$sCurrentSortDirection", $displayText) . ""; + $sToRender .= "" . generateLink($_SERVER["PHP_SELF"], "fBrowseType=$fBrowseType&$queryString&fSortBy=$key&fSortDirection=$sCurrentSortDirection", $displayText) . "\n"; } $sToRender .= "\n"; @@ -292,11 +295,11 @@ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessa for ($i=0; $i" . - "getID() . "\"/>" . - ($bTemplateBrowsing ? displayDocumentLinkForTemplateBrowsing($aResults["documents"][$i], $bDisplayFullPath) : + $sToRender .= "\n"; + $sToRender .= "" . + "getID() . "\"/>\n"; + $sToRender .= "" . ($bTemplateBrowsing ? displayDocumentLinkForTemplateBrowsing($aResults["documents"][$i], $bDisplayFullPath) : displayDocumentLink($aResults["documents"][$i], $bDisplayFullPath)) . ""; - // #3425 the title is now the filename, and the description is the title $sToRender .= "" . $aResults["documents"][$i]->getName() . ""; $oCreator = User::get($aResults["documents"][$i]->getCreatorID()); @@ -326,9 +329,9 @@ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessa } else if ($aResults["accessDenied"]) { - $sToRender .= "$sNoPermissionMessage"; + $sToRender .= "$sNoPermissionMessage"; } else { - $sToRender .= "$sNoDocumentsMessage"; + $sToRender .= "$sNoDocumentsMessage"; } return $sToRender; } @@ -401,7 +404,7 @@ function renderPage($aResults, $sBrowseType, $sSortBy, $sSortDirection, $bTempla // display folders|documents $sToRender .= "\n"; $sToRender .= renderSortHeadings($sSortBy, $sSortDirection); - $sToRender .= "\n"; + // $sToRender .= "\n"; $sToRender .= "\t
\n"; + // $sToRender .= "
\n"; switch ($sBrowseType) { case "folder": $sToRender .= renderFolderResults($aResults, $bTemplateBrowsing); @@ -413,7 +416,7 @@ function renderPage($aResults, $sBrowseType, $sSortBy, $sSortDirection, $bTempla $sToRender .= renderDocumentTypeResults($aResults); break; } - $sToRender .= "
"; return $sToRender; -- libgit2 0.21.4