cosmetic changes to test screen

This commit is contained in:
sayrer%gmail.com 2007-01-31 18:25:15 +00:00
parent f4468025ec
commit d7a211a685
2 changed files with 24 additions and 21 deletions

View File

@ -211,6 +211,7 @@ function dirIter(dir)
*/
function list(requestPath, directory, recurse)
{
var count = 0;
var path = requestPath;
if (path.charAt(path.length - 1) != "/") {
path += "/";
@ -222,19 +223,23 @@ function list(requestPath, directory, recurse)
// The SimpleTest directory is hidden
var files = [file for (file in dirIter(dir))
if (file.path.indexOf("SimpleTest") == -1)];
count = files.length;
for each (var file in files) {
var key = requestPath + file.leafName;
var childCount = 0;
if (file.isDirectory()) {
key += "/";
}
if (recurse && file.isDirectory()) {
links[key] = list(key, file, recurse);
[links[key], childCount] = list(key, file, recurse);
count += childCount;
} else {
links[key] = true;
}
}
return links;
return [links, count];
}
/**
@ -319,9 +324,9 @@ function jsonArrayOfTestFiles(links)
*/
function regularListing(metadata, response)
{
var links = list(metadata.path,
metadata.getProperty("directory"),
false);
var [links, count] = list(metadata.path,
metadata.getProperty("directory"),
false);
response.write(
HTML(
HEAD(
@ -342,9 +347,10 @@ function regularListing(metadata, response)
*/
function testListing(metadata, response)
{
var links = list(metadata.path,
metadata.getProperty("directory"),
true);
var [links, count] = list(metadata.path,
metadata.getProperty("directory"),
true);
dumpn("count: " + count);
var tests = jsonArrayOfTestFiles(links);
response.write(
HTML(
@ -397,12 +403,16 @@ function testListing(metadata, response)
A({href: "#", id: "toggleNonTests"}, "Show Non-Tests"),
BR()
),
UL({class: "top"},
LI(B("Test Files")),
linksToListItems(links)
),
TABLE({cellpadding: 0, cellspacing: 0, id: "test-table"},
TR(TH("Passed"), TH("Failed"), TH("Todo")),
TR(TD("Passed"), TD("Failed"), TD("Todo"),
TD({rowspan: count+1},
UL({class: "top"},
LI(B("Test Files")),
linksToListItems(links)
)
)
),
linksToTableRows(links)
),
DIV({class: "clear"})

View File

@ -29,20 +29,13 @@ ul {
}
ul.top {
position: absolute;
left: 11%;
background: #f6f6f6;
width: 86%;
padding: 0;
padding-left: 1em;
}
table#test-table {
position: absolute;
background: #f6f6f6;
left: 0%;
margin-left: 1em;
width: 10%;
padding: 0;
}