X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fnodelist.kid;h=2c1ae70a4169a0b509f0b4d6316b72145f66a83f;hb=3b89b6f104b7e4e93e4c32a4d188664bb6b3e34f;hp=2c3cd006f85acc516e1190de25f250e79473ceb0;hpb=79dafa3630631b247aa826590dd9daf027e21e0e;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/nodelist.kid b/web/MonitorWeb/monitorweb/templates/nodelist.kid
index 2c3cd00..2c1ae70 100644
--- a/web/MonitorWeb/monitorweb/templates/nodelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodelist.kid
@@ -1,6 +1,6 @@
 <!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 List"
+layout_params['page_title'] = "MyOps Node List"
 from monitor.util import diff_time
 from time import mktime
 from links import *
@@ -17,11 +17,12 @@ from links import *
   </script>
 
   <center>
-  <b py:content="'BOOT: %d' % len([node for node in query if node.observed_status == 'BOOT'])"></b> | 
-  <b py:content="'DOWN: %d' % len([node for node in query if node.observed_status == 'DOWN'])"></b><br/>
+  <!-- NOTE: agg.node is a FindbadNodeRecord not a HistoryNodeRecord, so there is not 'status' attribute -->
+  <!--b py:content="'UP: %d' % len([agg for agg in query if agg.node.status in ('online', 'good')])"></b> | 
+  <b py:content="'DOWN: %d' % len([agg for agg in query if agg.node.status not in ('online', 'good')])"></b><br/-->
   </center>
 
-<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">
+<table id="nodelist" cellpadding="0" border="0" class="plekit_table sortable-onload-2 colstyle-alt no-arrow paginationcallback-nodelist_paginator max-pages-10 paginate-999">
   <thead>
 
     <tr class='pagesize_area'><td class='pagesize_area' colspan='10'>
@@ -36,7 +37,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' />                                            
@@ -49,16 +50,7 @@ from links import *
     </fieldset></div></td></tr>
     
     <tr>
-      <th class="sortable plekit_table">ID</th>
-      <th class="sortable plekit_table">Hostname</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">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>
+      ${nodewidget.display(node=None, header=True)}
   </tr>
   </thead>
   <tbody>

ID	Hostname	Site	Ping	SSH	Stat	pcu	kernel	BootCD	Last_contact
@@ -36,7 +37,7 @@ from links import *
- Search + Refine List @@ -49,16 +50,7 @@ from links import *