mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-18 06:22:29 +00:00
Merge pull request #1095 from daniel-beck/computers-table
Minor changes to computers table status row
This commit is contained in:
commit
e2f22441fa
2 files changed
+15
-14
No files matched your search
@@ -188,7 +188,7 @@ public abstract class AbstractNodeMonitorDescriptor<T> extends Descriptor<NodeMo
|
||||
return Messages.AbstractNodeMonitorDescriptor_NoDataYet();
|
||||
// return Messages.AbstractNodeMonitorDescriptor_DataObtainedSometimeAgo(
|
||||
// Util.getTimeSpanString(System.currentTimeMillis()-record.timestamp));
|
||||
return Util.getTimeSpanString(System.currentTimeMillis()-record.timestamp);
|
||||
return Util.getPastTimeString(System.currentTimeMillis()-record.timestamp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -52,19 +52,6 @@ THE SOFTWARE.
|
||||
<th />
|
||||
</tr>
|
||||
|
||||
<tr class="sorttop">
|
||||
<td/>
|
||||
<td height="32">${%Data obtained}</td>
|
||||
<j:forEach var="m" items="${monitors}">
|
||||
<j:if test="${m.columnCaption!=null}">
|
||||
<td align="right">
|
||||
${m.descriptor.timestampString}
|
||||
</td>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
<td />
|
||||
</tr>
|
||||
|
||||
<j:forEach var="c" items="${it._all}">
|
||||
<tr id="node_${c.name}">
|
||||
<td width="32" data="${c.icon}">
|
||||
@@ -94,6 +81,20 @@ THE SOFTWARE.
|
||||
<j:forEach var="cloud" items="${app.clouds}">
|
||||
<st:include it="${cloud}" page="computerSet.jelly" optional="true" />
|
||||
</j:forEach>
|
||||
|
||||
<tr class="sortbottom">
|
||||
<th />
|
||||
<th>${%Data obtained}</th>
|
||||
<j:forEach var="m" items="${monitors}">
|
||||
<j:if test="${m.columnCaption!=null}">
|
||||
<th align="right">
|
||||
${m.descriptor.timestampString}
|
||||
</th>
|
||||
</j:if>
|
||||
</j:forEach>
|
||||
<th />
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
<j:if test="${app.hasPermission(app.ADMINISTER)}">
|
||||
<div align="right" style="margin-top:0.5em">
|
||||
|
||||
Reference in new issue
Block a user