From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Mon, 12 Sep 2011 13:05:40 +0000 (+0000)
Subject: use the json data url as id
X-Git-Tag: v0.8.0.5~676
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=5d4d5f1dc28920d93759d85e8f23174ba4cf62ed

use the json data url as id
---

diff --git a/NEWS b/NEWS
index 4e3473b..b634772 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+* v0.6.2.11
+** psensor-server/web interface: use jqplot default css.
+
 * v0.6.2.10
 ** psensor-server: added network, cpu load and memory information in
    JSON web interface.
diff --git a/www/details.html b/www/details.html
index 1eff2b9..aa7603d 100644
--- a/www/details.html
+++ b/www/details.html
@@ -18,7 +18,7 @@
           var url_id = params["id"];
 
 
-          $.getJSON("/api/1.0/sensors/"+url_id, function(data) {
+          $.getJSON(url_id, function(data) {
               var measures = data["measures"];
               var data_chart = [];
 
diff --git a/www/monitor.html b/www/monitor.html
index ce33104..c8a3017 100644
--- a/www/monitor.html
+++ b/www/monitor.html
@@ -23,7 +23,7 @@
 
                   $("#sensors").append("<tr>"
 	                               +"<td>"
-	                               +"<a href='details.html?id="+escape(item["id"])
+	                               +"<a href='details.html?id="+escape("/api/1.0/sensors/"+item["id"])
                                        +"'>"+sname+"</a></td>"
 	                               +"<td>"+svalue+unit+"</td><td>"+smin+unit+"</td><td>"+smax+unit+"</td><td>"+stype_str+"</td></tr>");                 
               });