X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fnodehistory.kid;h=e63d957ba81b27b7b2921512ff05fcf0c02e70c6;hb=28e240eb7def09d695bff401226193faffbbd59a;hp=8fa825b3c5085e3c459171ad5c60a50ae0932a42;hpb=c9d06f3b274ecbc092a0b3eb1f5ceb6c0f734aad;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/nodehistory.kid b/web/MonitorWeb/monitorweb/templates/nodehistory.kid
index 8fa825b..e63d957 100644
--- a/web/MonitorWeb/monitorweb/templates/nodehistory.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodehistory.kid
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <?python
-layout_params['page_title'] = "Monitor Node List"
+layout_params['page_title'] = "MyOps Node History"
 from monitor.util import diff_time
 from time import mktime
 from links import *
@@ -18,36 +18,19 @@ from links import *
 		<table id="sortable_table" class="datagrid" border="1" width="100%">
 			<thead>
 				<tr>
-					<th mochi:format="int"></th>
-					<!--th>Site</th>
-					<th>pcu</th-->
-					<th>Hostname</th>
-					<th>kernel</th>
-					<th>last_contact</th>
+					<th>Last Check</th>
+					<th>Last Change</th>
+					<th>hostname</th>
+					<th>Status</th>
 				</tr>
 			</thead>
 			<tbody>
 				<tr py:for="i,node in enumerate(query)" class="${i%2 and 'odd' or 'even'}" >
-					<td></td>
-					<!--td id="site-${node.site.status}">
-						<a href="${link('pcuview', loginbase=node.loginbase)}">${node.loginbase}</a>
-					</td>
-					<td width="20%" nowrap='true' align='center' id="status-${node.pcu_short_status}">
-						<div id="links">
-							<a class="info" py:if="'error' in node.pcu_short_status" 
-								href="${link('pcuview', pcuid=node.plc_pcuid)}">
-							Error<span><pre>${node.pcu.reboot_trial_status}</pre></span></a>
-							<a py:if="'error' not in node.pcu_short_status and 'none' not in node.pcu_short_status" 
-								href="${link('pcuview', pcuid=node.plc_pcuid)}"
-								py:content="node.pcu_short_status">Reboot Status</a>
-							<span py:if="'none' in node.pcu_short_status" 
-								py:content="node.pcu_short_status">Reboot Status</span>
-						</div>
-					</td-->
-					<td id="node-${node.observed_status}" nowrap="true">
+					<td py:content="node.last_checked"></td>
+					<td py:content="diff_time(mktime(node.last_changed.timetuple()))"></td>
+					<td nowrap="true">
 						<a target="_top" href="${link('pcuview', hostname=node.hostname)}" py:content="node.hostname">your.host.org</a></td>
-					<td nowrap="true" py:content="node.kernel"></td>
-					<td py:content="node.date_checked"></td>
+					<td id="node-${node.status}" py:content="node.status"></td>
 				</tr>
 			</tbody>
 		</table>
