X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fnodelist.kid;h=5b4e7c368a209e1e6e2c2fdd8fee657fa55f18f7;hb=bbdd1222ad57a915bbb3d872a1cf1da759ef85e3;hp=c9ec47726509dd3cc842f55c1a97d917e899d293;hpb=f4c8ac6cb9e1418ced303fd9f715e76b275af00d;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/nodelist.kid b/web/MonitorWeb/monitorweb/templates/nodelist.kid
index c9ec477..5b4e7c3 100644
--- a/web/MonitorWeb/monitorweb/templates/nodelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodelist.kid
@@ -1,8 +1,9 @@
 <!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 View"
+layout_params['page_title'] = "Monitor Node List"
 from monitor.util import diff_time
 from time import mktime
+from links import *
 ?>
 <html py:layout="'sitemenu.kid'"
       xmlns:py="http://purl.org/kid/ns#"
@@ -12,12 +13,12 @@ from time import mktime
   	<table width="100%">
 		<thead>
 			<tr>
-				<th><a href="${tg.url('node', filter='BOOT')}">Production(${fc['BOOT']})</a></th>
-				<th><a href="${tg.url('node', filter='DEBUG')}">Debug(${fc['DEBUG']})</a></th>
-				<th><a href="${tg.url('node', filter='DOWN')}">Down(${fc['DOWN']})</a></th>
-				<th><a href="${tg.url('node', filter='neverboot')}">Never Booted(${fc['neverboot']})</a></th>
-				<th><a href="${tg.url('node', filter='pending')}">Pending Reply(${fc['pending']})</a></th>
-				<th><a href="${tg.url('node', filter='all')}">All</a></th>
+				<th><a href="${link('node', filter='BOOT')}">Production(${fc['BOOT']})</a></th>
+				<th><a href="${link('node', filter='DEBUG')}">Debug(${fc['DEBUG']})</a></th>
+				<th><a href="${link('node', filter='DOWN')}">Down(${fc['DOWN']})</a></th>
+				<th><a href="${link('node', filter='neverboot')}">Never Booted(${fc['neverboot']})</a></th>
+				<th><a href="${link('node', filter='pending')}">Pending Reply(${fc['pending']})</a></th>
+				<th><a href="${link('node', filter='all')}">All</a></th>
 			</tr>
 		</thead>
 		<tbody>
@@ -27,27 +28,13 @@ from time import mktime
 			<thead>
 				<tr>
 					<th mochi:format="int"></th>
-					<th mochi:format="str">Site</th>
-					<th>Hostname</th>
-					<th>ping</th>
-					<!--th>ssh</th-->
-					<th>pcu</th>
-					<th>status</th>
-					<th>kernel</th>
-					<th>last_contact</th>
+					${nodewidget.display(node=None, header=True)}
 				</tr>
 			</thead>
 			<tbody>
 				<tr py:for="i,node in enumerate(query)" class="${i%2 and 'odd' or 'even'}" >
 					<td></td>
-					<td><a href="">${node.loginbase}</a></td>
-				  <td nowrap="true" py:content="node.hostname"></td>
-				  <td py:content="node.ping_status"></td>
-				  <!--td py:content="node.ssh_status"></td-->
-				  <td id="status-${node.pcu_short_status}" py:content="node.pcu_short_status"></td>
-				  <td py:content="node.observed_status"></td>
-				  <td nowrap="true" py:content="node.kernel"></td>
-				  <td py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
+					${nodewidget.display(node=node, header=None)}
 				</tr>
 			</tbody>
 		</table>
