Adjust infobox and commit logs style

tobami · Jun 23, 2010 · 8d675de · 8d675de
1 parent 45eb8eb
commit 8d675de
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 48 deletions.
diff --git a/speedcenter/codespeed/tests.py b/speedcenter/codespeed/tests.py
@@ -134,4 +134,5 @@ def test_gettimelinedata(self):
         self.assertEquals(len(responsedata['timelines']), 1, "there should be 1 benchmark")
         self.assertEquals(len(responsedata['timelines'][0]['executables']), 2, "there should be 2 timelines")
         self.assertEquals(len(responsedata['timelines'][0]['executables']['1']), 16, "There are 16 datapoints")
-        self.assertEquals(responsedata['timelines'][0]['executables']['1'][4], [u'2010-06-14 18:01:57', 0.40650734901399999, 0.0121723354796, u'75401'], "Wrong data returned")
+        self.assertEquals(responsedata['timelines'][0]['executables']['1'][4], [u'2010-06-17 18:57:39', 0.404776086807, 0.011496530978, u'75443'], "Wrong data returned: ")
+
diff --git a/speedcenter/media/css/main.css b/speedcenter/media/css/main.css
@@ -193,8 +193,8 @@ a.checkall, a.uncheckall { font-size: normal; color: #AAAAAA; }
 a.checkall { margin-left: 0.4em; }
 
 /* tables */
-table#results, table.commits, table.info {
-    float: left;
+table#results, table.info, table.revision {
+    margin-bottom: 0.8em;
     font-family:arial;
     font-size: 11pt;
     text-align: left;
@@ -204,6 +204,7 @@ table#results, table.commits, table.info {
     background-color: #fafafa;
 }
 
+table#results { float: left; margin-right: 0.8em; }
 table#results thead tr th { padding-right: 10px; width: 5em; }
 
 table.tablesorter thead tr th {
@@ -248,7 +249,7 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo
     background-color: #8dbdd8;
 }
 
-table.tablesorter tbody td.text {text-align: left;}
+table.tablesorter tbody td.text {text-align: left; width: 7em; }
 
 table.tablesorter tbody tr td.status-red, .status-red  { background-color: #FF5640; }
 table.tablesorter tbody tr td.status-green, .status-green { background-color: #9FD54D; }
@@ -258,21 +259,19 @@ table.tablesorter tbody tr.highlight td {
     cursor: pointer;
 }
 
-table.info { margin-left: 0.8em; margin-bottom: 0.8em; width: 22em; }
-table.info th { background-color: #F1F1F1; }
-table.info th, table.info td { padding: 0.3em; }
+table.info { float:left; clear: both; width: 26.6em;}
+table.info th, table.revision th { background-color: #F1F1F1; }
+table.info th, table.info td, table.revision th, table.revision td { padding: 0.3em; }
 /* table.info td { text-align: right; } */
 table.info tbody td.infofirst { width: 10em; text-align: left; }
-
-table.commits { width: 100%; margin-top: 2em; }
-table.commits th, table.commits td { padding: 0.5em; }
-table.commits th { background-color: #F1F1F1; font-weight: normal; }
-table.commits tbody tr td { border-bottom: 1px solid #CDCDCD; vertical-align: top; }
-table.commits tbody tr td.date, div.author, span.note, table.info tbody td.infofirst {
+
+/* table.revision { min-width: 22em; float: left; } */
+tbody.commits tr td { border-bottom: 1px solid #CDCDCD; vertical-align: top; }
+tbody.commits tr td.date, table.revision tr td.infofirst, div.author, span.note, table.info tbody td.infofirst {
     font-size: 92%;
     color: #666666;
 }
-table.commits tbody tr td.date { padding-top: 0.6em;}
+tbody.commits tr td.date { padding-top: 0.6em;}
 
 
 a#permalink { float: right; font-size: small; }

diff --git a/speedcenter/templates/codespeed/changes_table.html b/speedcenter/templates/codespeed/changes_table.html
@@ -1,3 +1,4 @@
+<div style="float:left;">
 <table id="results" class="tablesorter">
 <thead>
   <tr>
@@ -18,57 +19,51 @@
 <table class="info">
 <thead>
   <tr>
-    <th colspan="2">Revision</th>
+    <th colspan="2">Executable</th>
   </tr>
 </thead>
 <tbody>
-<tr><td class="infofirst">Commit</td><td>{{ rev.commitid }}</td></tr>
-<tr><td class="infofirst">Date</td><td>{{ rev.date }}</td></tr>
+  <tr><td class="infofirst">Name</td><td>{{ exe }}</td></tr>
+  <tr><td class="infofirst">Description</td><td>{{ exe.description }}</td></tr>
 </tbody>
-</table>
-
-<table class="info">
 <thead>
   <tr>
-    <th colspan="2">Executable</th>
+    <th colspan="2">Environment</th>
   </tr>
 </thead>
 <tbody>
-<tr><td class="infofirst">Name</td><td>{{ exe }}</td></tr>
-<tr><td class="infofirst">Description</td><td>{{ exe.description }}</td></tr>
+  <tr><td class="infofirst">Name</td><td>{{ env.name }}</td></tr>
+  <tr><td class="infofirst">CPU</td><td>{{ env.cpu }}</td></tr>
+  <tr><td class="infofirst">Memory</td><td>{{ env.memory }}</td></tr>
+  <tr><td class="infofirst">OS</td><td>{{ env.os }}</td></tr>
+  <tr><td class="infofirst">Kernel</td><td>{{ env.kernel }}</td></tr>
 </tbody>
 </table>
-
-<table class="info">
+</div>
+<table class="revision">
 <thead>
   <tr>
-    <th colspan="2">Environment</th>
+    <th colspan="2">Revision</th>
   </tr>
 </thead>
 <tbody>
-<tr><td class="infofirst">Name</td><td>{{ env.name }}</td></tr>
-<tr><td class="infofirst">CPU</td><td>{{ env.cpu }}</td></tr>
-<tr><td class="infofirst">Memory</td><td>{{ env.memory }}</td></tr>
-<tr><td class="infofirst">OS</td><td>{{ env.os }}</td></tr>
-<tr><td class="infofirst">Kernel</td><td>{{ env.kernel }}</td></tr>
+  <tr><td class="infofirst">Commit</td><td>{{ rev.commitid }}</td></tr>
+  <tr><td class="infofirst">Date</td><td>{{ rev.date }}</td></tr>
 </tbody>
-</table>
-
 {% ifnotequal executable.project.repo_type 'N' %}
-<table class="commits">
-<thead>
+<thead class="commits">
   <tr>
-    <th colspan="2"><strong>Commit logs</strong> for <span class="note">{{ lastrevision.project.repo_path }}</span></th>
+    <th colspan="2">Commit logs</th>
   </tr>
 </thead>
-<tbody id="commitid__{{ lastrevision.id }}">
-<tr><td>Loading... <img src="/media/images/ajax-loader.gif" align="bottom"></td></tr>
+<tbody class="commits" id="commitid__{{ lastrevision.id }}">
+  <tr><td>Loading... <img src="/media/images/ajax-loader.gif" align="bottom"></td></tr>
 </tbody>
+  <script type="text/javascript">
+    var revisionid = $("tbody.commits").attr("id");
+    $("#" + revisionid).html(getLoadText("Loading...", 0, true));
+    loadoption = "revisionid=" + revisionid.split('__')[1];
+    $("#" + revisionid).load("logs/", loadoption);
+  </script>
+{% endifnotequal %}
 </table>
-<script type="text/javascript">
-  var revisionid = $(".commits > tbody").attr("id");
-  $("#" + revisionid).html(getLoadText("Loading...", 0, true));
-  loadoption = "revisionid=" + revisionid.split('__')[1];
-  $("#" + revisionid).load("logs/", loadoption);
-</script>
-{% endifnotequal %}
diff --git a/tools/pypy/import_from_json.py b/tools/pypy/import_from_json.py
@@ -12,7 +12,7 @@
     'pypy-c-jit': 'http://buildbot.pypy.org/bench_results/',
     'pypy-c':  'http://buildbot.pypy.org/bench_results_nojit/',
 }
-START_REV = 74510
+START_REV = 75480
 PROJECT = "PyPy"
 
 for INTERP in RESULTS_URLS:
@@ -57,6 +57,6 @@
 
         host = 'tannit'
         saveresults.save(proj, revision, result['results'], options, interpreter, host)
-        if filename == filelist[len(filelist)-1]:
-            savecpython.save('cpython', '100', result['results'], options, 'cpython', host)
+        #if filename == filelist[len(filelist)-1]:
+            #savecpython.save('cpython', '100', result['results'], options, 'cpython', host)
 print "\nOK"