add bootcd version to nodes table

diff --git a/web/MonitorWeb/monitorweb/templates/node_template.kid b/web/MonitorWeb/monitorweb/templates/node_template.kid
index b340bfc..962b72b 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/node_template.kid
+++ b/web/MonitorWeb/monitorweb/templates/node_template.kid
@@ -14,9 +14,13 @@ from links import *
                 <th>Boot Status</th>
                <th>pcu</th>
                <th>kernel</th>
+                <th>BootCD</th>
                <th>last_contact</th>
        </span>
        <span py:if="node is not None">
+<?python
+print dir(node)
+?>
                 <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>
@@ -38,8 +42,8 @@ from links import *
                          py:content="node.pcu_short_status">Reboot Status</span>
                  </div>
                </td>
-
                <td nowrap="true" py:content="node.kernel"></td>
+               <td nowrap="true" py:content="node.bootcd_version"></td>
                <td  id="node-${node.observed_status}" py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
        </span>
 </span>

diff --git a/web/MonitorWeb/monitorweb/templates/nodelist.kid b/web/MonitorWeb/monitorweb/templates/nodelist.kid
index a722f7e..62ac76c 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/nodelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodelist.kid
@@ -25,17 +25,17 @@ from links import *
 <table id="nodelist" cellpadding="0" border="0" class="plekit_table sortable-onload-2 colstyle-alt no-arrow paginationcallback-nodelist_paginator max-pages-10 paginate-25">
   <thead>
 
-    <tr class='pagesize_area'><td class='pagesize_area' colspan='9'>
+    <tr class='pagesize_area'><td class='pagesize_area' colspan='10'>
         <form class='pagesize' action='satisfy_xhtml_validator'><fieldset>
             <input class='pagesize_input' type='text' id="nodelist_pagesize" value='25'
                    onkeyup='plekit_pagesize_set("nodelist","nodelist_pagesize", 25);' 
                    size='3' maxlength='3' />                                                          
             <label class='pagesize_label'> items/page </label>                                     
             <img class='reset' src="/planetlab/icons/clear.png" alt="reset visible size"           
-                 onmousedown='plekit_pagesize_reset("nodelist","nodelist_pagesize", 25);' />
+                 onmousedown='plekit_pagesize_reset("nodelist","nodelist_pagesize", 999);' />
     </fieldset></form></td></tr>                                                                        
     
-    <tr class='search_area'><td class='search_area' colspan='9'>
+    <tr class='search_area'><td class='search_area' colspan='10'>
         <div class='search'><fieldset>
             <label class='search_label'> Search </label>                 
             <input class='search_input' type='text' id='nodelist_search' 
@@ -58,6 +58,7 @@ from links import *
       <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">Last_contact</th>
   </tr>
   </thead>

diff --git a/web/MonitorWeb/monitorweb/templates/sitelist.kid b/web/MonitorWeb/monitorweb/templates/sitelist.kid
index 9c527bf..1f218f7 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/sitelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/sitelist.kid
@@ -19,17 +19,17 @@ from links import *
 <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'>
+    <tr class='pagesize_area'><td class='pagesize_area' colspan='6'>
         <form class='pagesize' action='satisfy_xhtml_validator'><fieldset>
             <input class='pagesize_input' type='text' id="sitelist_pagesize" value='25'
                    onkeyup='plekit_pagesize_set("sitelist","sitelist_pagesize", 25);' 
                    size='3' maxlength='3' />                                                          
             <label class='pagesize_label'> items/page </label>                                     
             <img class='reset' src="/planetlab/icons/clear.png" alt="reset visible size"           
-                 onmousedown='plekit_pagesize_reset("sitelist","sitelist_pagesize", "sitelist_search_and");' />
+                 onmousedown='plekit_pagesize_reset("sitelist","sitelist_pagesize", 999);' />
     </fieldset></form></td></tr>                                                                        
     
-    <tr class='search_area'><td class='search_area' colspan='5'>
+    <tr class='search_area'><td class='search_area' colspan='6'>
         <div class='search'><fieldset>
             <label class='search_label'> Search </label>                 
             <input class='search_input' type='text' id='sitelist_search'