From d2e3e4c904bd3c74f0e6aa08ca9f4541b934f26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iva=CC=81n=20Loire?= <ivan@iloire.com>
Date: Wed, 22 Aug 2012 11:25:51 -0300
Subject: [PATCH] ping_service information column, date formatting, other minor
 bugs and improvements

---
 webserver/public/js/watchmen.js               |  2 +-
 webserver/routes/reporting.js                 |  4 ++--
 webserver/views/list.html                     | 21 +++++++++++--------
 .../views/partial/display_logs_list.html      |  5 ++++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/webserver/public/js/watchmen.js b/webserver/public/js/watchmen.js
index fb3fa304..45585052 100644
--- a/webserver/public/js/watchmen.js
+++ b/webserver/public/js/watchmen.js
@@ -51,7 +51,7 @@ var watchmen_client = {
 		//------------------------------------------
 		if (display_data.services.length){
 			$("table.sorted").tablesorter({
-				headers: {7: {sorter: 'percent'}, 8: {sorter: false}},
+				headers: {8: {sorter: 'percent'}, 9: {sorter: false}},
 				sortList: self.currentSort
 			}).bind("sortEnd", function(sorter) {
 				self.currentSort = sorter.target.config.sortList;
diff --git a/webserver/routes/reporting.js b/webserver/routes/reporting.js
index 47efa587..f7b39ce6 100644
--- a/webserver/routes/reporting.js
+++ b/webserver/routes/reporting.js
@@ -6,9 +6,9 @@ module.exports.add_routes = function (app, storage){
 	//-------------------------------
 	app.get('/details', function(req, res){
 		var max = 100;
-		var host = req.query ['host'], url = req.query ['url'], port = req.query['port'];
+		var host = req.query ['host'], service_name = req.query ['service'];
 		var service = services_loader.load_services().filter(function(service){
-			return (service.host.host == host && service.url == url && service.host.port == port);
+			return (service.host.name === host && service.name === service_name);
 		});
 		if (!service.length){
 			return res.end('not found');
diff --git a/webserver/views/list.html b/webserver/views/list.html
index 6a83be4e..9aa7e9dd 100644
--- a/webserver/views/list.html
+++ b/webserver/views/list.html
@@ -3,15 +3,15 @@
 <table class="table sorted table-striped table-condensed">
 	<thead>
 		<th width="30"></th>
+		<th width="80">Ping type</th>
 		<th>Service</th>
 		<th width="10%"><span title="Average response time (milliseconds)">AVG res. (ms)</span></th>
 		<th width="70">outages</th>
-		<th width="15%">last outage</th>
+		<th width="14%">last outage</th>
 		<th width="80">warnings</th>
-		<th width="15%">last warning</th>
-		<th width="15%">uptime</th>
-
-		<th width="100"></th>
+		<th width="14%">last warning</th>
+		<th width="14%">uptime</th>
+		<th width="60"></th>
 	</thead>
 	<tbody>
 
@@ -22,9 +22,13 @@
 			<span>{{data.status}}</span>
 		</td>
 
+		<td style="text-align:center">
+			{{ping_service_name}}
+		</td>
+
 		<td class="hosturl">
 			<a target="_blank" href="{{host.protocol}}://{{host.host}}:{{host.port}}{{url}}">
-				{{host.name}} {{url}}
+				{{host.name}} / {{name}}
 			</a>
 			<br />
 			<span title="ping interval: {{ping_interval}} seconds" class="label">{{ping_interval}}</span>
@@ -32,7 +36,7 @@
 			<span title="response limit (warning): {{warning_if_takes_more_than}} milliseconds" class="label label-warning">{{warning_if_takes_more_than}}</span>
 			{{/if}}
 
-			<span title="successful responses count: {{ok_responses_count}}" class="label label-success">{{data.ok_responses_count}}</span>
+			<span title="{{data.ok_responses_count}} successful responses" class="label label-success">{{data.ok_responses_count}}</span>
 
 			<br />
 
@@ -88,11 +92,10 @@
 		</td>
 
 		<td>
-			<a class="btn primary" href="/details?url={{url}}&host={{host.host}}&port={{host.port}}">details</a>
+			<a class="btn primary" href="/details?service={{name}}&host={{host.name}}">details</a>
 		</td>
 	</tr>
 	{{/each}}
-
 	</tbody>
 </table>
 </script>
diff --git a/webserver/views/partial/display_logs_list.html b/webserver/views/partial/display_logs_list.html
index a16a478d..b6409204 100644
--- a/webserver/views/partial/display_logs_list.html
+++ b/webserver/views/partial/display_logs_list.html
@@ -7,7 +7,10 @@ <h3><%=log_type%></h3>
 		%>
 		<tr>
 			<td>
-			<time class="timeago" datetime="<%=new Date(parseFloat(log.timestamp)).toISOString()%>"><%=new Date(parseFloat(log.timestamp)).toISOString()%></time>
+			<time class="timeago" datetime="<%=dateformat(log.timestamp)%>">
+				<%=dateformat(log.timestamp, 'ago')%><br />
+				<%=dateformat(log.timestamp, 'MMM D YYYY, hh:mm')%>
+				</time>
 			</td>
 			<td>
 				<span class="<%=log.type%>"><%=log.msg%></span>