From be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95 Mon Sep 17 00:00:00 2001 From: Niklas Date: Wed, 5 Oct 2011 17:39:35 +0200 Subject: modified the check for carrier signal. on autoUp==true: if no interface is in running state, the app will check the state of the interface several times (can be specified by us with the _ifUpCountdown value) --- LogReceiver/html/networkdiscovery.html | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'LogReceiver/html/networkdiscovery.html') diff --git a/LogReceiver/html/networkdiscovery.html b/LogReceiver/html/networkdiscovery.html index 1f6125a..6d370d1 100644 --- a/LogReceiver/html/networkdiscovery.html +++ b/LogReceiver/html/networkdiscovery.html @@ -41,6 +41,17 @@ var checkRegexp = function ( o, regexp, n ) { } }; +var showLog = function (t) { + $("#nd_show_log_msg").val(t); + $("#nd_show_log_msg").attr('readonly','readonly'); + $("#nd_show_log_dialog").dialog( + { minWidth: 450, + modal: true, + resizable: false, + draggable: false + }); +}; + var ip4_manualConfigurationDialog = function () { var jsonArr = fbgui.getManualConfInterfaces(); //jsonArr = eval('(' + jsonArr + ')'); @@ -116,7 +127,9 @@ var abortBootDialog = function (m) { $("#nd_abort_boot_dialog").dialog( { buttons: { "Manual Configure": function() { ip4_manualConfigurationDialog();}, - "Show Log": function() {fbgui.showLog(); + "Show Log": function() { + var text = fbgui.readLogFile(); + showLog(text); $(this).dialog("close");}, "Restart": function() {fbgui.restartSystem(); $(this).dialog("close"); }, @@ -144,8 +157,9 @@ var chooseInterfaceDialog = function (i) { $("#nd_choose_interface_dialog").dialog( { buttons: { "Manual Configure": function() { ip4_manualConfigurationDialog();}, - "Show Log": function() {fbgui.showLog(); - $(this).dialog("close");}, + "Show Log": function() { + var text = fbgui.readLogFile(); + showLog(text);}, "Restart": function() {fbgui.restartSystem(); $(this).dialog("close"); }, "Shut Down": function() { fbgui.shutDownSystem(); @@ -212,16 +226,20 @@ var addInterface = function (i){

test

+ +
+ +
-
+

-
+

-
+

All form fields are required.

-- cgit v1.2.3-55-g7522