diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css index 430664b67..f8d27dbe9 100644 --- a/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css +++ b/emhttp/plugins/dynamix.vm.manager/sheets/AddVM.css @@ -44,9 +44,11 @@ input[type=checkbox]{margin-left:0} span.width{display:inline-block;width:280px} span.column1{display:inline-block;width:140px} span.column2{display:inline-block;width:220px} -input#btnvCPUSelect{font-size:1rem;padding:5px 10px;margin:0 0 0 10px} +input#btnvCPUSelect,input.wlan0_info{font-size:1rem;padding:5px 10px;margin:0 0 0 10px} span.space{display:inline-block;width:60px} span.label{display:inline-block;width:110px;text-align:right} +span.ipvtap{margin-left:25px;font-family:bitstream} +div.wlan0{text-align:left} select.narrow{min-width:90px!important} select.second{margin-left:12px;max-width:90px;margin-right:0} input.trim{width:98px;min-width:98px} diff --git a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css index 430664b67..38eec7d40 100644 --- a/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css +++ b/emhttp/plugins/dynamix.vm.manager/sheets/UpdateVM.css @@ -44,11 +44,13 @@ input[type=checkbox]{margin-left:0} span.width{display:inline-block;width:280px} span.column1{display:inline-block;width:140px} span.column2{display:inline-block;width:220px} -input#btnvCPUSelect{font-size:1rem;padding:5px 10px;margin:0 0 0 10px} +input#btnvCPUSelect,input.wlan0_info{font-size:1rem;padding:5px 10px;margin:0 0 0 10px} span.space{display:inline-block;width:60px} span.label{display:inline-block;width:110px;text-align:right} +span.ipvtap{margin-left:25px;font-family:bitstream} select.narrow{min-width:90px!important} select.second{margin-left:12px;max-width:90px;margin-right:0} +div.wlan0{text-align:left} input.trim{width:98px;min-width:98px} input.second{margin-left:8px} .autostart~.switch-button-background{margin-top:8px!important;margin-left:0!important} diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php index cf71eb4aa..6c41e5a15 100644 --- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php +++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php @@ -1504,7 +1504,7 @@ foreach ($arrConfig['nic'] as $i => $arrNic) { } $wlan0_hidden = $arrNic['network'] == 'wlan0' ? '' : 'hidden'; ?> - _(Requires static IP assignment on the VM and manual configuration of the ipvtap interface)_ + _(Requires further manual configuration)_ @@ -1576,7 +1576,7 @@ foreach ($arrConfig['nic'] as $i => $arrNic) { foreach ($arrValidNetworks[$key] as $strNetwork) echo mk_option($domain_bridge, $strNetwork, $strNetwork); } ?> - + @@ -2203,6 +2203,17 @@ function ProtocolChange(protocol) { } } +function wlan0_info() { + swal({ + title:"_(Manual Configuration Required)_", + text:"
_(Configure the VM with a static IP address)_

_(Only one VM can be active at the time)_

_(Configure the same IP address on the ipvtap interface)_
ip addr add IP-ADDRESS dev shim-wlan0
", + html:true, + animation:"none", + type:"info", + confirmButtonText:"_(Ok)_" + }); +} + $(function() { function completeAfter(cm, pred) { var cur = cm.getCursor(); @@ -2576,7 +2587,7 @@ $(function() { try { vmrc_window.focus(); } catch (e) { - swal({title:"_(Browser error)_",text:"_(Pop-up Blocker is enabled! Please add this site to your exception list)_",type:"warning",confirmButtonText:"_(Ok)_"},function(){ done() }); + swal({title:"_(Browser error)_",text:"_(Pop-up Blocker is enabled! Please add this site to your exception list)_",type:"warning",confirmButtonText:"_(Ok)_"},function(){done();}); return; } }