git://git.onelab.eu / monitor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
modified *list templates with abreviated information
[monitor.git] / web / MonitorWeb / monitorweb / templates / nodeview.kid
diff --git a/web/MonitorWeb/monitorweb/templates/nodeview.kid b/web/MonitorWeb/monitorweb/templates/nodeview.kid
index 354761c..dc2820e 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/nodeview.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodeview.kid
@@ -2,6 +2,8 @@
 <?python
 layout_params['page_title'] = "Monitor Node View"
 from monitor.util import diff_time
+from time import mktime
+from pcucontrol.reboot import pcu_name, model_to_object
 from links import *
 ?>
 <html  py:layout="'sitemenu.kid'"
@@ -18,8 +20,8 @@ from links import *
                                        <th>Hostname</th>
                                        <th>ping</th>
                                        <!--th>ssh</th-->
-                                       <th>pcu</th>
                                        <th>kernel</th>
+                                       <th>last_change</th>
                                        <th>last_contact</th>
                                </tr>
                        </thead>
@@ -34,16 +36,47 @@ from links import *
                                                        <span class="icon">${node.hostname}</span></a>
                                        </td>
                                        <td py:content="node.ping_status"></td>
-                                       <td py:if="node.pcu_short_status != 'none'" id="status-${node.pcu_short_status}">
-                                               <a href="${link('pcuview', pcuid=node.plc_node_stats['pcu_ids'])}">${node.pcu_short_status}</a></td>
-                                       <td py:if="node.pcu_short_status == 'none'" id="status-${node.pcu_short_status}">
-                                               ${node.pcu_short_status}</td>
                                        <td nowrap="true" py:content="node.kernel"></td>
+                                       <td py:content="diff_time(mktime(node.history.last_changed.timetuple()))"></td>
                                        <td py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
                                </tr>
                        </tbody>
                </table>
-    <h3 py:if="node.pcu_short_status != 'none'">PCU Status</h3>
+    <h3 py:if="node.pcu is not None">Controlling PCU</h3>
+               <table py:if="node.pcu is not None" id="sortable_table" class="datagrid" border="1" width="100%">
+                       <thead>
+                               <tr>
+                                       <th mochi:format="int"></th>
+                                       <th>PCU Name</th>
+                                       <th>Model</th>
+                                       <th width="80%">Test Results</th>
+                               </tr>
+                       </thead>
+                       <tbody>
+                               <?python pcu = node.pcu ?>
+                               <tr>
+                                       <td></td>
+                                       <td nowrap="true" >
+                                               <a class="ext-link" href="${plc_pcu_uri_id(pcu.plc_pcu_stats['pcu_id'])}">
+                                                       <span class="icon">${pcu_name(pcu.plc_pcu_stats)}</span>
+                                               </a>
+                                       </td>
+                                       <td py:content="pcu.plc_pcu_stats['model']"></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>
+                               </tr>
+                       </tbody>
+               </table>
     <h3>Actions Taken</h3>
   </div>
 
monitor