put the NetworkDiscovery code into the src folder of the fbgui. made some test, building a usb stick iso and running it on a maschine. did some bug fixes

1 files changed, 12 insertions, 7 deletions

diff --git a/src/html/js/networkDiscovery.js b/src/html/js/networkDiscovery.js
index 2200d82..1d67eac 100644
--- a/src/html/js/networkDiscovery.js
+++ b/src/html/js/networkDiscovery.js
@@ -31,20 +31,23 @@ 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_msg").html(t);  
+  //$("#nd_show_log_msg").attr('readonly','readonly');
   $("#nd_show_log_dialog").dialog(
     { minWidth: 450, 
       modal: true,
-      resizable: false,
       draggable: false
     });
 };
 
+var getInterfaceConf = function (i) {
+  var n = i.options[i.selectedIndex].text();
+};
+
 var ip4_manualConfigurationDialog = function () {
   var jsonArr = fbgui.getManualConfInterfaces();
   //jsonArr = eval('(' + jsonArr + ')');
-  var c = "<select name='nd_mc_ifname_select' id='nd_mc_ifname_select'>";
+  var c = "<select name='nd_mc_ifname_select' id='nd_mc_ifname_select' onChange='getInterfaceConf(this)'>";
   if(jsonArr == "") {
     c += "<option>NO INTERFACE</option>";
   } else {
@@ -118,12 +121,13 @@ var abortBootDialog = function (m) {
                    ip4_manualConfigurationDialog();}, 
                  "Show Log": function() {
                    var text = fbgui.readLogFile(); 
-                   showLog(text);
-                   $(this).dialog("close");}, 
+                   showLog(text);}, 
                  "Restart": function() {fbgui.restartSystem();
                    $(this).dialog("close"); },
                  "Shut Down": function() { fbgui.shutDownSystem(); 
-                   $(this).dialog("close"); } 
+                   $(this).dialog("close"); },
+		 "Try Again": function() {fbgui.tryAgain();
+                   $(this).dialog("close"); }
                } ,
       minWidth: 450, 
       modal: true,
@@ -137,6 +141,7 @@ var chooseInterfaceDialog = function (i) {
   var cb = "<label> Choose your interface: </label>"+
            "<select id='nd_ifName_select'>";
   jQuery.each(i, function() {
+		   updateIfProgressBar(this, 100);
                    cb += "  <option>"+ this +"</option>";
                  }
   );