X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fnodescanhistory.kid;h=b85f2e9b40813b1c46e88e84454d3622f8c3624a;hb=a21f1f49c94a666768d3bce90659d4fcb0c7b180;hp=7e99d9d4f691bc3d5496e636beeb49fda865a526;hpb=71a60ab5d0fe772616f3520e3161bf602f8d5963;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/nodescanhistory.kid b/web/MonitorWeb/monitorweb/templates/nodescanhistory.kid
index 7e99d9d..b85f2e9 100644
--- a/web/MonitorWeb/monitorweb/templates/nodescanhistory.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodescanhistory.kid
@@ -1,9 +1,10 @@
 <!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'] = "MyOps Node List"
+layout_params['page_title'] = "MyOps Node Scan History"
 from monitor.util import diff_time
 from time import mktime
 from links import *
+from cherrypy import request, response
 
 ?>
 <html py:layout="'sitemenu.kid'"
@@ -15,6 +16,17 @@ from links import *
   <script type="text/javascript">
     function nodelist_paginator(opts) { plekit_table_paginator(opts, "nodelist"); }
   </script>
+  	<table width="100%">
+		<thead>
+			<tr>
+				<th><a href="${link('nodescanhistory', length=42, **params)}">Last Week</a></th>
+				<th><a href="${link('nodescanhistory', length=180, **params)}">Last Month</a></th>
+				<th><a href="${link('nodescanhistory', length=1000, **params)}">Last 1000</a></th>
+			</tr>
+		</thead>
+		<tbody>
+		<tr>
+		<td colspan="5">
 
 <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>
@@ -30,7 +42,7 @@ from links import *
     
     <tr class='search_area'><td class='search_area' colspan='10'>
         <div class='search'><fieldset>
-            <label class='search_label'> Search </label>                 
+            <label class='search_label'> Refine List </label>                 
             <input class='search_input' type='text' id='nodelist_search' 
                    onkeyup='plekit_table_filter("nodelist","nodelist_search","nodelist_search_and");'
                    size='self.search_width' maxlength='256' />                                            
@@ -50,6 +62,8 @@ from links import *
       <th class="sortable plekit_table">Stat</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 plekit_table">Last_contact</th>
   </tr>
   </thead>
@@ -64,12 +78,18 @@ from links import *
                 <td py:content="node.node.plc_node_stats['boot_state']">boot</td>
 		<td nowrap="true" py:content="node.kernel"></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>
     </tr>
 
   </tbody>  
 </table>
+		</td>
+		</tr>
+		</tbody>
+	</table>
 
 </div>
 
