Mercurial > bitten > bitten-test
changeset 256:aa942e2c7243
A bit of polishing for [265]: also show build if not yet in the queue, some layout improvements.
| author | cmlenz |
|---|---|
| date | Wed, 05 Oct 2005 18:26:25 +0000 |
| parents | 42f555e1d648 |
| children | 5acdaab27187 |
| files | bitten/trac_ext/htdocs/bitten.css bitten/trac_ext/templates/bitten_config.cs bitten/trac_ext/web_ui.py |
| diffstat | 3 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/trac_ext/htdocs/bitten.css +++ b/bitten/trac_ext/htdocs/bitten.css @@ -18,10 +18,10 @@ #content.build #prefs { line-height: 1.4em; } #content.build table.builds { border-collapse: separate; - border-top: 1px solid #666; table-layout: fixed; + border-top: 1px solid #666; margin-left: 2em; table-layout: fixed; } #content.build table.builds caption { font-weight: bold; text-align: left; } -#content.build table.builds th { padding: 0 .25em; text-align: left; +#content.build table.builds th { padding: 0 1em 0 .25em; text-align: left; vertical-align: top; } #content.build table.builds th p { color: #666; font-size: smaller;
--- a/bitten/trac_ext/templates/bitten_config.cs +++ b/bitten/trac_ext/templates/bitten_config.cs @@ -41,7 +41,8 @@ var:config.description ?></div><?cs /if ?><?cs if:len(config.builds) ?> - <table class="builds"><caption>Latest builds</caption><tr> + <table class="builds"><caption><a href="<?cs + var:config.href ?>">Latest builds</a></caption><tr> <th><a href="<?cs var:config.youngest_rev.href ?>">[<?cs var:config.youngest_rev.id ?>]</a> by <?cs var:config.youngest_rev.author ?><p class="date"><?cs @@ -51,7 +52,7 @@ each:build = config.builds ?><td class="<?cs var:build.cls ?>"><?cs if:build.status != 'pending' ?><a href="<?cs var:build.href ?>"><?cs - var:name(build) ?></a><p class="date"><?cs + var:build.platform ?></a><p class="date"><?cs var:build.stopped ?></p><div class="system"> <strong class="ipnr"><?cs var:build.slave.name ?></strong> (<?cs var:build.slave.ipnr ?>)<br /><?cs @@ -65,7 +66,7 @@ elif:build.status == 'failed' ?>Failed<?cs elif:build.status == 'in-progress' ?>In-progress<?cs /if ?></strong><?cs - else ?><?cs var:name(build) ?><br /> + else ?><?cs var:build.platform ?><br /> <p class="nobuild">No build yet</p><?cs /if ?> </td><?cs
--- a/bitten/trac_ext/web_ui.py +++ b/bitten/trac_ext/web_ui.py @@ -365,7 +365,12 @@ prev_rev = rev if build: build_hdf = _build_to_hdf(self.env, req, build) - req.hdf[prefix + '.builds.%s' % platform.name] = build_hdf + build_hdf['platform'] = escape(platform.name) + req.hdf[prefix + '.builds.%d' % platform.id] = build_hdf + else: + req.hdf[prefix + '.builds.%d' % platform.id] = { + 'platform': escape(platform.name), 'status': 'pending' + } req.hdf['page.mode'] = 'overview' req.hdf['config.can_create'] = req.perm.has_permission('BUILD_CREATE')