[llvm-commits] [zorg] r101760 - /zorg/trunk/lnt/lnt/viewer/NTStyleBrowser.ptl

[Daniel Dunbar]

Author: ddunbar
Date: Sun Apr 18 22:59:50 2010
New Revision: 101760

URL: http://llvm.org/viewvc/llvm-project?rev=101760&view=rev
Log:
LNT/nt viewer: Put machine and run info inside popups.

Modified:
    zorg/trunk/lnt/lnt/viewer/NTStyleBrowser.ptl

Modified: zorg/trunk/lnt/lnt/viewer/NTStyleBrowser.ptl
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/lnt/lnt/viewer/NTStyleBrowser.ptl?rev=101760&r1=101759&r2=101760&view=diff
==============================================================================
--- zorg/trunk/lnt/lnt/viewer/NTStyleBrowser.ptl (original)
+++ zorg/trunk/lnt/lnt/viewer/NTStyleBrowser.ptl Sun Apr 18 22:59:50 2010
@@ -243,11 +243,13 @@
                 <td> <b>Machine ID</b> </td>
                 <td> %d </td>
               </tr>
-              </table>
-              <p>
-              <table border=1>
-        """ %  (machine.name, machine.id)
-        for mi in machine.info.values():
+              </table>""" %  (machine.name, machine.id)
+        self.renderPopupBegin('machine_info', 'Machine Info', True)
+        """
+              <table border=1>"""
+        info = machine.info.values()
+        info.sort(key = lambda i: i.key)
+        for mi in info:
             """
               <tr>
                 <td> <b>%s</b> </td>
@@ -255,11 +257,15 @@
               </tr>
             """ % (mi.key, mi.value)
         """
-              </table>
-              <p>
-              <table border=1>
+              </table>"""
+        self.renderPopupEnd()
+
+        self.renderPopupBegin('run_info', 'Run Info', True)
         """
-        for ri in run.info.values():
+              <table border=1>"""
+        info = run.info.values()
+        info.sort(key = lambda i: i.key)
+        for ri in info:
             """
               <tr>
                 <td> <b>%s</b> </td>
@@ -267,8 +273,8 @@
               </tr>
             """ % (ri.key, ri.value)
         """
-              </table>
-        """
+              </table>"""
+        self.renderPopupEnd()
 
         if allResults:
             """<h4><a href="?full=">See Brief Test Results</a></h4>"""
@@ -415,7 +421,9 @@
         self.renderPopupBegin('machine_info', 'Machine Info', True)
         """
               <table border=1>"""
-        for mi in machine.info.values():
+        info = machine.info.values()
+        info.sort(key = lambda i: i.key)
+        for mi in info:
             """
               <tr>
                 <td> <b>%s</b> </td>