mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-13 22:40:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:limetech/dynamix-6.2

Browse Source
This commit is contained in:
Eric Schultz
2016-06-06 08:11:18 -07:00
parent 62aef72408 1414f7088a
commit 6061c4f72a
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/dynamix/Eth0.page
View File

@@ -45,8 +45,9 @@ foreach ($ports as $port) {
$build = true;
}
}
// enable interface only when VMs are stopped
$disabled = (file_exists('/var/run/libvirt/libvirt-sock') && exec("virsh list|grep -om1 running")) ? 'disabled' : '';
// enable interface only when VMs and Docker are stopped
$service = exec("pgrep libvirt") ? 'VMs' : '';
$service .= exec("pgrep docker") ? ($service ? ' and ' : '').'Docker' : '';
// get VLAN interfaces
$vlan_eth0 = [0];
@@ -224,7 +225,7 @@ function checkPort() {
$(function() {
var ctrl = "<span id='wait_eth0' class='status red' style='display:none;font-size:small;font-style:italic'>Please wait... configuring interfaces</span>";
var form = document.eth0_settings;
<?if ($tabbed && !$disabled):?>
<?if ($tabbed && !$service):?>
$('#tab1').bind({click:function(){
$('#bond0').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:131});
$('#bridge0').dropdownchecklist('destroy').dropdownchecklist({emptyText:'None', width:131});
@@ -236,7 +237,7 @@ $(function() {
checkBridgingSettings(form,0);
checkNetworkAccess(form,'eth0');
checkNetworkSettings(form);
<?if ($disabled):?>
<?if ($service):?>
disableForm(form);
$('#bond0').dropdownchecklist('disable');
$('#bridge0').dropdownchecklist('disable');
@@ -415,12 +416,12 @@ Enable VLANs:
<?=mk_option($eth0['TYPE'], 'access', 'No');?>
<?=mk_option($eth0['TYPE'], 'trunk', 'Yes');?>
</select>
<span class="access-eth0 pin" title="Add VLAN" style="display:none" onclick="addVLAN('eth0',<?=$disabled?'true':'false'?>)"><i class="fa fa-plus-circle green"></i><em>press to add VLAN</em></span>
<span class="access-eth0 pin" title="Add VLAN" style="display:none" onclick="addVLAN('eth0',<?=$service?'true':'false'?>)"><i class="fa fa-plus-circle green"></i><em>press to add VLAN</em></span>
<?else:?>
<div class="access-eth0 shade-<?=$display['theme']?>" style="display:none" markdown="1">
VLAN number:
: <input type="number" name="VLANID:<?=$i?>" min="1" max="4095" value="<?=$eth0["VLANID:$i"]?>" class="narrow" required>
<span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-eth0-<?=$i?>'),<?=$disabled?'true':'false'?>)"><i class="fa fa-minus-circle red"></i><em>press to remove VLAN</em></span>
<span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-eth0-<?=$i?>'),<?=$service?'true':'false'?>)"><i class="fa fa-minus-circle red"></i><em>press to remove VLAN</em></span>
> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
@@ -521,5 +522,5 @@ Network mask:
</script>
&nbsp;
: <input type="submit" value="Apply" onclick="$('#wait_eth0').show()"><input type="button" value="Done" onclick="done()"><?=$disabled ? "VMs must be <b>STOPPED</b> to change" : ""?>
: <input type="submit" value="Apply" onclick="$('#wait_eth0').show()"><input type="button" value="Done" onclick="done()"><?=$service ? "$service must be <b>STOPPED</b> to change" : ""?>
</form>

8
plugins/dynamix/EthX.page
View File

@@ -28,8 +28,8 @@ $bond_ethX = $eth0['BONDING']=='yes' ? in_array('ethX',explode(',',$eth0['BONDNI
// get bridge membership
$bridge_ethX = $eth0['BRIDGING']=='yes' ? in_array('ethX',explode(',',$eth0['BRNICS'])) : false;
if ($disabled)
$locked = "VMs must be <b>STOPPED</b> to change";
if ($service)
$locked = "$service must be <b>STOPPED</b> to change";
elseif ($bond_ethX)
$locked = "Interface must be <i>removed</i> as <b>Bonding member</b> to change";
elseif ($bridge_ethX)
@@ -134,12 +134,12 @@ Enable VLANs:
<?=mk_option($ethX['TYPE'], 'access', 'No');?>
<?=mk_option($ethX['TYPE'], 'trunk', 'Yes');?>
</select>
<span class="pin access-ethX" title="Add VLAN" style="display:none" onclick="addVLAN('ethX',<?=$disabled?'true':'false'?>)"><i class="fa fa-plus-circle green"></i><em>press to add VLAN</em></span>
<span class="pin access-ethX" title="Add VLAN" style="display:none" onclick="addVLAN('ethX',<?=$service?'true':'false'?>)"><i class="fa fa-plus-circle green"></i><em>press to add VLAN</em></span>
<?else:?>
<div class="access-ethX shade-<?=$display['theme']?>" style="display:none" markdown="1">
VLAN number:
: <input type="number" name="VLANID:<?=$i?>" min="1" max="4095" value="<?=$ethX["VLANID:$i"]?>" class="narrow" required>
<span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-ethX-<?=$i?>'),<?=$disabled?'true':'false'?>)"><i class="fa fa-minus-circle red"></i><em>press to remove VLAN</em></span>
<span class="pin" title="Remove VLAN" onclick="removeVLAN($('#index-ethX-<?=$i?>'),<?=$service?'true':'false'?>)"><i class="fa fa-minus-circle red"></i><em>press to remove VLAN</em></span>
> Give each VLAN a unique identifier. Numbers range from 1 to 4095.