X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=web%2FMonitorWeb%2Fmonitorweb%2Ftemplates%2Fpcuview.kid;h=bd6fa58e09e27f723440b7566dab5bb3f97bed14;hb=32e64e33bc81735e22024c5a44510848bb3c88df;hp=b3aa16d2e0b1ed845d47b1fd08d58f27bbccfffe;hpb=5c41a475f7d198274e46f2c5e6f033f06794288b;p=monitor.git

diff --git a/web/MonitorWeb/monitorweb/templates/pcuview.kid b/web/MonitorWeb/monitorweb/templates/pcuview.kid
index b3aa16d..bd6fa58 100644
--- a/web/MonitorWeb/monitorweb/templates/pcuview.kid
+++ b/web/MonitorWeb/monitorweb/templates/pcuview.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 PCU View"
+layout_params['page_title'] = "MyOps Detail View"
 from monitor.util import diff_time
 from monitor import config
 from time import mktime
@@ -76,7 +76,7 @@ from links import *
 			</tbody>
 		</table>
 	<div class="oneline" id="legend" py:if="len(pcuquery) == 0">
-		<em>There no PCUs associated with this host.</em>
+		<em>There are no PCUs associated with this host.</em>
 	</div>
 	<div class="oneline" id="legend" py:if="len(pcuquery) > 0">
 		<em>Legend: </em>
@@ -143,12 +143,13 @@ from links import *
 			<thead>
 				<tr>
 					<th mochi:format="int"></th>
-					<th>History</th>
+					<th>History (scan)</th>
 					<th>Hostname</th>
-					<th>last_contact</th>
+					<th>DNS</th>
+					<th>last_contact (cached)</th>
 					<th>last_checked</th>
 					<th nowrap='true'>Port Status</th>
-					<th></th>
+					<th>Filter</th>
 					<th></th>
 					<th></th>
 				</tr>
@@ -156,17 +157,20 @@ from links import *
 			<tbody>
 				<tr py:for="i,agg in enumerate(nodequery)" class="${i%2 and 'odd' or 'even'}" >
 					<td></td>
-					<td><a href="nodehistory?hostname=${agg.node.hostname}">history</a></td>
+					<td><a href="nodehistory?hostname=${agg.node.hostname}">status</a>
+						(<a href="nodescanhistory?hostname=${agg.node.hostname}">scan</a>) history</td>
 					<td id="node-${agg.node.observed_status}" nowrap="true" >
 						<a class="ext-link" href="${plc_node_uri_id(agg.node.plc_node_stats['node_id'])}">
 							<span class="icon">${agg.node.hostname}</span></a>
 					</td>
+					<td py:content="agg.node.external_dns_status"></td>
 					<td py:content="diff_time(agg.node.plc_node_stats['last_contact'])"></td>
 					<td py:content="diff_time(mktime(agg.node.date_checked.timetuple()))"></td>
 					<td>
 						<span py:for="port,state in agg.ports" 
 						id="port${state}" py:content="'%s, ' % port">80</span>
 					</td>
+					<td py:content="agg.node.firewall"></td>
 					<td>
 						<!-- TODO: add some values/code to authenticate the operation.  -->
 	  					<!--form action="${link('pcuview', hostname=agg.node.hostname)}" name="externalscan${i}" method='post'>
@@ -200,7 +204,7 @@ from links import *
 		<div id="status_block" class="flash"
             py:if="value_of('tg_flash', None)" py:content="tg_flash"></div>
 
-	<h4>Actions Over the Last Week</h4>
+	<h4>Actions Over the Last ${since} Days</h4>
 		<p py:if="actions and len(actions) == 0">
 			There are no recent actions taken for this site.
 		</p>
@@ -231,7 +235,7 @@ from links import *
 					<td py:content="act.action_type"></td>
 					<td><a class="ext-link" href="${plc_mail_uri(act.message_id)}">
 							<span py:if="act.message_id != 0" class="icon">${act.message_id}</span></a></td>
-					<td py:if="'bootmanager' in act.action_type">
+					<td py:if="'bootmanager' in act.action_type or 'unknown' in act.action_type">
 						<a href="/monitorlog/bm.${act.hostname}.log">latest bm log</a>
 					</td>
 					<td py:if="'bootmanager' not in act.action_type">
