Make the info tables less compressed

This commit is contained in:
Eelco Dolstra 2013-02-21 13:42:44 +01:00
parent dd5eb51a84
commit 36032e4bed
7 changed files with 17 additions and 45 deletions

View file

@ -64,7 +64,7 @@
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#tabs-summary" data-toggle="tab">Summary</a></li> <li class="active"><a href="#tabs-summary" data-toggle="tab">Summary</a></li>
<li><a href="#tabs-information" data-toggle="tab">Details</a></li> <li><a href="#tabs-details" data-toggle="tab">Details</a></li>
<li><a href="#tabs-buildinputs" data-toggle="tab">Build inputs</a></li> <li><a href="#tabs-buildinputs" data-toggle="tab">Build inputs</a></li>
[% IF relatedbuilds %]<li><a href="#tabs-relatedbuilds" data-toggle="tab">Related builds</a></li>[% END %] [% IF relatedbuilds %]<li><a href="#tabs-relatedbuilds" data-toggle="tab">Related builds</a></li>[% END %]
[% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %] [% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]
@ -78,13 +78,13 @@
<div id="tabs-summary" class="tab-pane active"> <div id="tabs-summary" class="tab-pane active">
<table class="layoutTable"> <table>
<tr> <tr>
<td> <td>
[% INCLUDE renderBuildStatusIcon size=128, build=build %] [% INCLUDE renderBuildStatusIcon size=128, build=build %]
</td> </td>
<td> <td>
<table class="layoutTable"> <table class="info-table">
<tr> <tr>
<th>Build ID:</th> <th>Build ID:</th>
<td>[% build.id %]</td> <td>[% build.id %]</td>
@ -212,9 +212,9 @@
</div> </div>
<div id="tabs-information" class="tab-pane"> <div id="tabs-details" class="tab-pane">
<table class="layoutTable"> <table class="info-table">
[% IF build.nixexprinput %] [% IF build.nixexprinput %]
<tr> <tr>
<th>Nix expression:</th> <th>Nix expression:</th>

View file

@ -5,7 +5,7 @@
<h2>Change password</h2> <h2>Change password</h2>
<table class="layoutTable"> <table class="info-table">
<tr> <tr>
<th>Enter password:</th> <th>Enter password:</th>
<td><input type="password" class="string" id="password" name="password" /></td> <td><input type="password" class="string" id="password" name="password" /></td>

View file

@ -156,36 +156,6 @@ END;
BLOCK renderLink %]<a href="[% uri %]">[% title %]</a>[% END; BLOCK renderLink %]<a href="[% uri %]">[% title %]</a>[% END;
BLOCK showBuildStats %]
<table class="layoutTable">
<tr>
<th>Finished builds:</th>
<td>[% finishedBuilds %]</td>
</tr>
<tr>
<th><img src="/static/images/checkmark_16.png" alt="Succeeded" /> Succeeded builds:</th>
<td>[% succeededBuilds %]</td>
</tr>
<tr>
<th><img src="/static/images/error_16.png" alt="Failed" /> Failed builds:</th>
<td>[% finishedBuilds - succeededBuilds %]</td>
</tr>
<tr>
<th>Total build time:</th>
<td>[% INCLUDE renderDuration duration = totalBuildTime %]</td>
</tr>
<tr>
<th>Scheduled builds:</th>
<td>[% scheduledBuilds %]</td>
</tr>
<tr>
<th>Currently executing builds:</th>
<td>[% busyBuilds %]</td>
</tr>
</table>
[% END;
BLOCK renderViewJobName; BLOCK renderViewJobName;
IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END; IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END;
END; END;
@ -224,7 +194,7 @@ END;
BLOCK editString; %] BLOCK editString; %]
<input type="text" class="string" [% HTML.attributes(id => param, name => param, value => value) %] /> <input type="text" class="string" [% HTML.attributes(id => param, name => param, value => value) %] />
END; [% END;
BLOCK renderFullBuildLink; BLOCK renderFullBuildLink;
@ -455,7 +425,7 @@ BLOCK renderEvals %]
</tr> </tr>
[% END; [% END;
IF linkToAll %] IF linkToAll %]
<tr><td class="centered" colspan="54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr> <tr><td class="centered" colspan="54"><a href="[% linkToAll %]"><em>All evaluations...</em></a></td></tr>
[% END %] [% END %]
</tbody> </tbody>
</table> </table>

View file

@ -54,7 +54,7 @@
<div id="tabs-evaluations" class="tab-pane active"> <div id="tabs-evaluations" class="tab-pane active">
<table class="layoutTable"> <table class="info-table">
<tr> <tr>
<th>Last checked:</th> <th>Last checked:</th>
<td> <td>
@ -78,7 +78,6 @@
<div id="tabs-status" class="tab-pane"> <div id="tabs-status" class="tab-pane">
[% IF activeJobsStatus %] [% IF activeJobsStatus %]
<h2>Status</h2>
<table class="table table-striped table-condensed"> <table class="table table-striped table-condensed">
<thead><tr><th>Job</th>[% FOREACH s IN systems %]<th>[% s.system %]</th>[% END %]</tr></thead> <thead><tr><th>Job</th>[% FOREACH s IN systems %]<th>[% s.system %]</th>[% END %]</tr></thead>
<tbody> <tbody>
@ -122,7 +121,7 @@
<div id="tabs-setup" class="tab-pane"> <div id="tabs-setup" class="tab-pane">
<table class="layoutTable"> <table class="info-table">
<tr> <tr>
<th>Description:</th> <th>Description:</th>
<td>[% HTML.escape(jobset.description) %]</td> <td>[% HTML.escape(jobset.description) %]</td>
@ -158,7 +157,6 @@
<div id="tabs-jobs" class="tab-pane"> <div id="tabs-jobs" class="tab-pane">
<p>This jobset currently contains the following [% activeJobs.size %] jobs: <p>This jobset currently contains the following [% activeJobs.size %] jobs:
<blockquote> <blockquote>
[% IF activeJobs.size == 0 %]<em>(none)</em>[% END %] [% IF activeJobs.size == 0 %]<em>(none)</em>[% END %]
[% FOREACH j IN activeJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]<br/>[% END %] [% FOREACH j IN activeJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]<br/>[% END %]
@ -166,7 +164,6 @@
</p> </p>
<p>This jobset used to contain the following [% inactiveJobs.size %] jobs: <p>This jobset used to contain the following [% inactiveJobs.size %] jobs:
<blockquote> <blockquote>
[% IF inactiveJobs.size == 0 %]<em>(none)</em>[% END %] [% IF inactiveJobs.size == 0 %]<em>(none)</em>[% END %]
[% FOREACH j IN inactiveJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]<br/>[% END %] [% FOREACH j IN inactiveJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]<br/>[% END %]

View file

@ -2,7 +2,7 @@
[% BLOCK renderProductList %] [% BLOCK renderProductList %]
<table class="productList layoutTable"> <table class="productList">
[% FOREACH product IN build.buildproducts %] [% FOREACH product IN build.buildproducts %]

View file

@ -79,7 +79,7 @@
</div> </div>
<div id="tabs-settings" class="tab-pane"> <div id="tabs-settings" class="tab-pane">
<table class="layoutTable"> <table class="info-table">
<tr> <tr>
<th>Display name:</th> <th>Display name:</th>
<td>[% HTML.escape(project.displayname) %]</td> <td>[% HTML.escape(project.displayname) %]</td>

View file

@ -42,3 +42,8 @@ span.disabled-project, span.disabled-jobset {
span.hidden-project a, span.hidden-jobset a { span.hidden-project a, span.hidden-jobset a {
color: gray; color: gray;
} }
table.info-table th {
padding-right: 1.0em;
padding-bottom: 0.2em;
}