diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/firewall_nat.php | 4 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_nat_1to1.php | 27 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_nat_npt.php | 12 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_nat_out.php | 23 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_rules.php | 47 |
5 files changed, 71 insertions, 42 deletions
diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index 8372b09..f1b96a4 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -367,7 +367,7 @@ endforeach; </div> </div> - <div class="pull-right"> + <nav class="action-buttons" style="margin-top: 10px;"> <a href="firewall_nat_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new rule')?>"> <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> <?=gettext('Add')?> @@ -380,7 +380,7 @@ endforeach; <i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> <?=gettext("Save")?> </button> - </div> + </nav> </form> <script> diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index dd6df85..44a981d 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -260,23 +260,30 @@ display_top_tabs($tab_array); </div> </div> - <nav class="action-buttons"> - <a href="firewall_nat_1to1_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping')?>"><?=gettext('Add new mapping')?></a> - <input name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected rule"); ?>" /> - <input type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" value="store changes" disabled="disabled" /> + <nav class="action-buttons" style="margin-top: 10px;"> + <a href="firewall_nat_1to1_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping')?>"> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext('Add')?> + </a> + <button name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected rule"); ?>"> + <i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Delete"); ?> + </button> + <button type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled="disabled"> + <i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Save")?> + </button> </nav> </form> -<div> -<?php - -print_info_box(gettext('Depending on the way your WAN connection is setup, you may also need a ') . '<a href="firewall_virtual_ip.php">' . +<div id="infoblock"> +<?=print_info_box(gettext('Depending on the way your WAN connection is setup, you may also need a ') . '<a href="firewall_virtual_ip.php">' . gettext("Virtual IP.") . '</a>' . '<br />' . gettext('If you add a 1:1 NAT entry for any of the interface IPs on this system, ' . 'it will make this system inaccessible on that IP address. i.e. if ' . 'you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) ' . - 'using the WAN IP address will no longer function.')); -?> + 'using the WAN IP address will no longer function.'), info)?> + </div> <script> diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index aedb2dc..6407988 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -175,9 +175,15 @@ endforeach; </table> </div> -<nav class="action-buttons"> - <a href="firewall_nat_npt_edit.php" class="btn btn-sm btn-success"><?=gettext("Add rule")?></a> - <input type="submit" id="order-store" class="btn btn-primary btn-sm" value="store changes" disabled="disabled" /> +<nav class="action-buttons" style="margin-top: 10px;"> + <a href="firewall_nat_npt_edit.php" class="btn btn-sm btn-success"> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Add")?> + </a> + <button type="submit" id="order-store" class="btn btn-primary btn-sm" value="store changes" disabled="disabled"> + <i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Save")?> + </button> </nav> </form> diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index 70c2afc..a25a211 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -514,10 +514,19 @@ print($form); </div> </div> - <nav class="action-buttons"> - <a href="firewall_nat_out_edit.php" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping')?>"><?=gettext('Add new mapping')?></a> - <input name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected map"); ?>" /> - <input type="submit" id="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled="disabled" name="order-store" /> + <nav class="action-buttons" style="margin-top: 10px;"> + <a href="firewall_nat_out_edit.php" class="btn btn-sm btn-success" title="<?=gettext('Add new mapping')?>"> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext('Add')?> + </a> + <button name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected map"); ?>"> + <i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Delete"); ?> + </button> + <button type="submit" id="order-store" class="btn btn-primary btn-sm" value="Save changes" disabled="disabled" name="order-store"> + <i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Save")?> + </button> </nav> <?php @@ -637,7 +646,7 @@ endif; </div> </form> -<div> +<div id="infoblock"> <?php print_info_box(gettext('If automatic outbound NAT is selected, a mapping is automatically generated for each interface\'s subnet (except WAN-type connections) and the rules ' . 'on the "Mappings" section of this page are ignored.' . '<br />' . @@ -646,8 +655,8 @@ endif; 'If hybrid outbound NAT is selected, mappings you specify on this page will be used, followed by the automatically generated ones.' . '<br />' . 'If disable outbound NAT is selected, no rules will be used.' . '<br />' . 'If a target address other than an interface\'s IP address is used, then depending on the way the WAN connection is setup, a ') . - '<a href="firewall_virtual_ip.php">' . gettext("Virtual IP") . '</a>' . gettext(" may also be required.") - ); + '<a href="firewall_virtual_ip.php">' . gettext("Virtual IP") . '</a>' . gettext(" may also be required."), + info); ?> </div> diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index db87c61..a16afc0 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -651,12 +651,19 @@ for ($i = 0; isset($a_filter[$i]); $i++): </div> <?php endif;?> - <nav class="action-buttons"> - <input type="submit" id="order-store" name="order-store" class="btn btn-sm btn-primary" value="store changes" disabled="disabled" /> - <input name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected rules"); ?>" /> + <nav class="action-buttons" style="margin-top: 10px;"> <a href="firewall_rules_edit.php?if=<?=htmlspecialchars($if);?>" role="button" class="btn btn-sm btn-success"> - <?=gettext("add new");?> + <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Add");?> </a> + <button name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected rules"); ?>"> + <i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Delete"); ?> + </button> + <button type="submit" id="order-store" name="order-store" class="btn btn-sm btn-primary" value="store changes" disabled="disabled"> + <i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i> + <?=gettext("Save")?> + </button> </nav> </form> <!-- Legend --> @@ -672,22 +679,22 @@ for ($i = 0; isset($a_filter[$i]); $i++): </dl> </div> -<?php -if ("FloatingRules" != $if) - print_info_box(gettext("Rules are evaluated on a first-match basis (i.e. " . - "the action of the first rule to match a packet will be executed). ") . '<br />' . - gettext("This means that if you use block rules, you'll have to pay attention " . - "to the rule order. Everything that isn't explicitly passed is blocked " . - "by default. ")); -else - print_info_box(gettext("Floating rules are evaluated on a first-match basis (i.e. " . - "the action of the first rule to match a packet will be executed) only " . - "if the 'quick' option is checked on a rule. Otherwise they will only apply if no " . - "other rules match. Pay close attention to the rule order and options " . - "chosen. If no rule here matches, the per-interface or default rules are used. ")); - -?> - +<div id="infoblock"> + <?php + if ("FloatingRules" != $if) + print_info_box(gettext("Rules are evaluated on a first-match basis (i.e. " . + "the action of the first rule to match a packet will be executed). ") . '<br />' . + gettext("This means that if you use block rules, you'll have to pay attention " . + "to the rule order. Everything that isn't explicitly passed is blocked " . + "by default. "), info); + else + print_info_box(gettext("Floating rules are evaluated on a first-match basis (i.e. " . + "the action of the first rule to match a packet will be executed) only " . + "if the 'quick' option is checked on a rule. Otherwise they will only apply if no " . + "other rules match. Pay close attention to the rule order and options " . + "chosen. If no rule here matches, the per-interface or default rules are used. "), info); + ?> +</div> <script> events.push(function() { |
