- no alternate colors for tables

- show node id in nodelist

diff --git a/web/MonitorWeb/monitorweb/templates/node_template.kid b/web/MonitorWeb/monitorweb/templates/node_template.kid
index e067596..4726525 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/node_template.kid
+++ b/web/MonitorWeb/monitorweb/templates/node_template.kid
@@ -12,6 +12,7 @@ from links import *
                 <th>Boot Status</th>
                <th>pcu</th>
                <th>Hostname</th>
                 <th>Boot Status</th>
                <th>pcu</th>
                <th>Hostname</th>

+                <th>ID</th>

                <th>kernel</th>
                <th>last_contact</th>
        </span>
                <th>kernel</th>
                <th>last_contact</th>
        </span>


@@ -36,6 +37,7 @@ from links import *
                </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>
                <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>
        </span>
                <td nowrap="true" py:content="node.kernel"></td>
                <td py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
        </span>

diff --git a/web/MonitorWeb/monitorweb/templates/nodelist.kid b/web/MonitorWeb/monitorweb/templates/nodelist.kid
index fdb4536..a767867 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/nodelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodelist.kid
@@ -22,7 +22,7 @@ from links import *
   <b py:content="'BOOT-REINSTALL: %d' % len([node for node in query if node.plc_node_stats['boot_state'] == 'reinstall'])"></b><br/>
   </center>
 
   <b py:content="'BOOT-REINSTALL: %d' % len([node for node in query if node.plc_node_stats['boot_state'] == 'reinstall'])"></b><br/>
   </center>
 

-<table id="nodelist" cellpadding="0" border="0" class="plekit_table sortable-onload-0 rowstyle-alt colstyle-alt no-arrow paginationcallback-nodelist_paginator max-pages-10 paginate-25">
+<table id="nodelist" cellpadding="0" border="0" class="plekit_table sortable-onload-0 colstyle-alt no-arrow paginationcallback-nodelist_paginator max-pages-10 paginate-25">

   <thead>
 
     <tr class='pagesize_area'><td class='pagesize_area' colspan='8'>
   <thead>
 
     <tr class='pagesize_area'><td class='pagesize_area' colspan='8'>


@@ -53,11 +53,12 @@ from links import *
       <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">Site</th>
       <th class="sortable plekit_table">Ping</th>
       <th class="sortable plekit_table">SSH</th>

-      <th class="sortable plekit_table">Status</th>
+      <th class="sortable plekit_table">Stat</th>

       <th class="sortable plekit_table">pcu</th>
       <th class="sortable plekit_table">Hostname</th>
       <th class="sortable plekit_table">pcu</th>
       <th class="sortable plekit_table">Hostname</th>

+      <th class="sortable plekit_table">ID</th>

       <th class="sortable plekit_table">kernel</th>
       <th class="sortable plekit_table">kernel</th>

-      <th class="sortable plekit_table">last_contact</th>
+      <th class="sortable plekit_table">Last_contact</th>

   </tr>
   </thead>
   <tbody>
   </tr>
   </thead>
   <tbody>

diff --git a/web/MonitorWeb/monitorweb/templates/pculist.kid b/web/MonitorWeb/monitorweb/templates/pculist.kid
index a038532..debed84 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/pculist.kid
+++ b/web/MonitorWeb/monitorweb/templates/pculist.kid
@@ -17,7 +17,7 @@ from links import *
     function pculist_paginator(opts) { plekit_table_paginator(opts, "pculist"); }
   </script>
 
     function pculist_paginator(opts) { plekit_table_paginator(opts, "pculist"); }
   </script>
 

-<table id="pculist" cellpadding="0" border="0" class="plekit_table sortable-onload-0 rowstyle-alt colstyle-alt no-arrow paginationcallback-pculist_paginator max-pages-10 paginate-25">
+<table id="pculist" cellpadding="0" border="0" class="plekit_table sortable-onload-0 colstyle-alt no-arrow paginationcallback-pculist_paginator max-pages-10 paginate-25">

   <thead>
 
     <tr class='pagesize_area'><td class='pagesize_area' colspan='5'>
   <thead>
 
     <tr class='pagesize_area'><td class='pagesize_area' colspan='5'>


@@ -54,7 +54,7 @@ from links import *
     </tr>
   </thead>
   <tbody>
     </tr>
   </thead>
   <tbody>

-    <tr py:for="i,node in enumerate(query)" class="${i%2 and 'odd' or 'even'}" >
+    <tr py:for="i,node in enumerate(query)">

       <td nowrap='true'>
        <div class='oneline'>
          <a class='left' href="${link('pcuview', loginbase=node.loginbase)}">${node.loginbase}</a>
       <td nowrap='true'>
        <div class='oneline'>
          <a class='left' href="${link('pcuview', loginbase=node.loginbase)}">${node.loginbase}</a>

diff --git a/web/MonitorWeb/monitorweb/templates/sitelist.kid b/web/MonitorWeb/monitorweb/templates/sitelist.kid
index 358b1b0..9c527bf 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/sitelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/sitelist.kid
@@ -16,7 +16,7 @@ from links import *
     function sitelist_paginator(opts) { plekit_table_paginator(opts, "sitelist"); }
   </script>
 
     function sitelist_paginator(opts) { plekit_table_paginator(opts, "sitelist"); }
   </script>
 

-<table id="sitelist" cellpadding="0" border="0" class="plekit_table sortable-onload-0 rowstyle-alt colstyle-alt no-arrow paginationcallback-sitelist_paginator max-pages-10 paginate-25">
+<table id="sitelist" cellpadding="0" border="0" class="plekit_table sortable-onload-0 colstyle-alt no-arrow paginationcallback-sitelist_paginator max-pages-10 paginate-25">

   <thead>
 
     <tr class='pagesize_area'><td class='pagesize_area' colspan='5'>
   <thead>
 
     <tr class='pagesize_area'><td class='pagesize_area' colspan='5'>