mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-15 06:00:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.4-wip' of github.com:limetech/webgui into 6.4-wip

Browse Source
This commit is contained in:
Tom Mortensen
2017-11-14 14:40:51 -08:00
parent baff7e3c34 31cd3caf7d
commit 2b4af54e2b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/dynamix.docker.manager/DockerSettings.page
View File

@@ -250,7 +250,7 @@ DHCPv4 pool of custom network <?=$network?> (optional):
}
echo "/";
echo "<select id=\"{$docker_dhcp}_mask\" class=\"mask\" onchange=\"changeMask(this.id)\" $disabled>";
for ($m=$mask; $m<=30; $m++) echo mk_option($mask_user,$m,$m);
for ($m=$mask+1; $m<=30; $m++) echo mk_option($mask_user,$m,$m);
echo "</select><span id=\"{$docker_dhcp}_size\" style=\"".($dhcp?'':'display:none')."\">($size hosts)</span>";
echo "<input type=\"hidden\" name=\"$docker_dhcp\" value=\"\">";
?>
@@ -279,7 +279,7 @@ DHCPv6 pool of custom network <?=$network?> (optional):
<span id="<?=$docker_dhcp6?>_net" class="net <?=$disabled?>"><?=$net?>:</span><?
echo "<input type=\"text\" id=\"{$docker_dhcp6}_text\" value=\"$net_user\" class=\"net\" $disabled>/";
echo "<select id=\"{$docker_dhcp6}_mask\" class=\"mask\" $disabled>";
for ($m=$mask; $m<=120; $m+=8) echo mk_option($mask_user,$m,$m);
for ($m=$mask+8; $m<=120; $m+=8) echo mk_option($mask_user,$m,$m);
echo "</select><input type=\"hidden\" name=\"$docker_dhcp6\" value=\"\">";
?>
<?elseif ($dockercfg[$docker_dhcp6]):?>

2
plugins/dynamix/Eth0.page
View File

@@ -195,7 +195,7 @@ function selectProtocol(form,port,index) {
var i = $(this).attr('name').split(':')[1];
var net4 = $('.'+port+'-ipv4-'+i);
var net6 = $('.'+port+'-ipv6-'+i);
var dhcp = $('select[name="USE_DHCP:'+i+'"]').val();
var dhcp = $(form).find('select[name="USE_DHCP:'+i+'"]').val();
if (dhcp) switch (protocol) {
case 'ipv4': net4.show(); net6.hide(); break;
case 'ipv6': net4.hide(); net6.show(); break;