X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fpculist.kid;h=c06717db8ba96e68e4996368685b51a692e79b41;hb=4d67defe979b409f82bbee2168bfe90ffc184867;hp=d37be12e78266df34684deb9d3b81b2dd08c7f45;hpb=8e65cdcaaf08982f5f744297c009359ec74d31b5;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/pculist.kid b/web/MonitorWeb/monitorweb/templates/pculist.kid
index d37be12..c06717d 100644
--- a/web/MonitorWeb/monitorweb/templates/pculist.kid
+++ b/web/MonitorWeb/monitorweb/templates/pculist.kid
@@ -1,15 +1,9 @@
 <!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 PCU View"
+layout_params['page_title'] = "Monitor PCU List"
 from pcucontrol.reboot import pcu_name, model_to_object
 from monitor import config
-
-def plc_site_link(pcu):
-	return "https://" + config.PLC_WEB_HOSTNAME + "/db/sites/index.php?id=" + str(pcu['site_id'])
-
-def pcu_link(pcu):
-	return "https://" + config.PLC_WEB_HOSTNAME + "/db/sites/pcu.php?id=" + str(pcu['pcu_id'])
-
+from links import *
 ?>
 <html py:layout="'sitemenu.kid'"
       xmlns:py="http://purl.org/kid/ns#"
@@ -19,11 +13,11 @@ def pcu_link(pcu):
   	<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>
@@ -35,10 +29,8 @@ def pcu_link(pcu):
 					<th mochi:format="int"></th>
 					<th mochi:format="str">Site</th>
 					<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>
@@ -46,16 +38,34 @@ def pcu_link(pcu):
 			<tbody>
 				<tr py:for="i,node in enumerate(query)" class="${i%2 and 'odd' or 'even'}" >
 					<td></td>
-					<td><a href="${plc_site_link(node.plc_pcu_stats)}">${node.loginbase}</a></td>
-					<td nowrap="true" >
-						<a href="${pcu_link(node.plc_pcu_stats)}">${pcu_name(node.plc_pcu_stats)}</a></td>
-					<td py:content="node.entry_complete"></td>
-					<td id="dns-${node.dns_status}" py:content="node.dns_status"></td>
-					<td>
+					<td nowrap='true'>
+						<div class='oneline'>
+						<a class='left' href="${link('pcuview', loginbase=node.loginbase)}">${node.loginbase}</a>
+						<a class='right' href="${plc_site_uri(node.loginbase)}">
+							<img style='display: inline' border='0' src="static/images/extlink.gif" align='right'/></a>
+						</div>
+					</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 nowrap='true'>
 						<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<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>
