From e942d5d431346439533910bf649b10ec17463c03 Mon Sep 17 00:00:00 2001 From: Niklas Date: Tue, 25 Oct 2011 18:57:40 +0200 Subject: fixed some bugs. show log screen is now bigger and opens a scrollbar automatically. debug screens added. fixed continue in debug mode, added progress indicator for all screens. --- src/html/js/networkDiscovery.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'src/html/js/networkDiscovery.js') diff --git a/src/html/js/networkDiscovery.js b/src/html/js/networkDiscovery.js index f26385b..1057bd7 100644 --- a/src/html/js/networkDiscovery.js +++ b/src/html/js/networkDiscovery.js @@ -1,3 +1,9 @@ +var hideProgressIndicator = function () { + $("#ajaxBusy").hide(); +}; + + + var updateTips = function ( t ) { $( ".validateTips" ) .text( t ) @@ -39,10 +45,16 @@ var checkRegexp = function ( o, regexp, n ) { var showLog = function (t) { $("#nd_show_log_msg").html(t); //$("#nd_show_log_msg").attr('readonly','readonly'); + $('#nd_show_log_dialog').resizable("enable"); $("#nd_show_log_dialog").dialog( - { minWidth: 450, + { minWidth: 600, + maxHeight: 400, modal: true, - draggable: false + draggable: false, + closeOnEscape: false, + open: function(event, ui) { + $(this).css({'max-height': 400, 'overflow-y': 'auto'}); + }, }); }; @@ -152,6 +164,7 @@ var ip4_manualConfigurationDialog = function () { modal: true, resizable: false, draggable: false, + closeOnEscape: false, close: function() {allFields.val("").removeClass("ui-state-error");}, open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} }); @@ -180,6 +193,7 @@ var abortBootDialog = function (m) { modal: true, resizable: false, draggable: false, + closeOnEscape: false, open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} }); }; @@ -217,6 +231,7 @@ var chooseInterfaceDialog = function (i) { modal: true, resizable: false, draggable: false, + closeOnEscape: false, open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} }); } @@ -246,6 +261,7 @@ var updateIfStatus = function(i, s){ var addInterface = function (i){ + hideProgressIndicator(); $("#nd_progress_container").append( "
"+ " Interface: " +i+ @@ -254,7 +270,7 @@ var addInterface = function (i){ " style='height: 10px;'>
"+ "" ); - $("#"+i+"_progress").progressbar({ value: 33 }); + //$("#"+i+"_progress").progressbar({ value: 33 }); }; -- cgit v1.2.3-55-g7522