cosmetic fixes

diff --git a/web/MonitorWeb/monitorweb/templates/node_template.kid b/web/MonitorWeb/monitorweb/templates/node_template.kid
index 4726525..b340bfc 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/node_template.kid
+++ b/web/MonitorWeb/monitorweb/templates/node_template.kid
@@ -6,39 +6,40 @@ from links import *
 ?>
 <span xmlns:py="http://purl.org/kid/ns#">
        <span py:if="header is not None">
 ?>
 <span xmlns:py="http://purl.org/kid/ns#">
        <span py:if="header is not None">

+                <th>ID</th>
+               <th>Hostname</th>

                <th>Site</th>
                 <th>Ping</th>
                 <th>SSH</th>
                 <th>Boot Status</th>
                <th>pcu</th>
                <th>Site</th>
                 <th>Ping</th>
                 <th>SSH</th>
                 <th>Boot Status</th>
                <th>pcu</th>

-               <th>Hostname</th>
-                <th>ID</th>

                <th>kernel</th>
                <th>last_contact</th>
        </span>
        <span py:if="node is not None">
                <th>kernel</th>
                <th>last_contact</th>
        </span>
        <span py:if="node is not None">

-               <td id="site-${node.site.status}">
-                       <a href="${link('pcuview', loginbase=node.loginbase)}">${node.loginbase}</a>
+                <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>
+               <td>
+                 <a href="${link('pcuview', loginbase=node.loginbase)}">${node.loginbase}</a>

                </td>
                 <td py:content="node.ping_status">ping</td>
                 <td py:content="node.ssh_status">ssh</td>
                 <td py:content="node.plc_node_stats['boot_state']">boot</td>
                <td width="20%" nowrap='true' align='center' id="status-${node.pcu_short_status}">
                </td>
                 <td py:content="node.ping_status">ping</td>
                 <td py:content="node.ssh_status">ssh</td>
                 <td py:content="node.plc_node_stats['boot_state']">boot</td>
                <td width="20%" nowrap='true' align='center' id="status-${node.pcu_short_status}">

-                       <div id="links">
-                               <a class="info" py:if="'error' in node.pcu_short_status" 
-                                       href="${link('pcuview', pcuid=node.plc_pcuid)}">
-                                       Error<span><pre>${node.pcu.reboot_trial_status}</pre></span></a>
-                               <a py:if="'error' not in node.pcu_short_status and 'none' not in node.pcu_short_status" 
-                                       href="${link('pcuview', pcuid=node.plc_pcuid)}"
-                                       py:content="node.pcu_short_status">Reboot Status</a>
-                               <span py:if="'none' in node.pcu_short_status" 
-                                       py:content="node.pcu_short_status">Reboot Status</span>
-                       </div>
+                 <div id="links">
+                   <a class="info" py:if="'error' in node.pcu_short_status" 
+                      href="${link('pcuview', pcuid=node.plc_pcuid)}">
+                     Error<span><pre>${node.pcu.reboot_trial_status}</pre></span></a>
+                   <a py:if="'error' not in node.pcu_short_status and 'none' not in node.pcu_short_status" 
+                      href="${link('pcuview', pcuid=node.plc_pcuid)}"
+                      py:content="node.pcu_short_status">Reboot Status</a>
+                   <span py:if="'none' in node.pcu_short_status" 
+                         py:content="node.pcu_short_status">Reboot Status</span>
+                 </div>

                </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 nowrap="true" py:content="node.kernel"></td>

-               <td py:content="diff_time(node.plc_node_stats['last_contact'])"></td>
+               <td  id="node-${node.observed_status}" py:content="diff_time(node.plc_node_stats['last_contact'])"></td>

        </span>
 </span>
        </span>
 </span>

diff --git a/web/MonitorWeb/monitorweb/templates/nodelist.kid b/web/MonitorWeb/monitorweb/templates/nodelist.kid
index a767867..a722f7e 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/nodelist.kid
+++ b/web/MonitorWeb/monitorweb/templates/nodelist.kid
@@ -22,10 +22,10 @@ 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 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-25">

   <thead>
 
   <thead>
 

-    <tr class='pagesize_area'><td class='pagesize_area' colspan='8'>
+    <tr class='pagesize_area'><td class='pagesize_area' colspan='9'>

         <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);' 
         <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);' 


@@ -35,7 +35,7 @@ from links import *
                  onmousedown='plekit_pagesize_reset("nodelist","nodelist_pagesize", 25);' />
     </fieldset></form></td></tr>                                                                        
     
                  onmousedown='plekit_pagesize_reset("nodelist","nodelist_pagesize", 25);' />
     </fieldset></form></td></tr>                                                                        
     

-    <tr class='search_area'><td class='search_area' colspan='8'>
+    <tr class='search_area'><td class='search_area' colspan='9'>

         <div class='search'><fieldset>
             <label class='search_label'> Search </label>                 
             <input class='search_input' type='text' id='nodelist_search' 
         <div class='search'><fieldset>
             <label class='search_label'> Search </label>                 
             <input class='search_input' type='text' id='nodelist_search' 


@@ -50,13 +50,13 @@ from links import *
     </fieldset></div></td></tr>
     
     <tr>
     </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">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">Hostname</th>
-      <th class="sortable plekit_table">ID</th>

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