Progress bar should normally be outside, and above, table.

This commit is contained in:
Jesse Glick committed 2013-12-09 18:44:26 -05:00
1 parent 14b86d7728
commit 102d9fc3ca
2 files changed
+58 -58

No files matched your search

@@ -40,6 +40,33 @@ THE SOFTWARE.
<j:set var="isMasterSlaveEnabled" value="${!empty(app.slaves)}"/>
<div align="center">
<script>
function displayBuilds(data) {
var p = $$('trend');
for (var x = 0; data.length > x; x++) {
var e = data[x];
var tr = new Element('tr').
insert(new Element('td', {data: e.iconColorOrdinal}).
insert(new Element('img', {width: 16, height: 16, src: '${imagesURL}/16x16/' + e.buildStatusUrl, alt: e.iconColorDescription}))).
insert(new Element('td', {data: e.number}).
insert(new Element('a', {href: e.number + '/', 'class': 'model-link inside'}).
update(e.displayName.escapeHTML()))).
insert(new Element('td', {data: e.duration}).
update(e.durationString.escapeHTML()))
<j:if test="${isMasterSlaveEnabled}">
.insert(new Element('td').
update(e.builtOn ? new Element('a', {href: '${rootURL}/computer/' + e.builtOn, 'class': 'model-link inside'}).update(e.builtOnStr) : e.builtOnStr))
</j:if>
;
p.insert(tr);
Behaviour.applySubtree(tr);
}
ts_refresh(p);
}
</script>
<j:new var="handler" className="jenkins.widgets.BuildTimeTrend"/>
${handler.setBuilds(it.builds)}
<l:progressiveRendering handler="${handler}" callback="displayBuilds"/>
<table class="sortable" style="margin-top:1em;" id="trend">
<tr>
<th><st:nbsp/></th>
@@ -49,33 +76,6 @@ THE SOFTWARE.
<th>${%Slave}</th>
</j:if>
</tr>
<script>
function displayBuilds(data) {
var p = $$('trend');
for (var x = 0; data.length > x; x++) {
var e = data[x];
var tr = new Element('tr').
insert(new Element('td', {data: e.iconColorOrdinal}).
insert(new Element('img', {width: 16, height: 16, src: '${imagesURL}/16x16/' + e.buildStatusUrl, alt: e.iconColorDescription}))).
insert(new Element('td', {data: e.number}).
insert(new Element('a', {href: e.number + '/', 'class': 'model-link inside'}).
update(e.displayName.escapeHTML()))).
insert(new Element('td', {data: e.duration}).
update(e.durationString.escapeHTML()))
<j:if test="${isMasterSlaveEnabled}">
.insert(new Element('td').
update(e.builtOn ? new Element('a', {href: '${rootURL}/computer/' + e.builtOn, 'class': 'model-link inside'}).update(e.builtOnStr) : e.builtOnStr))
</j:if>
;
p.insert(tr);
Behaviour.applySubtree(tr);
}
ts_refresh(p);
}
</script>
<j:new var="handler" className="jenkins.widgets.BuildTimeTrend"/>
${handler.setBuilds(it.builds)}
<l:progressiveRendering handler="${handler}" callback="displayBuilds"/>
</table>
</div>
</l:main-panel>
@@ -35,6 +35,37 @@ THE SOFTWARE.
</st:documentation>
<t:setIconSize/>
<script>
function displayBuilds(data) {
var p = $$('projectStatus');
for (var x = 0; data.length > x; x++) {
var e = data[x];
var tr = new Element('tr').
insert(new Element('td', {data: e.iconColorOrdinal}).
insert(new Element('a', {href: '${jobBaseUrl}' + e.url}).
insert(new Element('img', {src: '${imagesURL}/${iconSize}/' + e.buildStatusUrl, alt: e.iconColorDescription, 'class': 'icon${iconSize}'})))).
insert(new Element('td').
insert(new Element('a', {href: '${jobBaseUrl}' + e.parentUrl, 'class': 'model-link'}).
update(e.parentFullDisplayName)).
insert('\u00A0').
insert(new Element('a', {href: '${jobBaseUrl}' + e.url, 'class': 'model-link inside'}).
update(e.displayName.escapeHTML()))).
insert(new Element('td', {data: e.timestampString2, tooltip: '${%Click to center timeline on event}', onclick: 'javascript:tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime("' + e.timestampString2 + '"))'}).
update(e.timestampString.escapeHTML())).
insert(new Element('td', {style: e.buildStatusSummaryWorse ? 'color: red' : ''}).
update(e.buildStatusSummaryMessage.escapeHTML())).
insert(new Element('td').
insert(new Element('a', {href: '${jobBaseUrl}' + e.url + 'console'}).
insert(new Element('img', {src: '${imagesURL}/${subIconSize}/terminal.png', alt: '${%Console output}', border: 0}))));
p.insert(tr);
Behaviour.applySubtree(tr);
}
ts_refresh(p);
}
</script>
<j:new var="handler" className="jenkins.widgets.BuildListTable"/>
${handler.setBuilds(attrs.builds)}
<l:progressiveRendering handler="${handler}" callback="displayBuilds"/>
<table class="sortable pane bigtable" id="projectStatus">
<tr>
<th><st:nbsp/></th>
@@ -43,37 +74,6 @@ THE SOFTWARE.
<th>${%Status}</th>
<th><st:nbsp/></th>
</tr>
<script>
function displayBuilds(data) {
var p = $$('projectStatus');
for (var x = 0; data.length > x; x++) {
var e = data[x];
var tr = new Element('tr').
insert(new Element('td', {data: e.iconColorOrdinal}).
insert(new Element('a', {href: '${jobBaseUrl}' + e.url}).
insert(new Element('img', {src: '${imagesURL}/${iconSize}/' + e.buildStatusUrl, alt: e.iconColorDescription, 'class': 'icon${iconSize}'})))).
insert(new Element('td').
insert(new Element('a', {href: '${jobBaseUrl}' + e.parentUrl, 'class': 'model-link'}).
update(e.parentFullDisplayName)).
insert('\u00A0').
insert(new Element('a', {href: '${jobBaseUrl}' + e.url, 'class': 'model-link inside'}).
update(e.displayName.escapeHTML()))).
insert(new Element('td', {data: e.timestampString2, tooltip: '${%Click to center timeline on event}', onclick: 'javascript:tl.getBand(0).scrollToCenter(Timeline.DateTime.parseGregorianDateTime("' + e.timestampString2 + '"))'}).
update(e.timestampString.escapeHTML())).
insert(new Element('td', {style: e.buildStatusSummaryWorse ? 'color: red' : ''}).
update(e.buildStatusSummaryMessage.escapeHTML())).
insert(new Element('td').
insert(new Element('a', {href: '${jobBaseUrl}' + e.url + 'console'}).
insert(new Element('img', {src: '${imagesURL}/${subIconSize}/terminal.png', alt: '${%Console output}', border: 0}))));
p.insert(tr);
Behaviour.applySubtree(tr);
}
ts_refresh(p);
}
</script>
<j:new var="handler" className="jenkins.widgets.BuildListTable"/>
${handler.setBuilds(attrs.builds)}
<l:progressiveRendering handler="${handler}" callback="displayBuilds"/>
</table>
<t:rssBar-with-iconSize/>
</j:jelly>