many improvements.

[monitor.git] / web / MonitorWeb / monitorweb / templates / pculist.kid

diff --git a/web/MonitorWeb/monitorweb/templates/pculist.kid b/web/MonitorWeb/monitorweb/templates/pculist.kid
index 510218e..99ad41a 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/pculist.kid
+++ b/web/MonitorWeb/monitorweb/templates/pculist.kid
@@ -13,11 +13,11 @@ from links import *
        <table id="sub-table" width="100%">
                <thead>
                        <tr>
-                               <th><a href="${tg.url('pcu', filter='ok')}">Ok(${fc['ok']})</a></th>
-                               <th><a href="${tg.url('pcu', filter='Not_Run')}">Misconfigured(${fc['Not_Run']})</a></th>
-                               <th><a href="${tg.url('pcu', filter='NetDown')}">Offline(${fc['NetDown']})</a></th>
-                               <th><a href="${tg.url('pcu', filter='pending')}">Runtime Error(${fc['pending']})</a></th>
-                               <th><a href="${tg.url('pcu', filter='all')}">All</a></th>
+                               <th><a href="${link('pcu', filter='ok')}">Ok(${fc['ok']})</a></th>
+                               <th><a href="${link('pcu', filter='Not_Run')}">Misconfigured(${fc['Not_Run']})</a></th>
+                               <th><a href="${link('pcu', filter='NetDown')}">Offline(${fc['NetDown']})</a></th>
+                               <th><a href="${link('pcu', filter='pending')}">Runtime Error(${fc['pending']})</a></th>
+                               <th><a href="${link('pcu', filter='all')}">All</a></th>
                        </tr>
                </thead>
                <tbody>
@@ -31,8 +31,8 @@ from links import *
                                        <th>PCU Name</th>
                                        <th>Missing Fields</th>
                                        <th>DNS Status</th>
-                                       <th>Port Status</th>
-                                       <th width="80%">Test Results</th>
+                                       <th nowrap='true' >Port Status</th>
+                                       <th nowrap='true' width="80%">Test Results</th>
                                        <th>Model</th>
                                        <th>Nodes</th>
                                </tr>
@@ -40,16 +40,30 @@ from links import *
                        <tbody>
                                <tr py:for="i,node in enumerate(query)" class="${i%2 and 'odd' or 'even'}" >
                                        <td></td>
-                                       <td><a href="${plc_site_link_id(node.plc_pcu_stats['site_id'])}">${node.loginbase}</a></td>
-                                       <td nowrap="true" >
-                                               <a href="${plc_pcu_link_id(node.plc_pcu_stats['pcu_id'])}">${pcu_name(node.plc_pcu_stats)}</a></td>
+                                       <td><a href="${link('siteview', loginbase=node.loginbase)}">${node.loginbase}</a></td>
+                                       <td nowrap='true'>
+                                               <div class='oneline'>
+                                               <a class='left' href="${link('pcuview', pcuid=node.plc_pcuid)}">${pcu_name(node.plc_pcu_stats)}</a>
+                                               <a class='right' href="${plc_pcu_uri_id(node.plc_pcu_stats['pcu_id'])}">
+                                                       <img style='display: inline' border='0' src="static/images/extlink.gif" align='right'/></a>
+                                               </div>
+                                       </td>
                                        <td py:content="node.entry_complete"></td>
                                        <td id="dns-${node.dns_status}" py:content="node.dns_status"></td>
                                        <td>
                                                <span py:for="port,state in node.ports" 
                                                id="port${state}" py:content="'%s, ' % port">80</span>
                                        </td>
-                                       <td width="40" id="status-${node.status}" py:content="node.reboot_trial_status"></td>
+                                       <td width="20%" nowrap='true' align='center' id="status-${node.status}">
+                                               <div id="links">
+                                               <a class="info" py:if="'error' in node.status" 
+                                                       href="${link('pcuview', pcuid=node.plc_pcuid)}">
+                                                       Error Message<span><pre>${node.reboot_trial_status}</pre></span></a>
+                                               <a py:if="'error' not in node.status" 
+                                                       href="${link('pcuview', pcuid=node.plc_pcuid)}"
+                                                       py:content="node.status">Reboot Status</a>
+                                               </div>
+                                       </td>
                                        <td py:content="node.plc_pcu_stats['model']"></td>
                                        <td py:content="len(node.plc_pcu_stats['node_ids'])"></td>
                                </tr>