From 4a457d8da1fe721924436a27e70e94ac4209cd6e Mon Sep 17 00:00:00 2001 From: Stephen Beaver Date: Mon, 14 Dec 2015 13:22:50 -0500 Subject: Automatic panel collapse defines moved to jquery/pfSenseHelpsers.js define(COLLAPSIBLE, 0x08); define(SEC_CLOSED, 0x04); define(SEC_OPEN, 0x00); --- src/usr/local/www/classes/Form/Section.class.php | 3 -- src/usr/local/www/jquery/pfSenseHelpers.js | 59 +++++++++++++----------- src/usr/local/www/pkg_edit.php | 5 +- src/usr/local/www/status_logs_filter.php | 8 ---- 4 files changed, 34 insertions(+), 41 deletions(-) (limited to 'src') diff --git a/src/usr/local/www/classes/Form/Section.class.php b/src/usr/local/www/classes/Form/Section.class.php index eff386a..1d4c67f 100644 --- a/src/usr/local/www/classes/Form/Section.class.php +++ b/src/usr/local/www/classes/Form/Section.class.php @@ -26,9 +26,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -define(COLLAPSIBLE, 0x08); -define(SEC_CLOSED, 0x04); -define(SEC_OPEN, 0x00); class Form_Section extends Form_Element { diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js index 4fbe9f8..e462b4c 100644 --- a/src/usr/local/www/jquery/pfSenseHelpers.js +++ b/src/usr/local/www/jquery/pfSenseHelpers.js @@ -408,36 +408,41 @@ $('tbody').each(function(){ $('tbody:empty').html(""); - // Hide configuration button for panels without configuration - $('.container .panel-heading a.config').each(function (idx, el){ - var config = $(el).parents('.panel').children('.panel-footer'); - if (config.length == 1) - $(el).removeClass('hidden'); - }); +// Automactic panel collapse +define(COLLAPSIBLE, 0x08); +define(SEC_CLOSED, 0x04); +define(SEC_OPEN, 0x00); + +// Hide configuration button for panels without configuration +$('.container .panel-heading a.config').each(function (idx, el){ + var config = $(el).parents('.panel').children('.panel-footer'); + if (config.length == 1) + $(el).removeClass('hidden'); +}); - // Initial state & toggle icons of collapsed panel - $('.container .panel-heading a[data-toggle="collapse"]').each(function (idx, el){ - var body = $(el).parents('.panel').children('.panel-body') - var isOpen = body.hasClass('in'); +// Initial state & toggle icons of collapsed panel +$('.container .panel-heading a[data-toggle="collapse"]').each(function (idx, el){ + var body = $(el).parents('.panel').children('.panel-body') + var isOpen = body.hasClass('in'); - $(el).children('i').toggleClass('fa-plus-circle', !isOpen); - $(el).children('i').toggleClass('fa-minus-circle', isOpen); + $(el).children('i').toggleClass('fa-plus-circle', !isOpen); + $(el).children('i').toggleClass('fa-minus-circle', isOpen); - body.on('shown.bs.collapse', function(){ - $(el).children('i').toggleClass('fa-minus-circle', true); - $(el).children('i').toggleClass('fa-plus-circle', false); + body.on('shown.bs.collapse', function(){ + $(el).children('i').toggleClass('fa-minus-circle', true); + $(el).children('i').toggleClass('fa-plus-circle', false); - if($(el).closest('a').attr('id') != 'widgets-available') { - updateWidgets(); - } - }); + if($(el).closest('a').attr('id') != 'widgets-available') { + updateWidgets(); + } + }); - body.on('hidden.bs.collapse', function(){ - $(el).children('i').toggleClass('fa-minus-circle', false); - $(el).children('i').toggleClass('fa-plus-circle', true); + body.on('hidden.bs.collapse', function(){ + $(el).children('i').toggleClass('fa-minus-circle', false); + $(el).children('i').toggleClass('fa-plus-circle', true); - if($(el).closest('a').attr('id') != 'widgets-available') { - updateWidgets(); - } - }); - }); \ No newline at end of file + if($(el).closest('a').attr('id') != 'widgets-available') { + updateWidgets(); + } + }); +}); \ No newline at end of file diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index 7a736ff..73e8c37 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -520,13 +520,12 @@ if ($pkg['title'] != "") { if(!$only_edit) { $pgtitle = array($pkg['title'], gettext("Edit")); } else { - $pgtitle = array($pkg['title']); + $pgtitle = array(gettext("Package"), $pkg['title']); } } else { - $pgtitle = array(gettext("Package Editor")); + $pgtitle = array(gettext("Package"), gettext("Editor")); } - // Create any required tabs if ($pkg['tabs'] != "") { $tab_array = array(); diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index d009f3e..3600e25 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -71,7 +71,6 @@ require("guiconfig.inc"); require_once("ipsec.inc"); require_once("filter_log.inc"); - # --- AJAX RESOLVE --- if (isset($_POST['resolve'])) { $ip = strtolower($_POST['resolve']); @@ -87,7 +86,6 @@ if (isset($_POST['resolve'])) { exit; } - /* Build a list of allowed log files so we can reject others to prevent the page from acting on unauthorized files. @@ -110,7 +108,6 @@ if (!$_GET['logfile']) { $filter_logfile = "{$g['varlog_path']}/" . basename($logfile) . ".log"; - function getGETPOSTsettingvalue($settingname, $default) { $settingvalue = $default; if ($_GET[$settingname]) { @@ -122,7 +119,6 @@ function getGETPOSTsettingvalue($settingname, $default) { return $settingvalue; } - $rulenum = getGETPOSTsettingvalue('getrulenum', null); if ($rulenum) { @@ -162,7 +158,6 @@ if ($filterlogentries_submit) { $filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null); } - # Manage Log - Code $specific_log = basename($logfile) . '_settings'; @@ -391,9 +386,6 @@ $tab_array[] = array(gettext("Dynamic View"), false, "/status_logs_filter_dynami $tab_array[] = array(gettext("Summary View"), false, "/status_logs_filter_summary.php"); display_top_tabs($tab_array, false, 'nav nav-tabs'); -define(SEC_OPEN, 0x00); -define(SEC_CLOSED, 0x04); - if ($filter_active) $filter_state = SEC_OPEN; else -- cgit v1.1