From a8a98b431d2ed4f50141e1b0c14b7799992efbd2 Mon Sep 17 00:00:00 2001 From: Digimer Date: Mon, 12 Jun 2017 15:44:23 -0400 Subject: [PATCH] * Updated the jquery to read in translated strings and to display the link speed. Signed-off-by: Digimer --- cgi-bin/words.xml | 4 ++++ html/skins/alteeve/main.html | 5 ++++- html/skins/alteeve/main.js | 7 +++++-- tools/scancore-update-states | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cgi-bin/words.xml b/cgi-bin/words.xml index 8bb1d2e5..c65085d3 100644 --- a/cgi-bin/words.xml +++ b/cgi-bin/words.xml @@ -25,6 +25,10 @@ This is the AN::Tools master 'words' file. Link State Link Speed (Mbps) + + Up + Down + Mbps diff --git a/html/skins/alteeve/main.html b/html/skins/alteeve/main.html index 0d06e7e6..387eab11 100644 --- a/html/skins/alteeve/main.html +++ b/html/skins/alteeve/main.html @@ -71,7 +71,10 @@ - + +
#!string!js_0001!#
+
#!string!js_0002!#
+
#!string!js_0003!#
diff --git a/html/skins/alteeve/main.js b/html/skins/alteeve/main.js index ce2ac422..d5b46824 100644 --- a/html/skins/alteeve/main.js +++ b/html/skins/alteeve/main.js @@ -1,6 +1,8 @@ $(function() { - var say_up = "Up"; - var say_down = "Down"; + var say_up = $("#say_up").text(); + var say_down = $("#say_down").text(); + var say_speed_suffix = $("#say_speed_suffix").text(); + console.log('say_up: ['+say_up+'], say_down: ['+say_down+'], say_speed_suffix: ['+say_speed_suffix+']'); if($("#network_status").length) { //alert('network status exists.'); $.getJSON('/status/network.json', { get_param: 'value' }, function(data) { @@ -12,6 +14,7 @@ $(function() { } $("#"+element.name+"_mac").text(element.mac); $("#"+element.name+"_link").text(link); + $("#"+element.name+"_speed").text(element.speed+' '+say_speed_suffix); }); }); } diff --git a/tools/scancore-update-states b/tools/scancore-update-states index 040562a8..05be1811 100755 --- a/tools/scancore-update-states +++ b/tools/scancore-update-states @@ -84,7 +84,7 @@ sub report_network ### TODO: Set the 'status/network.xml' and 'status/network.json' names into 'striker.conf' # Write the JSON file. my $output_json = $an->data->{path}{directories}{html}."/status/network.json"; - $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { output_xml => $output_json }}); + $an->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { output_xml => $output_json }}); $an->Storage->write_file({ file => $output_json, body => $network_json,