Merge branch 'master' of rcs.pfsense.org:pfsense/mainline

2 files changed, 4 insertions, 5 deletions

diff --git a/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js b/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
index 9f21c2b..e75e192 100644
--- a/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
+++ b/usr/local/www/javascript/firewall_nat_edit/firewall_nat_edit.js
@@ -1,7 +1,6 @@
 <!--
 var portsenabled = 1;
 var dstenabled = 1;
-var showsource = 0;
 
 function ext_change() {
 	if ((document.iform.srcbeginport.selectedIndex == 0) && portsenabled) {
@@ -59,7 +58,6 @@ function show_source() {
 
 	document.getElementById("srctable").style.display = '';
 	document.getElementById("showadvancedboxsrc").style.display = 'none';
-	showsource = 1;
 }
 
 function check_for_aliases() {
@@ -119,7 +117,7 @@ function proto_change() {
 	}
 
 	if(document.iform.proto.selectedIndex >= 0 && document.iform.proto.selectedIndex <= 2) {
-		document.getElementById("sprtable").style.display = showsource == 1 ? '':'none';
+		document.getElementById("sprtable").style.display = portsenabled == 1 ? '':'none';
 		document.getElementById("dprtr").style.display = '';
 		document.getElementById("lprtr").style.display = '';
 	} else {
diff --git a/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js b/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
index 38b9363..ae49a2a 100644
--- a/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
+++ b/usr/local/www/javascript/firewall_rules_edit/firewall_rules_edit.js
@@ -45,7 +45,7 @@ function ext_change() {
 
 function show_source_port_range() {
 	document.getElementById("sprtable").style.display = '';
-	document.getElementById("showadvancedboxspr").innerHTML='';
+	document.getElementById("showadvancedboxspr").style.display = 'none';
 }
 
 function typesel_change() {
@@ -120,11 +120,12 @@ function proto_change() {
 	if(document.iform.proto.selectedIndex >= 0 && document.iform.proto.selectedIndex <= 2) {
 		document.getElementById("dprtr").style.display = '';
 		if (editenabled) {
-			document.getElementById("showadvancedboxspr").innerHTML='<p><input type="button" onClick="show_source_port_range()" value="Advanced"></input> - Show source port range</a>';
+			document.getElementById("showadvancedboxspr").style.display = 'table-row';
 		}
 	} else {
 		document.getElementById("sprtable").style.display = 'none';
 		document.getElementById("dprtr").style.display = 'none';
+		document.getElementById("showadvancedboxspr").style.display = 'none';
 	}
 }