genhtml: Display navigation in tables

diff --git a/gw-tests/genhtml/genhtml.py b/gw-tests/genhtml/genhtml.py
index 3dbb4f0bf5dca2b4fc38aa69e4d465fa1d6a4482..b8d231c8b0b4fc8396dd28e4a8c94e5b136d7c64 100755 (executable)
--- a/gw-tests/genhtml/genhtml.py
+++ b/gw-tests/genhtml/genhtml.py
@@ -167,7 +167,7 @@ class Test(object):
 <h1>%s</h1>"""  % (title, cdup, title)
         params = ["%s %s" % (v.dim, v) for v in self.values]
         print >>html, "Results for:", ", ".join(params)
-        print >>html, "<div class='box'><h4>Other results</h4>"
+        print >>html, "<div class='otherview'><h4>Other results</h4><table>"
        for d in self.tests.space:
             links = []
             for v in d:
@@ -178,9 +178,9 @@ class Test(object):
                     vv.replace(v)
                     href = cdup + urllib.quote(self.tests[vv.key()].path+"/results.html")
                     links.append("<a href='%s'>%s</a>"%(href, str(v)))
-            print >>html, "%s: " % d, " | ".join(links), "<br>"
+            print >>html, "<tr><th>%s</th><td>" % d, " | ".join(links), "</td></tr>"
 
-        print >>html, "</div>"
+        print >>html, "</table></div>"
         print >>html, "<div><img src='%s' /></div>" % (self.name+".png")
         print >>html, "<a href='./'>Raw data</a><br />"
         print >>html, "<a href='%s'>Script source</a><br />" % (cdup+self.name+".sh.html")
@@ -276,6 +276,7 @@ table { border-collapse: collapse; }
 th, td { border: 1px solid lightgray; padding: 4px;}
 h4 { margin: 0; }
 .box { border: 1px solid black; padding: 1ex; margin: 1ex 0}
+.otherview { margin: 1ex 0}
 """
         css.close()
         for test in self.values():
@@ -307,14 +308,16 @@ class Page(object):
 <h1>%s</h1>"""  % (title, title)
         params = ["%s %s" % (v.dim, v) for v in self.valsOther]
         print >>html, "<h3>Results for ", ", ".join(params), "</h3>"
-        print >>html, "<div class='box'><h4>Other views</h4>"
+        print >>html, "<div class='otherview'><h4>Other views</h4>"
+        print >>html, "<table><tr>"
        for d in self.dimOther:
-            print >>html, "%s: " % d
-            print >>html, "<a href='%s'>X axis</a>, " % \
+            print >>html, "<th>%s</th>" % d
+            print >>html, "<td><a href='%s'>&rarr;</a> " % \
                 Page((self.dimy, d), self.valsOther - d + self.dimx.getValue(0), self.tests).getName()
-            print >>html, "<a href='%s'>Y axis</a>;&nbsp;&nbsp;" % \
+            print >>html, "<a href='%s'>&darr;</a></td>" % \
                 Page((d, self.dimx), self.valsOther - d + self.dimy.getValue(0), self.tests).getName()
             links = []
+            print >>html, "<td>"
             for v in d:
                 if v in self.valsOther:
                     links.append(str(v))
@@ -323,12 +326,8 @@ class Page(object):
                     vv.replace(v)
                     links.append("<a href='%s'>%s</a>"%(urllib.quote(Page((self.dimy, self.dimx), vv, self.tests).getName()), str(v)))
             print >>html, " | ".join(links)
-            print >>html, "<br>"
-            try:
-                print >>html, d.htmlPreamble()
-            except Exception:
-                pass
-        print >>html, "</div>"
+            print >>html, "</td></tr>"
+        print >>html, "</table></div>"
 
        print >>html, "<table><thead><tr><td>%s &rarr; <br />%s &darr;</td>" % (self.dimx.name, self.dimy.name)
        for x in self.dimx: