git://git.onelab.eu / monitor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added httpd/conf.d/monitorweb.conf to /etc/plc.d/monitor.init
[monitor.git] / web / MonitorWeb / monitorweb / templates / nodelist.kid
diff --git a/web/MonitorWeb/monitorweb/templates/nodelist.kid b/web/MonitorWeb/monitorweb/templates/nodelist.kid
index dc3bf92..c9ec477 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/nodelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodelist.kid
@@ -1,9 +1,12 @@
 <!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"
+from monitor.util import diff_time
+from time import mktime
 ?>
 <html py:layout="'sitemenu.kid'"
-      xmlns:py="http://purl.org/kid/ns#">
+      xmlns:py="http://purl.org/kid/ns#"
+         xmlns:mochi="http://www.mochi.org">
 
   <div py:match="item.tag == 'content'">
        <table width="100%">
@@ -20,12 +23,14 @@ layout_params['page_title'] = "Monitor Node View"
                <tbody>
                <tr>
                <td colspan="5">
-               <table border="1">
+               <table id="sortable_table" class="datagrid" border="1" width="100%">
                        <thead>
                                <tr>
+                                       <th mochi:format="int"></th>
+                                       <th mochi:format="str">Site</th>
                                        <th>Hostname</th>
                                        <th>ping</th>
-                                       <th>ssh</th>
+                                       <!--th>ssh</th-->
                                        <th>pcu</th>
                                        <th>status</th>
                                        <th>kernel</th>
@@ -34,13 +39,15 @@ layout_params['page_title'] = "Monitor Node View"
                        </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 py:content="node.pcu_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="node.plc_node_stats['last_contact']"></td>
+                                 <td py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
                                </tr>
                        </tbody>
                </table>
monitor