diff --git a/plist b/plist index 64983b7969..c50e265ec8 100644 --- a/plist +++ b/plist @@ -2084,6 +2084,7 @@ /usr/local/opnsense/www/css/jqtree.css /usr/local/opnsense/www/css/jquery.bootgrid.css /usr/local/opnsense/www/css/nv.d3.css +/usr/local/opnsense/www/css/opnsense-bootgrid-layout.css /usr/local/opnsense/www/css/opnsense-bootgrid.css /usr/local/opnsense/www/css/tabulator.min.css /usr/local/opnsense/www/css/tokenize2.css diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php index e7e3d63c4e..f0053e1998 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php @@ -98,6 +98,7 @@ class ControllerBase extends ControllerRoot '/css/bootstrap-dialog.css', '/css/tabulator.min.css', '/css/opnsense-bootgrid.css', + '/css/opnsense-bootgrid-layout.css', // Font awesome '/ui/assets/fontawesome/css/all.min.css', '/ui/assets/fontawesome/css/v4-shims.min.css', diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml index 596b4bd750..ef4051195c 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml +++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/dialogFilterRule.xml @@ -60,6 +60,8 @@ true false + boolean + boolean @@ -69,6 +71,7 @@ You may enter a description here for your reference (not parsed). 110 + 100 @@ -129,6 +132,8 @@ true false + boolean + boolean @@ -186,6 +191,7 @@ alias 50 + 100 @@ -195,8 +201,10 @@ Source port number or well known name (imap, imaps, http, https, ...), for ranges use a dash + 60 alias + 60 @@ -216,6 +224,7 @@ alias 70 + 100 @@ -225,8 +234,10 @@ Destination port number or well known name (imap, imaps, http, https, ...), for ranges use a dash + 80 alias + 60 @@ -575,6 +586,7 @@ statistics 115 + 200 diff --git a/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt b/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt index 392c45ecc7..c0902233df 100644 --- a/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt +++ b/src/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt @@ -76,7 +76,7 @@ } }); - $("#zone-selection-wrapper").detach().prependTo('#grid-clients-header > .row > .actionBar > .actions'); + $("#zone-selection-wrapper").detach().insertBefore('#grid-clients-header .search'); }); diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/hasync_status.volt b/src/opnsense/mvc/app/views/OPNsense/Core/hasync_status.volt index 92d24f901f..414968f965 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Core/hasync_status.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Core/hasync_status.volt @@ -138,14 +138,10 @@ });
diff --git a/src/opnsense/mvc/app/views/OPNsense/DHCPv4/leases.volt b/src/opnsense/mvc/app/views/OPNsense/DHCPv4/leases.volt index bd92df09c4..f0b0d860c4 100644 --- a/src/opnsense/mvc/app/views/OPNsense/DHCPv4/leases.volt +++ b/src/opnsense/mvc/app/views/OPNsense/DHCPv4/leases.volt @@ -129,8 +129,8 @@ } }); - $("#inactive-selection-wrapper").detach().prependTo('#grid-leases-header > .row > .actionBar'); - $("#interface-selection-wrapper").detach().prependTo('#grid-leases-header > .row > .actionBar > .actions'); + $("#inactive-selection-wrapper").detach().insertBefore('#grid-leases-header .search'); + $("#interface-selection-wrapper").detach().insertAfter('#grid-leases-header .search'); updateServiceControlUI('dhcpv4'); }); diff --git a/src/opnsense/mvc/app/views/OPNsense/DHCPv6/leases.volt b/src/opnsense/mvc/app/views/OPNsense/DHCPv6/leases.volt index 312baa52b1..50fbb44f3b 100644 --- a/src/opnsense/mvc/app/views/OPNsense/DHCPv6/leases.volt +++ b/src/opnsense/mvc/app/views/OPNsense/DHCPv6/leases.volt @@ -136,8 +136,8 @@ search:'/api/dhcpv6/leases/search_prefix/' }); - $("#inactive-selection-wrapper").detach().prependTo('#grid-leases-header > .row > .actionBar'); - $("#interface-selection-wrapper").detach().prependTo('#grid-leases-header > .row > .actionBar > .actions'); + $("#inactive-selection-wrapper").detach().insertBefore('#grid-leases-header .search'); + $("#interface-selection-wrapper").detach().insertAfter('#grid-leases-header .search'); if (window.location.hash != "") { $('a[href="' + window.location.hash + '"]').click(); diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt index a4ddb7a262..fe96c2c618 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/log.volt @@ -152,12 +152,9 @@ updateServiceControlUI('{{service}}'); - // move filter into action header - $("#filter_container").detach().prependTo('#grid-log-header > .row > .actionBar > .actions'); - $(".filter_act").tooltip(); - - $("#export-wrapper").detach().appendTo('#grid-log-header > .row > .actionBar > .btn-group'); - $("#exportbtn").tooltip(); + // Move filters directly into the actionBar instead of nested groups for better flex behavior + $("#filter_container").detach().insertAfter('#grid-log-header .search'); + $("#export-wrapper").detach().appendTo('#grid-log-header .actionBar'); function switch_mode(value) { let select = $("#severity_filter"); diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/vip.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/vip.volt index a9ca109cfa..3b91f9def4 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/vip.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/vip.volt @@ -61,7 +61,7 @@ $('#grid-vips').bootgrid('reload'); }); - $("#mode_filter_container").detach().prependTo('#grid-vips-header > .row > .actionBar > .actions'); + $("#mode_filter_container").detach().insertAfter('#grid-vips-header .search'); $(".carp_action").each(function(){ $(this).SimpleActionButton({onAction: function(data, status){ diff --git a/src/opnsense/mvc/app/views/OPNsense/Dnsmasq/leases.volt b/src/opnsense/mvc/app/views/OPNsense/Dnsmasq/leases.volt index 1344d35425..be1bf8e62f 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Dnsmasq/leases.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Dnsmasq/leases.volt @@ -128,8 +128,8 @@ } }); - $("#interface-selection-wrapper").detach().prependTo('#grid-leases-header > .row > .actionBar > .actions'); - $("#protocol-selection-wrapper").detach().insertBefore("#interface-selection-wrapper"); + $("#interface-selection-wrapper").detach().insertAfter('#grid-leases-header .search'); + $("#protocol-selection-wrapper").detach().insertAfter("#interface-selection-wrapper"); updateServiceControlUI('dnsmasq'); }); diff --git a/src/opnsense/mvc/app/views/OPNsense/Dnsmasq/settings.volt b/src/opnsense/mvc/app/views/OPNsense/Dnsmasq/settings.volt index b87abbe3d8..045bde265b 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Dnsmasq/settings.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Dnsmasq/settings.volt @@ -126,7 +126,7 @@ let header = $("#" + grid_id + "-header"); let $actionBar = header.find('.actionBar'); if ($actionBar.length) { - $('#tag_select_container').detach().insertBefore($actionBar.find('.search')); + $('#tag_select_container').detach().insertAfter($actionBar.find('.search')); $('#tag_select_container').show(); } } @@ -281,16 +281,6 @@ tbody.collapsible > tr > td:first-child { padding-left: 30px; } - #tag_select_clear { - border-right: none; - } - #tag_select_container { - margin-right: 20px; - } - #tag_select_container .bootstrap-select > .dropdown-toggle { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - }