From 0dbf9cbe3fe176427350efb615504115a2b6b9bb Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 11 Nov 2015 18:21:07 +0545 Subject: Fix #5411 firewall_nat_edit source negation And make the "not" checkboxes have the same layout as in firewall_rules_edit. That seems a better place to put the checkbox and consistency between similar GUI screens seems a good thing. --- src/usr/local/www/firewall_nat_edit.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index d693086..cd28d86 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -695,6 +695,13 @@ $section->addInput(new Form_Select( $group = new Form_Group('Source'); +$group->add(new Form_Checkbox( + 'srcnot', + 'Source not', + 'Invert match.', + $pconfig['srcnot'] +))->setWidth(2); + $group->add(new Form_Select( 'srctype', null, @@ -756,6 +763,13 @@ $section->add($group); $group = new Form_Group('Destination'); +$group->add(new Form_Checkbox( + 'dstnot', + 'Destination not', + 'Invert match.', + $pconfig['dstnot'] +))->setWidth(2); + $group->add(new Form_Select( 'dsttype', null, @@ -809,14 +823,6 @@ $group->setHelp('Specify the port or port range for the destination of the packe $section->add($group); -$section->addInput(new Form_Checkbox( - 'dstnot', - null, - 'Not (Invert the sense of the match)', - $pconfig['dstnot'], - 'yes' -)); - $section->addInput(new Form_IpAddress( 'localip', 'Redirect target IP', -- cgit v1.1