--- a/talosnames/templates/index.html	Thu Aug 16 13:49:09 2012 -0700
+++ b/talosnames/templates/index.html	Thu Aug 16 16:00:45 2012 -0700
@@ -191,8 +191,8 @@
           {{if graphserver[suite][test]}}
           <dl>
             {{for name, longname in graphserver[suite][test]}}
-            <dt>{{name}}</dt>
-            <dd>{{longname}}</dd>
+            <dt title="graphserver short name">{{name}}</dt>
+            <dd title="long name as displayed in graphserver">{{longname}}</dd>
             {{endfor}}
           </dl>
           {{endif}}

--- a/talosnames/templates/tbpl.html	Thu Aug 16 13:49:09 2012 -0700
+++ b/talosnames/templates/tbpl.html	Thu Aug 16 16:00:45 2012 -0700
@@ -86,11 +86,41 @@
 html += '<i>(disabled)</i>';
 }
 
-
+// PerfConfigurator command
 html += '<div><tt><b>PerfConfigurator</b>'
 html += ' ' + data.commands[bbsuite[suite]].join(' ');
 html += '</tt></div>'
 
+// talos tests
+var tests = data.tests[bbsuite[suite]];
+if (tests) {
+html += '<table><tr><td>Talos Test Config</td><td>Graphserver Name</td></tr>';
+
+for (var test in tests) {
+html += '<tr><td>' + test + '</td><td>';
+
+var graphserver_names = data.graphserver[bbsuite[suite]][test];
+if (graphserver_names) {
+
+html += '<dl>';
+for (var grindex in graphserver_names) {
+// We only have one for now, but might as well enumerate
+var name = graphserver_names[grindex][0];
+var longname = graphserver_names[grindex][1];
+html += '<dt>' + name + '</dt>';
+html += '<dd>' + longname + '</dd>';
+
+}
+html += '</dl>';
+
+}
+
+html += '</td></tr>';
+}
+
+html += '</table>';
+}
+
 html += '</div>'
 }
 html += '</div>';
@@ -116,6 +146,18 @@
 font-family: monospace;
 }
 
+table, th, td {
+border: 1px solid black;
+}
+
+th {
+font-weight: bold;
+}
+
+table {
+border-collapse: collapse;
+}
+
 #header {
 font-weight: bold;
 width: 20em;