diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/auth.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/authgui.inc | 8 | ||||
| -rw-r--r-- | src/usr/local/www/css/pfSense.css | 5 | ||||
| -rw-r--r-- | src/usr/local/www/services_unbound.php | 49 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/ipsec.widget.php | 2 |
5 files changed, 45 insertions, 21 deletions
diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 95c630b..dc8e437 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -143,7 +143,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][ <!DOCTYPE html> <html lang="en"> <head> - <link rel="stylesheet" href="/bootstrap/css/pfSense.css" /> + <link rel="stylesheet" href="/css/pfSense.css" /> <title><?=gettext("Redirecting..."); ?></title> </head> <body id="error" class="no-menu"> diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index 98988ec..e1289ac 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -130,11 +130,11 @@ function display_error_form($http_code, $desc) { return; } - $cssfile = "/bootstrap/css/pfSense.css"; + $cssfile = "/css/pfSense.css"; if (isset($config['system']['webgui']['webguicss'])) { - if (file_exists("bootstrap/css/" . $config['system']['webgui']['webguicss'])) { - $cssfile = "/bootstrap/css/" . $config['system']['webgui']['webguicss']; + if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) { + $cssfile = "/css/" . $config['system']['webgui']['webguicss']; } } @@ -237,7 +237,7 @@ if ($local_ip == false) { $cssfile = "/css/pfSense.css"; if (isset($config['system']['webgui']['webguicss'])) { - if (file_exists("css/" . $config['system']['webgui']['webguicss'])) { + if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) { $cssfile = "/css/" . $config['system']['webgui']['webguicss']; } } diff --git a/src/usr/local/www/css/pfSense.css b/src/usr/local/www/css/pfSense.css index 060e139..120d751 100644 --- a/src/usr/local/www/css/pfSense.css +++ b/src/usr/local/www/css/pfSense.css @@ -583,11 +583,6 @@ footer a { color: #e0e0e0; } -/* ipsec widget placeholder */ -#ipsec-Overview, #ipsec-tunnel, #ipsec-mobile { - background-color:#EEEEEE; -} - /* All pfSense textareas benefit from using a fixed width font **/ textarea { diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index d37492b..7b5597f 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -365,18 +365,18 @@ $section->addInput(new Form_Checkbox( 'resolved. You should also set the domain in %s'. 'System: General setup%s to the proper value.','<a href="system.php">','</a>')); -$btnadvdns = new Form_Button( - 'btnadvdns', +$btnadv = new Form_Button( + 'btnadvcustom', 'Custom options', null, 'fa-cog' ); -$btnadvdns->addClass('btn-info btn-sm'); +$btnadv->addClass('btn-info btn-sm'); $section->addInput(new Form_StaticText( - 'Custom options', - $btnadvdns . ' ' . 'Show custom options' + 'Display Custom Options', + $btnadv )); $section->addInput(new Form_Textarea ( @@ -393,6 +393,33 @@ print($form); //<![CDATA[ events.push(function() { + // Show advanced custom options ============================================== + var showadvcustom = false; + + function show_advcustom(ispageload) { + var text; + // On page load decide the initial state based on the data. + if (ispageload) { + if ('<?=$pconfig['custom_options']?>' == '') { + showadvcustom = false; + } else { + showadvcustom = true; + } + } else { + // It was a click, swap the state. + showadvcustom = !showadvcustom; + } + + hideInput('custom_options', !showadvcustom); + + if (showadvcustom) { + text = "<?=gettext('Hide Custom Options');?>"; + } else { + text = "<?=gettext('Display Custom Options');?>"; + } + $('#btnadvcustom').html('<i class="fa fa-cog"></i> ' + text); + } + // If the enable checkbox is not checked, hide all inputs function hideGeneral() { var hide = ! $('#enable').prop('checked'); @@ -404,15 +431,16 @@ events.push(function() { hideCheckbox('forwarding', hide); hideCheckbox('regdhcp', hide); hideCheckbox('regdhcpstatic', hide); - hideInput('btnadvdns', hide); + hideInput('btnadvcustom', hide); + hideInput('custom_options', hide || !showadvcustom); } // Make the 'additional options' button a plain button, not a submit button - $("#btnadvdns").prop('type','button'); + $("#btnadvcustom").prop('type','button'); - // Un-hide additional controls - $("#btnadvdns").click(function() { - hideInput('custom_options', false); + // Un-hide additional controls + $('#btnadvcustom').click(function(event) { + show_advcustom(); }); // When 'enable' is clicked, disable/enable the following hide inputs @@ -426,6 +454,7 @@ events.push(function() { } hideGeneral(); + show_advcustom(true); }); //]]> diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php index 22c03d2..42f9258 100644 --- a/src/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php @@ -335,7 +335,7 @@ function get_ipsec_stats() { $('tbody', '#ipsec-' + curtab).html(response); // and do it again - setTimeout(get_ipsec_stats, 16000); + setTimeout(get_ipsec_stats, 6000); }); } |
