[pypy-svn] r40455 - in pypy/branch/guido-buildtool-web/pypy/tool/build/web: . templates theme
guido at codespeak.net
guido at codespeak.net
Tue Mar 13 21:49:12 CET 2007
Author: guido
Date: Tue Mar 13 21:49:07 2007
New Revision: 40455
Modified:
pypy/branch/guido-buildtool-web/pypy/tool/build/web/app.py
pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/build.html
pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/builds.html
pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/index.html
pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/serverstatus.html
pypy/branch/guido-buildtool-web/pypy/tool/build/web/theme/style.css
Log:
Added some more info to the builds and build pages, added stylesheet to all
pages.
Modified: pypy/branch/guido-buildtool-web/pypy/tool/build/web/app.py
==============================================================================
--- pypy/branch/guido-buildtool-web/pypy/tool/build/web/app.py (original)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/app.py Tue Mar 13 21:49:07 2007
@@ -165,8 +165,11 @@
'request_time': format_time(br.request_time),
'build_start_time': format_time(br.build_start_time),
'build_end_time': format_time(br.build_end_time),
+ 'sysinfo': [{'key': k, 'value': v} for (k, v) in
+ sorted(br.sysinfo.items())],
+ 'compileinfo': [{'key': k, 'value': v} for (k, v) in
+ sorted(br.compileinfo.items())],
'status': status,
- 'log': log,
'error': error,
}
@@ -188,9 +191,10 @@
'email': b.email,
'svnurl': b.svnurl,
'svnrev': b.normalized_rev,
- 'request_time': b.request_time,
- 'build_start_time': b.build_start_time,
- 'build_end_time': b.build_end_time} for b in buildrequests]
+ 'request_time': format_time(b.request_time),
+ 'build_start_time': format_time(b.build_start_time) or '-',
+ 'build_end_time': format_time(b.build_end_time) or '-'}
+ for b in buildrequests]
class Builds(Collection):
""" container for BuildsIndexPage and BuildPage """
@@ -217,7 +221,7 @@
""" the application root """
def __init__(self, config):
self.style = FsFile(mypath.join('theme/style.css'), 'text/css')
- self.serverstatus = ServerStatusPage(config)
+ self.index = ServerStatusPage(config)
self.buildersinfo = BuildersInfoPage(config)
self.builds = Builds(config)
Modified: pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/build.html
==============================================================================
--- pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/build.html (original)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/build.html Tue Mar 13 21:49:07 2007
@@ -1,6 +1,7 @@
<html>
<head>
<title>Build meta server build %(id)s</title>
+ <link rel="stylesheet" type="text/css" href="/style" />
</head>
<body>
<ul class="sidebar">
@@ -50,6 +51,21 @@
<span>%(build_end_time)s</span>
</div>
%(build_end_time)]c
+ <div>
+ <div class="title">sysinfo:</div>
+ %(sysinfo)[b
+ <div class="valuelist">
+ <span class="smalltitle">%(key)s</span>
+ <span>%(value)s</span>
+ </div>
+ %(sysinfo)]b
+ <div class="title">compileinfo:</div>
+ %(compileinfo)[b
+ <div class="valuelist">
+ <span class="smalltitle">%(key)s:</span>
+ <span>%(value)s</span>
+ </div>
+ %(compileinfo)]b
<!--
%%(log)[c
<div>
Modified: pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/builds.html
==============================================================================
--- pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/builds.html (original)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/builds.html Tue Mar 13 21:49:07 2007
@@ -1,6 +1,7 @@
<html>
<head>
<title>Build meta server builds page</title>
+ <link rel="stylesheet" type="text/css" href="/style" />
</head>
<body>
<ul class="sidebar">
@@ -14,13 +15,26 @@
for download) and waiting or in-progress ones, ordered by date. Click
on the build to get more information.
</p>
- %(builds)[b
- <div class="infoblock">
- <div class="title">
- <a href="%(href)s">%(id)s</a>
- </div>
- </div>
- %(builds)]b
+ <table>
+ <thead>
+ <tr>
+ <th>id (link)</th>
+ <th>requested</th>
+ <th>started</th>
+ <th>ended</th>
+ </tr>
+ </thead>
+ <tbody>
+ %(builds)[b
+ <tr>
+ <td><a href="%(href)s">%(id)s</a></td>
+ <td>%(request_time)s</td>
+ <td>%(build_start_time)s</td>
+ <td>%(build_end_time)s</td>
+ </tr>
+ %(builds)]b
+ </tbody>
+ </table>
</body>
</html>
Modified: pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/index.html
==============================================================================
--- pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/index.html (original)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/index.html Tue Mar 13 21:49:07 2007
@@ -1,6 +1,7 @@
<html>
<head>
<title>Build meta server web interface (temp index page)</title>
+ <link rel="stylesheet" type="text/css" href="/style" />
</head>
<body>
<ul class="sidebar">
Modified: pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/serverstatus.html
==============================================================================
--- pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/serverstatus.html (original)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/templates/serverstatus.html Tue Mar 13 21:49:07 2007
@@ -1,6 +1,7 @@
<html>
<head>
<title>Build meta server status page</title>
+ <link rel="stylesheet" type="text/css" href="/style" />
</head>
<body>
<ul class="sidebar">
Modified: pypy/branch/guido-buildtool-web/pypy/tool/build/web/theme/style.css
==============================================================================
--- pypy/branch/guido-buildtool-web/pypy/tool/build/web/theme/style.css (original)
+++ pypy/branch/guido-buildtool-web/pypy/tool/build/web/theme/style.css Tue Mar 13 21:49:07 2007
@@ -8,12 +8,20 @@
margin-bottom: 1em;
}
-.title {
+.title, .smalltitle {
font-weight: bold;
}
+.valuelist {
+ margin-left: 1em;
+}
+
.sub div {
margin-left: 1em;
font-size: 0.8em;
}
+td {
+ text-align: center;
+}
+
More information about the Pypy-commit
mailing list