X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fnode_template.kid;h=b340bfc43e3122b431b58fa04946af7e9b82e7f3;hb=13c0a095b5ca8ea51ecda1c8f9d04e5b5f004db1;hp=a9ab0e4dec2b1cbf29e584bb02d95008c5490e1f;hpb=21a416bd08166f3668c539f799d9c8de3abe8079;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/node_template.kid b/web/MonitorWeb/monitorweb/templates/node_template.kid
index a9ab0e4..b340bfc 100644
--- a/web/MonitorWeb/monitorweb/templates/node_template.kid
+++ b/web/MonitorWeb/monitorweb/templates/node_template.kid
@@ -6,32 +6,40 @@ from links import *
 ?>
 <span xmlns:py="http://purl.org/kid/ns#">
 	<span py:if="header is not None">
+                <th>ID</th>
+		<th>Hostname</th>
 		<th>Site</th>
+                <th>Ping</th>
+                <th>SSH</th>
+                <th>Boot Status</th>
 		<th>pcu</th>
-		<th>Hostname</th>
-		<!--th>ssh</th-->
 		<th>kernel</th>
 		<th>last_contact</th>
 	</span>
 	<span py:if="node is not None">
-		<td id="site-${node.site.status}">
-			<a href="${link('pcuview', loginbase=node.loginbase)}">${node.loginbase}</a>
+                <td py:content="node.plc_node_stats['node_id']">node_id</td>
+		<td nowrap="true">
+		  <a target="_top" href="${link('pcuview', hostname=node.hostname)}" py:content="node.hostname">your.host.org</a></td>
+		<td>
+		  <a href="${link('pcuview', loginbase=node.loginbase)}">${node.loginbase}</a>
 		</td>
+                <td py:content="node.ping_status">ping</td>
+                <td py:content="node.ssh_status">ssh</td>
+                <td py:content="node.plc_node_stats['boot_state']">boot</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>
+		  <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">
-			<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="diff_time(node.plc_node_stats['last_contact'])"></td>
+		<td  id="node-${node.observed_status}" py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
 	</span>
 </span>