diff options
author | Niklas | 2011-10-05 17:39:35 +0200 |
---|---|---|
committer | Niklas | 2011-10-05 17:39:35 +0200 |
commit | be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95 (patch) | |
tree | c52ed62bb40ad926271f0637f9a29aee2889543c /LogReceiver/html/networkdiscovery.html | |
parent | tried to solve the timing problem. but failed. it is also enough to test for ... (diff) | |
download | fbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.tar.gz fbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.tar.xz fbgui-be915d3cfcc639d6303bf8bc0e5ad825e0ef2f95.zip |
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)
Diffstat (limited to 'LogReceiver/html/networkdiscovery.html')
-rw-r--r-- | LogReceiver/html/networkdiscovery.html | 30 |
1 files changed, 24 insertions, 6 deletions
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){ <section> <!-- Main content area --> <p>test</p> + <!-- anchor for the show log dialog --> + <div id="nd_show_log_dialog" title="Log File"> + <textarea id="nd_show_log_msg"></textarea> + </div> <!-- anchor for the abort boot dialog --> - <div id="nd_abort_boot_dialog"> + <div id="nd_abort_boot_dialog" title="Abort Boot"> <p id="nd_abort_boot_msg"> <p> </div> <!-- anchor for the choose interface dialog --> - <div id="nd_choose_interface_dialog"> + <div id="nd_choose_interface_dialog" title="Choose your Interface"> <p id="nd_choose_interface_msg"></p> </div> <!-- anchor for the manual configuration dialog --> - <div id="nd_manual_configuration_dialog"> + <div id="nd_manual_configuration_dialog" title="Manual Configuration"> <p id="nd_manual_configuration_msg"></p> <p class="validateTips">All form fields are required.</p> <form> |