diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-12-10 09:00:51 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-12-10 09:00:51 -0500 |
commit | ff59b884963ef2a5aaee50c00a286ddd66fa409d (patch) | |
tree | 2ceee3fbf332b71400480fa9af592d07362d54ca /src/usr/local/www | |
parent | a0a6a4e97e88a8d766f15b533ba87a017247f7fb (diff) | |
download | pfsense-ff59b884963ef2a5aaee50c00a286ddd66fa409d.zip pfsense-ff59b884963ef2a5aaee50c00a286ddd66fa409d.tar.gz |
Fixed #5617
Fixed #5612
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/diag_backup.php | 10 | ||||
-rw-r--r-- | src/usr/local/www/diag_logs_settings.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/status_openvpn.php | 1 | ||||
-rw-r--r-- | src/usr/local/www/system_advanced_admin.php | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index c236ac3..2559367 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -736,7 +736,7 @@ $group = new Form_Group(''); $group->add(new Form_Button( 'Submit', 'Restore Configuration' -))->setHelp('The firewall will reboot after restoring the configuration.')->removeClass('btn-primary')->addClass('btn-danger'); +))->setHelp('The firewall will reboot after restoring the configuration.')->removeClass('btn-primary')->addClass('btn-danger restore'); $section->add($group); @@ -750,7 +750,7 @@ if (($config['installedpackages']['package'] != "") || (is_subsystem_dirty("pack $group->add(new Form_Button( 'Submit', 'Reinstall Packages' - ))->setHelp('Click this button to reinstall all system packages. This may take a while.')->removeClass('btn-primary')->addClass('btn-danger'); + ))->setHelp('Click this button to reinstall all system packages. This may take a while.')->removeClass('btn-primary')->addClass('btn-success'); $section->add($group); } @@ -791,7 +791,7 @@ events.push(function(){ hideInput('decrypt_passconf', decryptHide); } - // ---------- Click checkbox handlers --------------------------------------------------------- + // ---------- Click handlers ------------------------------------------------------------------ $('input[name="encrypt"]').on('change', function() { hidePasswords(); @@ -801,9 +801,13 @@ events.push(function(){ hidePasswords(); }); + $('#conffile').change(function (){ + $('.restore').prop('disabled', false); + }); // ---------- On initial page load ------------------------------------------------------------ hideSections(); + $('.restore').prop('disabled', true); }); //]]> </script> diff --git a/src/usr/local/www/diag_logs_settings.php b/src/usr/local/www/diag_logs_settings.php index d8de257..292021c 100644 --- a/src/usr/local/www/diag_logs_settings.php +++ b/src/usr/local/www/diag_logs_settings.php @@ -278,14 +278,14 @@ $section->addInput(new Form_Checkbox( 'Log firewall default blocks', 'Log packets matched from the default block rules in the ruleset', $pconfig['logdefaultblock'] -))->setHelp('Packets that are blocked by the implicit default block rule will not be logged if you uncheck this option. Per-rule logging options are still respected.'); +))->setHelp('Log packets that are <strong>blocked</strong> by the implicit default block rule. - Per-rule logging options are still respected.'); $section->addInput(new Form_Checkbox( 'logdefaultpass', null, 'Log packets matched from the default pass rules put in the ruleset', $pconfig['logdefaultpass'] -))->setHelp('Packets that are allowed by the implicit default pass rule will be logged if you check this option. Per-rule logging options are still respected. '); +))->setHelp('Log packets that are <strong>allowed</strong> by the implicit default pass rule. - Per-rule logging options are still respected. '); $section->addInput(new Form_Checkbox( 'logbogons', diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index 82a4a05..6cd30b7 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -181,6 +181,7 @@ include("head.inc"); ?> <th><?=gettext("Connected Since"); ?></th> <th><?=gettext("Bytes Sent")?></th> <th><?=gettext("Bytes Received")?></th> + <th><!-- Icons --></th> </tr> </thead> <tbody> diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 03d2f0d..28edf97 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -520,7 +520,7 @@ if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['pl isset($pconfig['enableserial']) ))->setHelp('Note: This will redirect the console output and messages to '. 'the serial port. You can still access the console menu from the internal video '. - 'card/keyboard. A<b>null modem</b>serial cable or adapter is required to use the '. + 'card/keyboard. A <b>null modem</b> serial cable or adapter is required to use the '. 'serial console.'); $section->addInput(new Form_Select( |