Peter M. Groen / knowledgetree

Commit 336f1d0c5df1f7474dd2a5fe4c16a98739ce93b1

Authored by Neil Blakey-Milner
1 parent bd546273

Fix some broken HTML in tables, and move checkboxes into their own column. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3072 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 28 additions and 25 deletions
presentation/lookAndFeel/knowledgeTree/documentmanagement/browseUI.inc
  View file @336f1d0
... ... @@ -99,6 +99,7 @@ function renderCategoryResults($aResults) {
99 99 // loop through categories and display them
100 100 for ($i=1; $i<count($aResults["categories"]); $i++) {
101 101 $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">";
  102 + $sToRender .= "<td>&nbsp;</td>\n"; // for the checkboxes
102 103  
103 104 // category name
104 105 $sToRender .= "<td>" . displayCategoryLink($aResults["categories"][$i]) . "</td>";
... ... @@ -167,17 +168,18 @@ function renderDocumentTypeResults($aResults) {
167 168 if ($aResults["documentTypes"][0]["name"] == "Document Types") {
168 169 // loop through document types and display them
169 170 for ($i=1; $i<count($aResults["documentTypes"]); $i++) {
170   - $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">";
  171 + $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">\n";
  172 + $sToRender .= "<td>&nbsp;</td>\n"; // for the checkboxes
171 173 // document type name
172   - $sToRender .= "<td>" . displayDocumentTypeLink($aResults["documentTypes"][$i]) . "</td>";
  174 + $sToRender .= "<td>" . displayDocumentTypeLink($aResults["documentTypes"][$i]) . "</td>\n";
173 175 // blank filename
174   - $sToRender .= "<td>&nbsp;</td>";
  176 + $sToRender .= "<td>&nbsp;</td>\n";
175 177 // creator name
176   - $sToRender .= "<td>&nbsp;</td>";
  178 + $sToRender .= "<td>&nbsp;</td>\n";
177 179 // modified date
178   - $sToRender .= "<td>&nbsp;</td>";
  180 + $sToRender .= "<td>&nbsp;</td>\n";
179 181 // document type
180   - $sToRender .= "<td>&nbsp;</td>";
  182 + $sToRender .= "<td>&nbsp;</td>\n";
181 183 $sToRender .= "</tr>\n";
182 184 }
183 185 } else {
... ... @@ -206,27 +208,27 @@ function renderFolderResults($aResults, $bTemplateBrowsing = false) {
206 208 $oCreator = User::get($aResults["folders"][$i]->getCreatorID());
207 209  
208 210 // the first element of the array contains the current folder name
209   - $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">";
  211 + $sToRender .= "<tr bgcolor=\"" . getColour($i-1) . "\">\n";
  212 + $sToRender .= "<td width=\"10\">&nbsp;</td>\n"; // for the checkboxes
210 213 // folder name
211   - $sToRender .= "<td valign=\"bottom\">" . $sFolderLink . "</td>";
  214 + $sToRender .= "<td valign=\"bottom\">" . $sFolderLink . "</td>\n";
212 215 // blank filename (folder description?)
213   - $sToRender .= "<td valign=\"bottom\">" . $aResults["folders"][$i]->getDescription() . "</td>";
  216 + $sToRender .= "<td valign=\"bottom\">" . $aResults["folders"][$i]->getDescription() . "</td>\n";
214 217 // creator name
215   - $sToRender .= "<td valign=\"bottom\">" . ($oCreator ? $oCreator->getName() : "&nbsp;") . "</td>";
  218 + $sToRender .= "<td valign=\"bottom\">" . ($oCreator ? $oCreator->getName() : "&nbsp;") . "</td>\n";
216 219 // modified date (TODO: add to db)
217   - $sToRender .= "<td valign=\"bottom\">&nbsp;</td>";
  220 + $sToRender .= "<td valign=\"bottom\">&nbsp;</td>\n";
218 221 // document type (??: display one of the mapped document types? which one?)
219   - $sToRender .= "<td valign=\"bottom\">&nbsp;</td>";
  222 + $sToRender .= "<td valign=\"bottom\">&nbsp;</td>\n";
220 223 $sToRender .= "</tr>\n";
221 224 }
222 225 } else {
223 226 $sToRender .= "<tr><td colspan=\"5\">" . _("This folder contains no sub folders") . "</td></tr>";
224 227 }
225 228  
226   - $sToRender .= "<tr><td>" . renderDocumentList($aResults, _("This folder contains no documents"),
  229 + $sToRender .= renderDocumentList($aResults, _("This folder contains no documents"),
227 230 _("You don't have access to the documents in this folder"),
228   - false, $bTemplateBrowsing) .
229   - "</td></tr>\n";
  231 + false, $bTemplateBrowsing) . "\n";
230 232  
231 233 return $sToRender;
232 234 }
... ... @@ -248,7 +250,8 @@ function renderSortHeadings($sSortBy, $sSortDirection) {
248 250 // need list of display criteria and sort name
249 251 $aSortCriteria = $oBrowser->getSortCriteria();
250 252  
251   - $sToRender .= "<tr bgcolor=\"$sTDBGColour\">";
  253 + $sToRender .= "<tr bgcolor=\"$sTDBGColour\">\n";
  254 + $sToRender .= "<td width=\"10\">&nbsp;</td>\n"; // For the checkboxes
252 255 while (list($key, $value) = each ($aSortCriteria)) {
253 256 $sCurrentSortDirection = "asc";
254 257 $displayText = $value["display"];
... ... @@ -268,7 +271,7 @@ function renderSortHeadings($sSortBy, $sSortDirection) {
268 271 $queryString = "fDocumentTypeID=$fDocumentTypeID";
269 272 break;
270 273 }
271   - $sToRender .= "<td>" . generateLink($_SERVER["PHP_SELF"], "fBrowseType=$fBrowseType&$queryString&fSortBy=$key&fSortDirection=$sCurrentSortDirection", $displayText) . "</td>";
  274 + $sToRender .= "<td>" . generateLink($_SERVER["PHP_SELF"], "fBrowseType=$fBrowseType&$queryString&fSortBy=$key&fSortDirection=$sCurrentSortDirection", $displayText) . "</td>\n";
272 275 }
273 276  
274 277 $sToRender .= "</tr>\n";
... ... @@ -292,11 +295,11 @@ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessa
292 295 for ($i=0; $i<count($aResults["documents"]); $i++) {
293 296 // in order for candy striping to work we need to take the number of folders
294 297 // into account when alternating
295   - $sToRender .= "<tr bgcolor=\"" . getColour($i+$iFolderCount) . "\" width=\"100%\"><td valign=\"bottom\">" .
296   - "<input type=\"checkbox\" name=\"fDocumentIDs[]\" value=\"" . $aResults["documents"][$i]->getID() . "\"/>" .
297   - ($bTemplateBrowsing ? displayDocumentLinkForTemplateBrowsing($aResults["documents"][$i], $bDisplayFullPath) :
  298 + $sToRender .= "<tr bgcolor=\"" . getColour($i+$iFolderCount) . "\" width=\"100%\">\n";
  299 + $sToRender .= "<td valign=\"bottom\" width=\"10\">" .
  300 + "<input type=\"checkbox\" name=\"fDocumentIDs[]\" value=\"" . $aResults["documents"][$i]->getID() . "\"/></td>\n";
  301 + $sToRender .= "<td>" . ($bTemplateBrowsing ? displayDocumentLinkForTemplateBrowsing($aResults["documents"][$i], $bDisplayFullPath) :
298 302 displayDocumentLink($aResults["documents"][$i], $bDisplayFullPath)) . "</td>";
299   -
300 303 // #3425 the title is now the filename, and the description is the title
301 304 $sToRender .= "<td valign=\"bottom\">" . $aResults["documents"][$i]->getName() . "</td>";
302 305 $oCreator = User::get($aResults["documents"][$i]->getCreatorID());
... ... @@ -326,9 +329,9 @@ function renderDocumentList($aResults, $sNoDocumentsMessage, $sNoPermissionMessa
326 329  
327 330  
328 331 } else if ($aResults["accessDenied"]) {
329   - $sToRender .= "<tr><td>$sNoPermissionMessage</td></tr>";
  332 + $sToRender .= "<tr><td colspan=\"5\">$sNoPermissionMessage</td></tr>";
330 333 } else {
331   - $sToRender .= "<tr><td>$sNoDocumentsMessage</td></tr>";
  334 + $sToRender .= "<tr><td colspan=\"5\">$sNoDocumentsMessage</td></tr>";
332 335 }
333 336 return $sToRender;
334 337 }
... ... @@ -401,7 +404,7 @@ function renderPage($aResults, $sBrowseType, $sSortBy, $sSortDirection, $bTempla
401 404 // display folders|documents
402 405 $sToRender .= "<table border=\"0\" width=\"100%\">\n";
403 406 $sToRender .= renderSortHeadings($sSortBy, $sSortDirection);
404   - $sToRender .= "<tr><td>\n";
  407 + // $sToRender .= "<tr><td>\n";
405 408 switch ($sBrowseType) {
406 409 case "folder":
407 410 $sToRender .= renderFolderResults($aResults, $bTemplateBrowsing);
... ... @@ -413,7 +416,7 @@ function renderPage($aResults, $sBrowseType, $sSortBy, $sSortDirection, $bTempla
413 416 $sToRender .= renderDocumentTypeResults($aResults);
414 417 break;
415 418 }
416   - $sToRender .= "</tr></td>\n";
  419 + // $sToRender .= "</tr></td>\n";
417 420 $sToRender .= "\t</table>";
418 421  
419 422 return $sToRender;
... ...