X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fnode_template.kid;h=9e6519862c449a0d6f0408a9ff925ff4a9b94e1f;hb=41d93cf456e796ead6604be6a60acfbaa9b4cbca;hp=4726525e86bc40a3034d172794c2d59acca34938;hpb=ff0c0d677ff5dc9bca3ba1e7a4cdf767346386d8;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/node_template.kid b/web/MonitorWeb/monitorweb/templates/node_template.kid
index 4726525..9e65198 100644
--- a/web/MonitorWeb/monitorweb/templates/node_template.kid
+++ b/web/MonitorWeb/monitorweb/templates/node_template.kid
@@ -6,39 +6,45 @@ from links import *
 ?>
 <span xmlns:py="http://purl.org/kid/ns#">
 	<span py:if="header is not None">
-		<th>Site</th>
-                <th>Ping</th>
-                <th>SSH</th>
-                <th>Boot Status</th>
-		<th>pcu</th>
-		<th>Hostname</th>
-                <th>ID</th>
-		<th>kernel</th>
-		<th>last_contact</th>
+      <th class="sortable plekit_table">ID</th>
+      <th class="sortable plekit_table">Hostname</th>
+      <th class="sortable plekit_table">Site</th>
+      <th class="sortable plekit_table">Ping</th>
+      <th class="sortable plekit_table">SSH</th>
+      <th class="sortable plekit_table">Stat</th>
+      <th class="sortable plekit_table">pcu</th>
+      <th class="sortable plekit_table">kernel</th>
+      <th class="sortable plekit_table">BootCD</th>
+      <th class="sortable plekit_table">Boot Server</th>
+      <th class="sortable plekit_table">Installation Date</th>
+      <th class="sortable-sortLastContact plekit_table">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.node.plc_node_stats['node_id']">node_id</td>
+		<td nowrap="true">
+		  <a target="_top" href="${link('pcuview', hostname=node.node.hostname)}" py:content="node.node.hostname">your.host.org</a></td>
+		<td>
+		  <a href="${link('pcuview', loginbase=node.node.loginbase)}">${node.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 py:content="node.node.ping_status">ping</td>
+                <td py:content="node.node.ssh_status">ssh</td>
+                <td py:content="node.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.pcu.pcu.plc_pcuid)}">
+		      Error<span><pre>${node.pcu.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.pcu.pcu.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 py:content="node.plc_node_stats['node_id']">node_id</td>
 		<td nowrap="true" py:content="node.kernel"></td>
-		<td py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
+		<td nowrap="true" py:content="node.node.bootcd_version"></td>
+		<td nowrap="true" py:content="node.node.boot_server"></td>
+		<td nowrap="true" py:content="node.node.install_date"></td>
+		<td  id="node-${node.node.observed_status}" py:content="diff_time(node.node.plc_node_stats['last_contact'])"></td>
 	</span>
 </span>