Developing lightweight computation at the DSG edge

Commit 5afc84e9 authored by Roger Pueyo Centelles's avatar Roger Pueyo Centelles
Browse files

Merge branch 'testing' into 3.1-rc1

parents 3ee0b751 4c2f7a5f
...@@ -6,7 +6,7 @@ function do_test(ip,index,key,tool) { ...@@ -6,7 +6,7 @@ function do_test(ip,index,key,tool) {
var output = document.getElementById('output_'+index); var output = document.getElementById('output_'+index);
if (output) { if (output) {
output.innerHTML ='<%:Collecting data...%>&lt;img src="/luci-static/resources/icons/loading.gif" height="20px" alt="Loading" style="vertical-align:middle"/&gt; '; output.innerHTML ='<%:Collecting data... %><img src="/luci-static/resources/icons/loading.gif" height="20px" alt="Loading" style="vertical-align:middle"/> ';
output.style.display = 'inline'; output.style.display = 'inline';
XHR.get("/cgi-bin/tools",[ key , tool , ip] , XHR.get("/cgi-bin/tools",[ key , tool , ip] ,
function(x) { function(x) {
...@@ -19,10 +19,11 @@ function parse_result(txt) { ...@@ -19,10 +19,11 @@ function parse_result(txt) {
var t = new String(txt); var t = new String(txt);
if (t.indexOf("Cannot") >= 0) if (t.indexOf("Cannot") >= 0)
return("&lt;font color='#f00'&gt;<%:Cannot connecto to netserver%>&lt;/font&gt;"); //return("&lt;font color='#f00'&gt;<%:Cannot connecto to netserver%>&lt;/font&gt;");
return("<font color='#a00'><%:Cannot connect to netserver%></font>");
else else
return("&lt;font color='#0a0'&gt;"+txt+"&lt;/font&gt;"); //return("&lt;font color='#0a0'&gt;"+txt+"&lt;/font&gt;");
//return("<font color='#0a0'>"+txt+"</font>"); return("<font color='#050'>"+txt+"</font>");
} }
</script> </script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment