diff options
| author | Niklas | 2011-09-22 16:47:47 +0200 |
|---|---|---|
| committer | Niklas | 2011-09-22 16:47:47 +0200 |
| commit | 627bcf0ee7e209ed59394dcec85b2cfacd8ada4b (patch) | |
| tree | e303dcb7e9f0ceaaf1249d74907cd2e694ed75ca /LogReceiver/html | |
| parent | the html gui is working now. problem solved: LogReceiver/NetworkDiscovery sta... (diff) | |
| download | fbgui-627bcf0ee7e209ed59394dcec85b2cfacd8ada4b.tar.gz fbgui-627bcf0ee7e209ed59394dcec85b2cfacd8ada4b.tar.xz fbgui-627bcf0ee7e209ed59394dcec85b2cfacd8ada4b.zip | |
added some more js functions. abortBootDialog() and chooseInterfaceDialog()
Diffstat (limited to 'LogReceiver/html')
| -rw-r--r-- | LogReceiver/html/js/nd-functions.js | 50 | ||||
| -rw-r--r-- | LogReceiver/html/networkdiscovery.html | 59 |
2 files changed, 103 insertions, 6 deletions
diff --git a/LogReceiver/html/js/nd-functions.js b/LogReceiver/html/js/nd-functions.js index ac8f273..e3ee793 100644 --- a/LogReceiver/html/js/nd-functions.js +++ b/LogReceiver/html/js/nd-functions.js @@ -1,9 +1,52 @@ +var abortBootDialog = function (m) { + $("#nd_abort_boot_msg").html(m); + $("#nd_abort_boot_dialog").dialog( + { buttons: { "Show Log": function() {fbgui.showLog(); + $(this).dialog("close");}, + "Restart": function() {fbgui.restartSystem(); + $(this).dialog("close"); }, + "Shut Down": function() { fbgui.shutDownSystem(); + $(this).dialog("close"); } + } , + minWidth: 450, + modal: true, + resizable: false, + draggable: false, + open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} + }); +}; + +var chooseInterfaceDialog = function (i) { + var cb = "<label> Choose your interface: </label>"+ + "<select>"+ + " <option>eth0</option>"+ //should look like this: " <option>"+ +"</option>"+ + " <option>eth1</option>"+ + " <option>eth2</option>"+ + "</select>"; + $("#nd_choose_interface_msg").html(cb); + $("#nd_choose_interface_dialog").dialog( + { buttons: { "Show Log": function() {fbgui.showLog(); + $(this).dialog("close");}, + "Restart": function() {fbgui.restartSystem(); + $(this).dialog("close"); }, + "Shut Down": function() { fbgui.shutDownSystem(); + $(this).dialog("close"); }, + "Continue": function() { fbgui.continueBoot(); + $(this).dialog("close"); } + } , + minWidth: 550, + modal: true, + resizable: false, + draggable: false, + open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} + }); +} + var updateStatus = function (s){ }; -var updateIfProgressBar = function (i, p){ - fbgui.notifyCall(); +var updateIfProgressBar = function (i, p){ if (p >= 0 && p <= 100){ $("#"+i+"_progress").progressbar({ value: p }); }else{ @@ -12,11 +55,10 @@ var updateIfProgressBar = function (i, p){ }; var updateIfStatus = function(i, s){ - + $("#"+i+"_status").html(s); }; var addInterface = function (i){ - fbgui.notifyCall(); $("#nd_progress_container").append( "<div class='interface'>"+ " Interface: " +i+ diff --git a/LogReceiver/html/networkdiscovery.html b/LogReceiver/html/networkdiscovery.html index 5e7aa64..ff8b587 100644 --- a/LogReceiver/html/networkdiscovery.html +++ b/LogReceiver/html/networkdiscovery.html @@ -1,5 +1,6 @@ <html> <head> +<!--qrc:/html/ is needed. otherwise qt won't find the files--> <link rel="stylesheet" type="text/css" href="qrc:/html/networkdiscovery.css"> <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> @@ -7,6 +8,50 @@ <script type="text/javascript" src="qrc:/html/js/nd-functions.js"></script> <script type="text/javascript"> +var abortBootDialog = function (m) { + $("#nd_abort_boot_msg").html(m); + $("#nd_abort_boot_dialog").dialog( + { buttons: { "Show Log": function() {fbgui.showLog(); + $(this).dialog("close");}, + "Restart": function() {fbgui.restartSystem(); + $(this).dialog("close"); }, + "Shut Down": function() { fbgui.shutDownSystem(); + $(this).dialog("close"); } + } , + minWidth: 450, + modal: true, + resizable: false, + draggable: false, + open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} + }); +}; + +var chooseInterfaceDialog = function (i) { + var cb = "<label> Choose your interface: </label>"+ + "<select>"+ + " <option>eth0</option>"+ //should look like this: " <option>"+ +"</option>"+ + " <option>eth1</option>"+ + " <option>eth2</option>"+ + "</select>"; + $("#nd_choose_interface_msg").html(cb); + $("#nd_choose_interface_dialog").dialog( + { buttons: { "Show Log": function() {fbgui.showLog(); + $(this).dialog("close");}, + "Restart": function() {fbgui.restartSystem(); + $(this).dialog("close"); }, + "Shut Down": function() { fbgui.shutDownSystem(); + $(this).dialog("close"); }, + "Continue": function() { fbgui.continueBoot(); + $(this).dialog("close"); } + } , + minWidth: 550, + modal: true, + resizable: false, + draggable: false, + open: function(event, ui) { $(".ui-dialog-titlebar-close").hide();} + }); +} + var updateStatus = function (s){ }; @@ -33,7 +78,9 @@ var addInterface = function (i){ "</div>" ); $("#"+i+"_progress").progressbar({ value: 33 }); -}; +}; + + </script> </head> @@ -43,7 +90,15 @@ var addInterface = function (i){ <div id="message"> <h1>Network Discovery</h1> </div> -<!-- .. for qt interface progress foo --> +<!-- anchor for the abort boot dialog --> +<div id="nd_abort_boot_dialog"> + <p id="nd_abort_boot_msg"> <p> +</div> +<!-- anchor for the choose interface dialog --> +<div id="nd_choose_interface_dialog"> + <p id="nd_choose_interface_msg"></p> +</div> +<!-- anchor for qt interface progress foo --> <div id="nd_progress_container"></div> <div id="container"> <div id="footer-spacer"></div> |