diff options
Diffstat (limited to 'src/html')
| -rw-r--r-- | src/html/js/networkDiscovery.js | 19 | ||||
| -rw-r--r-- | src/html/networkdiscovery.css | 3 | ||||
| -rw-r--r-- | src/html/networkdiscovery.html | 8 |
3 files changed, 18 insertions, 12 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>"; } ); diff --git a/src/html/networkdiscovery.css b/src/html/networkdiscovery.css index 669ad58..a111ef6 100644 --- a/src/html/networkdiscovery.css +++ b/src/html/networkdiscovery.css @@ -66,7 +66,8 @@ aside { textarea { width: 400px; - resize: none; + height: 200px; + /*resize: none;*/ } h1 { diff --git a/src/html/networkdiscovery.html b/src/html/networkdiscovery.html index f6f50e4..1f24b0d 100644 --- a/src/html/networkdiscovery.html +++ b/src/html/networkdiscovery.html @@ -5,9 +5,9 @@ <link rel="stylesheet" type="text/css" href="qrc:/html/css/jquery-ui-1.8.16.css"> <script type="text/javascript" src="qrc:/html/js/jquery-1.6.4.min.js"></script> <script type="text/javascript" src="qrc:/html/js/jquery-ui-1.8.16.min.js"></script> -<!-- <script type="text/javascript" src="qrc:/html/js/networkDiscovery.js"></script> --> - +<script type="text/javascript" src="qrc:/html/js/networkDiscovery.js"></script> +<!-- <script type="text/javascript"> var updateTips = function ( t ) { @@ -208,7 +208,7 @@ var addInterface = function (i){ }; </script> - +--> </head> <body> <header> @@ -229,7 +229,7 @@ var addInterface = function (i){ <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> + <pre id="nd_show_log_msg"></pre> </div> <!-- anchor for the abort boot dialog --> <div id="nd_abort_boot_dialog" title="Abort Boot"> |