Skip to content

Commit 8d675de

Browse files
tobamitobami
committed
Adjust infobox and commit logs style
1 parent 45eb8eb commit 8d675de

File tree

4 files changed

+43
-48
lines changed

4 files changed

+43
-48
lines changed

‎speedcenter/codespeed/tests.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,5 @@ def test_gettimelinedata(self):
134134
self.assertEquals(len(responsedata['timelines']), 1, "there should be 1 benchmark")
135135
self.assertEquals(len(responsedata['timelines'][0]['executables']), 2, "there should be 2 timelines")
136136
self.assertEquals(len(responsedata['timelines'][0]['executables']['1']), 16, "There are 16 datapoints")
137-
self.assertEquals(responsedata['timelines'][0]['executables']['1'][4], [u'2010-06-14 18:01:57', 0.40650734901399999, 0.0121723354796, u'75401'], "Wrong data returned")
137+
self.assertEquals(responsedata['timelines'][0]['executables']['1'][4], [u'2010-06-17 18:57:39', 0.404776086807, 0.011496530978, u'75443'], "Wrong data returned: ")
138+

‎speedcenter/media/css/main.css

+12-13
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ a.checkall, a.uncheckall { font-size: normal; color: #AAAAAA; }
193193
a.checkall { margin-left: 0.4em; }
194194

195195
/* tables */
196-
table#results, table.commits, table.info {
197-
float: left;
196+
table#results, table.info, table.revision {
197+
margin-bottom: 0.8em;
198198
font-family:arial;
199199
font-size: 11pt;
200200
text-align: left;
@@ -204,6 +204,7 @@ table#results, table.commits, table.info {
204204
background-color: #fafafa;
205205
}
206206

207+
table#results { float: left; margin-right: 0.8em; }
207208
table#results thead tr th { padding-right: 10px; width: 5em; }
208209

209210
table.tablesorter thead tr th {
@@ -248,7 +249,7 @@ table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSo
248249
background-color: #8dbdd8;
249250
}
250251

251-
table.tablesorter tbody td.text {text-align: left;}
252+
table.tablesorter tbody td.text {text-align: left; width: 7em; }
252253

253254
table.tablesorter tbody tr td.status-red, .status-red { background-color: #FF5640; }
254255
table.tablesorter tbody tr td.status-green, .status-green { background-color: #9FD54D; }
@@ -258,21 +259,19 @@ table.tablesorter tbody tr.highlight td {
258259
cursor: pointer;
259260
}
260261

261-
table.info { margin-left: 0.8em; margin-bottom: 0.8em; width: 22em; }
262-
table.info th { background-color: #F1F1F1; }
263-
table.info th, table.info td { padding: 0.3em; }
262+
table.info { float:left; clear: both; width: 26.6em;}
263+
table.info th, table.revision th { background-color: #F1F1F1; }
264+
table.info th, table.info td, table.revision th, table.revision td { padding: 0.3em; }
264265
/* table.info td { text-align: right; } */
265266
table.info tbody td.infofirst { width: 10em; text-align: left; }
266-
267-
table.commits { width: 100%; margin-top: 2em; }
268-
table.commits th, table.commits td { padding: 0.5em; }
269-
table.commits th { background-color: #F1F1F1; font-weight: normal; }
270-
table.commits tbody tr td { border-bottom: 1px solid #CDCDCD; vertical-align: top; }
271-
table.commits tbody tr td.date, div.author, span.note, table.info tbody td.infofirst {
267+
268+
/* table.revision { min-width: 22em; float: left; } */
269+
tbody.commits tr td { border-bottom: 1px solid #CDCDCD; vertical-align: top; }
270+
tbody.commits tr td.date, table.revision tr td.infofirst, div.author, span.note, table.info tbody td.infofirst {
272271
font-size: 92%;
273272
color: #666666;
274273
}
275-
table.commits tbody tr td.date { padding-top: 0.6em;}
274+
tbody.commits tr td.date { padding-top: 0.6em;}
276275

277276

278277
a#permalink { float: right; font-size: small; }

‎speedcenter/templates/codespeed/changes_table.html

+26-31
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<div style="float:left;">
12
<table id="results" class="tablesorter">
23
<thead>
34
<tr>
@@ -18,57 +19,51 @@
1819
<table class="info">
1920
<thead>
2021
<tr>
21-
<th colspan="2">Revision</th>
22+
<th colspan="2">Executable</th>
2223
</tr>
2324
</thead>
2425
<tbody>
25-
<tr><td class="infofirst">Commit</td><td>{{ rev.commitid }}</td></tr>
26-
<tr><td class="infofirst">Date</td><td>{{ rev.date }}</td></tr>
26+
<tr><td class="infofirst">Name</td><td>{{ exe }}</td></tr>
27+
<tr><td class="infofirst">Description</td><td>{{ exe.description }}</td></tr>
2728
</tbody>
28-
</table>
29-
30-
<table class="info">
3129
<thead>
3230
<tr>
33-
<th colspan="2">Executable</th>
31+
<th colspan="2">Environment</th>
3432
</tr>
3533
</thead>
3634
<tbody>
37-
<tr><td class="infofirst">Name</td><td>{{ exe }}</td></tr>
38-
<tr><td class="infofirst">Description</td><td>{{ exe.description }}</td></tr>
35+
<tr><td class="infofirst">Name</td><td>{{ env.name }}</td></tr>
36+
<tr><td class="infofirst">CPU</td><td>{{ env.cpu }}</td></tr>
37+
<tr><td class="infofirst">Memory</td><td>{{ env.memory }}</td></tr>
38+
<tr><td class="infofirst">OS</td><td>{{ env.os }}</td></tr>
39+
<tr><td class="infofirst">Kernel</td><td>{{ env.kernel }}</td></tr>
3940
</tbody>
4041
</table>
41-
42-
<table class="info">
42+
</div>
43+
<table class="revision">
4344
<thead>
4445
<tr>
45-
<th colspan="2">Environment</th>
46+
<th colspan="2">Revision</th>
4647
</tr>
4748
</thead>
4849
<tbody>
49-
<tr><td class="infofirst">Name</td><td>{{ env.name }}</td></tr>
50-
<tr><td class="infofirst">CPU</td><td>{{ env.cpu }}</td></tr>
51-
<tr><td class="infofirst">Memory</td><td>{{ env.memory }}</td></tr>
52-
<tr><td class="infofirst">OS</td><td>{{ env.os }}</td></tr>
53-
<tr><td class="infofirst">Kernel</td><td>{{ env.kernel }}</td></tr>
50+
<tr><td class="infofirst">Commit</td><td>{{ rev.commitid }}</td></tr>
51+
<tr><td class="infofirst">Date</td><td>{{ rev.date }}</td></tr>
5452
</tbody>
55-
</table>
56-
5753
{% ifnotequal executable.project.repo_type 'N' %}
58-
<table class="commits">
59-
<thead>
54+
<thead class="commits">
6055
<tr>
61-
<th colspan="2"><strong>Commit logs</strong> for <span class="note">{{ lastrevision.project.repo_path }}</span></th>
56+
<th colspan="2">Commit logs</th>
6257
</tr>
6358
</thead>
64-
<tbody id="commitid__{{ lastrevision.id }}">
65-
<tr><td>Loading... <img src="/media/images/ajax-loader.gif" align="bottom"></td></tr>
59+
<tbody class="commits" id="commitid__{{ lastrevision.id }}">
60+
<tr><td>Loading... <img src="/media/images/ajax-loader.gif" align="bottom"></td></tr>
6661
</tbody>
62+
<script type="text/javascript">
63+
var revisionid = $("tbody.commits").attr("id");
64+
$("#" + revisionid).html(getLoadText("Loading...", 0, true));
65+
loadoption = "revisionid=" + revisionid.split('__')[1];
66+
$("#" + revisionid).load("logs/", loadoption);
67+
</script>
68+
{% endifnotequal %}
6769
</table>
68-
<script type="text/javascript">
69-
var revisionid = $(".commits > tbody").attr("id");
70-
$("#" + revisionid).html(getLoadText("Loading...", 0, true));
71-
loadoption = "revisionid=" + revisionid.split('__')[1];
72-
$("#" + revisionid).load("logs/", loadoption);
73-
</script>
74-
{% endifnotequal %}

‎tools/pypy/import_from_json.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
'pypy-c-jit': 'http://buildbot.pypy.org/bench_results/',
1313
'pypy-c': 'http://buildbot.pypy.org/bench_results_nojit/',
1414
}
15-
START_REV = 74510
15+
START_REV = 75480
1616
PROJECT = "PyPy"
1717

1818
for INTERP in RESULTS_URLS:
@@ -57,6 +57,6 @@
5757

5858
host = 'tannit'
5959
saveresults.save(proj, revision, result['results'], options, interpreter, host)
60-
if filename == filelist[len(filelist)-1]:
61-
savecpython.save('cpython', '100', result['results'], options, 'cpython', host)
60+
#if filename == filelist[len(filelist)-1]:
61+
#savecpython.save('cpython', '100', result['results'], options, 'cpython', host)
6262
print "\nOK"

0 commit comments

Comments
 (0)