diff --git a/README.md b/README.md index fd68adf..fb26ff0 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,15 @@ Support Groups component adds the ability to your Joomla website to manage vario + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Support Groups](http://www.vdm.io) + *First Build*: 24th February, 2016 -+ *Last Build*: 7th February, 2021 ++ *Last Build*: 8th February, 2021 + *Version*: 1.0.11 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html # Component Number -+ *Line count*: **70433** -+ *File count*: **490** ++ *Line count*: **71646** ++ *File count*: **507** + *Folder count*: **98** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index fd68adf..fb26ff0 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -12,15 +12,15 @@ Support Groups component adds the ability to your Joomla website to manage vario + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Support Groups](http://www.vdm.io) + *First Build*: 24th February, 2016 -+ *Last Build*: 7th February, 2021 ++ *Last Build*: 8th February, 2021 + *Version*: 1.0.11 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html # Component Number -+ *Line count*: **70433** -+ *File count*: **490** ++ *Line count*: **71646** ++ *File count*: **507** + *Folder count*: **98** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/assets/css/additional_info.css b/admin/assets/css/additional_info.css index 5d646b2..97778c2 100644 --- a/admin/assets/css/additional_info.css +++ b/admin/assets/css/additional_info.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additional_info.css diff --git a/admin/assets/css/additional_information.css b/admin/assets/css/additional_information.css index 056db0f..c4d69c0 100644 --- a/admin/assets/css/additional_information.css +++ b/admin/assets/css/additional_information.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additional_information.css diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index b8eae5b..87ddab2 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage admin.css diff --git a/admin/assets/css/area.css b/admin/assets/css/area.css index d53f61e..967294c 100644 --- a/admin/assets/css/area.css +++ b/admin/assets/css/area.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area.css diff --git a/admin/assets/css/area_type.css b/admin/assets/css/area_type.css index ab832ac..9055a2a 100644 --- a/admin/assets/css/area_type.css +++ b/admin/assets/css/area_type.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area_type.css diff --git a/admin/assets/css/area_types.css b/admin/assets/css/area_types.css index 478dee6..99ed89e 100644 --- a/admin/assets/css/area_types.css +++ b/admin/assets/css/area_types.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area_types.css diff --git a/admin/assets/css/areas.css b/admin/assets/css/areas.css index 37d8ae0..528a2c2 100644 --- a/admin/assets/css/areas.css +++ b/admin/assets/css/areas.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage areas.css diff --git a/admin/assets/css/countries.css b/admin/assets/css/countries.css index 491755a..6523b32 100644 --- a/admin/assets/css/countries.css +++ b/admin/assets/css/countries.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage countries.css diff --git a/admin/assets/css/country.css b/admin/assets/css/country.css index 9d82120..8ee797f 100644 --- a/admin/assets/css/country.css +++ b/admin/assets/css/country.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage country.css diff --git a/admin/assets/css/currencies.css b/admin/assets/css/currencies.css index 59ddb46..79fe3bb 100644 --- a/admin/assets/css/currencies.css +++ b/admin/assets/css/currencies.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currencies.css diff --git a/admin/assets/css/currency.css b/admin/assets/css/currency.css index 84c9e66..8af3116 100644 --- a/admin/assets/css/currency.css +++ b/admin/assets/css/currency.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currency.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index f2770a5..790f6ca 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage dashboard.css diff --git a/admin/assets/css/facilities.css b/admin/assets/css/facilities.css index 41a3acb..622af25 100644 --- a/admin/assets/css/facilities.css +++ b/admin/assets/css/facilities.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facilities.css diff --git a/admin/assets/css/facility.css b/admin/assets/css/facility.css index c7ea1aa..7191264 100644 --- a/admin/assets/css/facility.css +++ b/admin/assets/css/facility.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility.css diff --git a/admin/assets/css/facility_type.css b/admin/assets/css/facility_type.css index 69f25c8..97e2caa 100644 --- a/admin/assets/css/facility_type.css +++ b/admin/assets/css/facility_type.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility_type.css diff --git a/admin/assets/css/facility_types.css b/admin/assets/css/facility_types.css index bb12bda..8529d65 100644 --- a/admin/assets/css/facility_types.css +++ b/admin/assets/css/facility_types.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility_types.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index dc7f9e2..d82069b 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index 4bf4379..81ebec3 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help_documents.css diff --git a/admin/assets/css/info_type.css b/admin/assets/css/info_type.css index a94d237..acd1441 100644 --- a/admin/assets/css/info_type.css +++ b/admin/assets/css/info_type.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage info_type.css diff --git a/admin/assets/css/info_types.css b/admin/assets/css/info_types.css index 7b2f0a8..19da042 100644 --- a/admin/assets/css/info_types.css +++ b/admin/assets/css/info_types.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage info_types.css diff --git a/admin/assets/css/payment.css b/admin/assets/css/payment.css index d98fa32..82ad94b 100644 --- a/admin/assets/css/payment.css +++ b/admin/assets/css/payment.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payment.css diff --git a/admin/assets/css/payments.css b/admin/assets/css/payments.css index 603aefe..5af220c 100644 --- a/admin/assets/css/payments.css +++ b/admin/assets/css/payments.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payments.css diff --git a/admin/assets/css/region.css b/admin/assets/css/region.css index edad201..6ac0538 100644 --- a/admin/assets/css/region.css +++ b/admin/assets/css/region.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage region.css diff --git a/admin/assets/css/regions.css b/admin/assets/css/regions.css index 7695cb5..da84ec6 100644 --- a/admin/assets/css/regions.css +++ b/admin/assets/css/regions.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage regions.css diff --git a/admin/assets/css/support_group.css b/admin/assets/css/support_group.css index bc36ae9..2774f70 100644 --- a/admin/assets/css/support_group.css +++ b/admin/assets/css/support_group.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_group.css diff --git a/admin/assets/css/support_groups.css b/admin/assets/css/support_groups.css index 8b3283e..d26d100 100644 --- a/admin/assets/css/support_groups.css +++ b/admin/assets/css/support_groups.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_groups.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index 16f4ae3..4fefc02 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage admin.js diff --git a/admin/controller.php b/admin/controller.php index a988dd8..27b2a2d 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage controller.php diff --git a/admin/controllers/additional_info.php b/admin/controllers/additional_info.php index 7c07c65..9a41d26 100644 --- a/admin/controllers/additional_info.php +++ b/admin/controllers/additional_info.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additional_info.php diff --git a/admin/controllers/additional_information.php b/admin/controllers/additional_information.php index 710d802..57edddf 100644 --- a/admin/controllers/additional_information.php +++ b/admin/controllers/additional_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additional_information.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 919714a..7233b77 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage ajax.json.php diff --git a/admin/controllers/area.php b/admin/controllers/area.php index 56011dc..83d3a50 100644 --- a/admin/controllers/area.php +++ b/admin/controllers/area.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area.php diff --git a/admin/controllers/area_type.php b/admin/controllers/area_type.php index c0731de..3e7ef73 100644 --- a/admin/controllers/area_type.php +++ b/admin/controllers/area_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area_type.php diff --git a/admin/controllers/area_types.php b/admin/controllers/area_types.php index ceb6afe..6e274b7 100644 --- a/admin/controllers/area_types.php +++ b/admin/controllers/area_types.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area_types.php diff --git a/admin/controllers/areas.php b/admin/controllers/areas.php index 2792866..4694c43 100644 --- a/admin/controllers/areas.php +++ b/admin/controllers/areas.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage areas.php diff --git a/admin/controllers/countries.php b/admin/controllers/countries.php index 720dee3..cf70800 100644 --- a/admin/controllers/countries.php +++ b/admin/controllers/countries.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage countries.php diff --git a/admin/controllers/country.php b/admin/controllers/country.php index c173fca..077e2ed 100644 --- a/admin/controllers/country.php +++ b/admin/controllers/country.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage country.php diff --git a/admin/controllers/currencies.php b/admin/controllers/currencies.php index a5e8adf..56d5d38 100644 --- a/admin/controllers/currencies.php +++ b/admin/controllers/currencies.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currencies.php diff --git a/admin/controllers/currency.php b/admin/controllers/currency.php index 0482fca..b5dc387 100644 --- a/admin/controllers/currency.php +++ b/admin/controllers/currency.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currency.php diff --git a/admin/controllers/facilities.php b/admin/controllers/facilities.php index c1ece52..0370e84 100644 --- a/admin/controllers/facilities.php +++ b/admin/controllers/facilities.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facilities.php diff --git a/admin/controllers/facility.php b/admin/controllers/facility.php index 44b176a..009705c 100644 --- a/admin/controllers/facility.php +++ b/admin/controllers/facility.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility.php diff --git a/admin/controllers/facility_type.php b/admin/controllers/facility_type.php index bc4372f..aac5198 100644 --- a/admin/controllers/facility_type.php +++ b/admin/controllers/facility_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility_type.php diff --git a/admin/controllers/facility_types.php b/admin/controllers/facility_types.php index 54e3461..958ce74 100644 --- a/admin/controllers/facility_types.php +++ b/admin/controllers/facility_types.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility_types.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index bcdd611..c09ffde 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index 35f974f..d6d9c67 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index 1f3c98b..8e97cd7 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 86ebe69..3c0d2cb 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage import.php diff --git a/admin/controllers/info_type.php b/admin/controllers/info_type.php index d2a30ba..3ea5df7 100644 --- a/admin/controllers/info_type.php +++ b/admin/controllers/info_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage info_type.php diff --git a/admin/controllers/info_types.php b/admin/controllers/info_types.php index 128df9b..c5a7da9 100644 --- a/admin/controllers/info_types.php +++ b/admin/controllers/info_types.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage info_types.php diff --git a/admin/controllers/payment.php b/admin/controllers/payment.php index 1dc68ba..36dd85d 100644 --- a/admin/controllers/payment.php +++ b/admin/controllers/payment.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payment.php diff --git a/admin/controllers/payments.php b/admin/controllers/payments.php index aa874e2..9d2f618 100644 --- a/admin/controllers/payments.php +++ b/admin/controllers/payments.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payments.php diff --git a/admin/controllers/region.php b/admin/controllers/region.php index 6a1ba84..1de0cfe 100644 --- a/admin/controllers/region.php +++ b/admin/controllers/region.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage region.php diff --git a/admin/controllers/regions.php b/admin/controllers/regions.php index 84dac0f..62d4637 100644 --- a/admin/controllers/regions.php +++ b/admin/controllers/regions.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage regions.php diff --git a/admin/controllers/support_group.php b/admin/controllers/support_group.php index b38ba7f..002c807 100644 --- a/admin/controllers/support_group.php +++ b/admin/controllers/support_group.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_group.php diff --git a/admin/controllers/support_groups.php b/admin/controllers/support_groups.php index 3efb806..3f014c7 100644 --- a/admin/controllers/support_groups.php +++ b/admin/controllers/support_groups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_groups.php diff --git a/admin/controllers/supportgroups.php b/admin/controllers/supportgroups.php index 49a78c3..75386bb 100644 --- a/admin/controllers/supportgroups.php +++ b/admin/controllers/supportgroups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index d11eae5..55e1f74 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 1befe3e..716089e 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage batch_.php diff --git a/admin/helpers/supportgroups.php b/admin/helpers/supportgroups.php index b8795e5..5b98c15 100644 --- a/admin/helpers/supportgroups.php +++ b/admin/helpers/supportgroups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php diff --git a/admin/language/en-GB/en-GB.com_supportgroups.ini b/admin/language/en-GB/en-GB.com_supportgroups.ini index cb4674d..3bfae16 100644 --- a/admin/language/en-GB/en-GB.com_supportgroups.ini +++ b/admin/language/en-GB/en-GB.com_supportgroups.ini @@ -268,6 +268,7 @@ COM_SUPPORTGROUPS_AREA_TYPE_VERSION_DESC="A count of the number of times this Ar COM_SUPPORTGROUPS_AREA_TYPE_VERSION_LABEL="Version" COM_SUPPORTGROUPS_AREA_VERSION_DESC="A count of the number of times this Area has been revised." COM_SUPPORTGROUPS_AREA_VERSION_LABEL="Version" +COM_SUPPORTGROUPS_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!" COM_SUPPORTGROUPS_AUTHOR="Author" COM_SUPPORTGROUPS_BACK="Back" COM_SUPPORTGROUPS_CLOSE_NEW="Close & New" @@ -609,6 +610,8 @@ COM_SUPPORTGROUPS_EDIT_CREATED_DATE_DESC="Allows users in this group to edit cre COM_SUPPORTGROUPS_EDIT_S="Edit %s" COM_SUPPORTGROUPS_EDIT_VERSIONS="Edit Version" COM_SUPPORTGROUPS_EDIT_VERSIONS_DESC="Allows users in this group to edit versions." +COM_SUPPORTGROUPS_EMPTY_TRASH="Empty trash" +COM_SUPPORTGROUPS_EXIT_TRASH="Exit trash" COM_SUPPORTGROUPS_EXPORT_DATA="Export Data" COM_SUPPORTGROUPS_EXPORT_DATA_DESC="Allows users in this group to export data." COM_SUPPORTGROUPS_EXPORT_FAILED="Export Failed" @@ -791,6 +794,91 @@ COM_SUPPORTGROUPS_FACILITY_TYPE_VERSION_DESC="A count of the number of times thi COM_SUPPORTGROUPS_FACILITY_TYPE_VERSION_LABEL="Version" COM_SUPPORTGROUPS_FACILITY_VERSION_DESC="A count of the number of times this Facility has been revised." COM_SUPPORTGROUPS_FACILITY_VERSION_LABEL="Version" +COM_SUPPORTGROUPS_FILTER_ADMIN_VIEWS_ASCENDING="Admin Views ascending" +COM_SUPPORTGROUPS_FILTER_ADMIN_VIEWS_DESCENDING="Admin Views descending" +COM_SUPPORTGROUPS_FILTER_AMOUNT_ASCENDING="Amount ascending" +COM_SUPPORTGROUPS_FILTER_AMOUNT_DESCENDING="Amount descending" +COM_SUPPORTGROUPS_FILTER_AREA_ASCENDING="Area ascending" +COM_SUPPORTGROUPS_FILTER_AREA_DESCENDING="Area descending" +COM_SUPPORTGROUPS_FILTER_CODE_THREE_ASCENDING="Code Three ascending" +COM_SUPPORTGROUPS_FILTER_CODE_THREE_DESCENDING="Code Three descending" +COM_SUPPORTGROUPS_FILTER_CODE_TWO_ASCENDING="Code Two ascending" +COM_SUPPORTGROUPS_FILTER_CODE_TWO_DESCENDING="Code Two descending" +COM_SUPPORTGROUPS_FILTER_COUNTRY_ASCENDING="Country ascending" +COM_SUPPORTGROUPS_FILTER_COUNTRY_DESCENDING="Country descending" +COM_SUPPORTGROUPS_FILTER_CURRENCY_ASCENDING="Currency ascending" +COM_SUPPORTGROUPS_FILTER_CURRENCY_DESCENDING="Currency descending" +COM_SUPPORTGROUPS_FILTER_DECIMAL_PLACE_ASCENDING="Decimal place ascending" +COM_SUPPORTGROUPS_FILTER_DECIMAL_PLACE_DESCENDING="Decimal place descending" +COM_SUPPORTGROUPS_FILTER_DETAILS_ASCENDING="Details ascending" +COM_SUPPORTGROUPS_FILTER_DETAILS_DESCENDING="Details descending" +COM_SUPPORTGROUPS_FILTER_FACILITY_ASCENDING="Facility ascending" +COM_SUPPORTGROUPS_FILTER_FACILITY_DESCENDING="Facility descending" +COM_SUPPORTGROUPS_FILTER_FEMALES_ASCENDING="Females ascending" +COM_SUPPORTGROUPS_FILTER_FEMALES_DESCENDING="Females descending" +COM_SUPPORTGROUPS_FILTER_LOCATION_ASCENDING="Location ascending" +COM_SUPPORTGROUPS_FILTER_LOCATION_DESCENDING="Location descending" +COM_SUPPORTGROUPS_FILTER_MALES_ASCENDING="Males ascending" +COM_SUPPORTGROUPS_FILTER_MALES_DESCENDING="Males descending" +COM_SUPPORTGROUPS_FILTER_NAME_ASCENDING="Name ascending" +COM_SUPPORTGROUPS_FILTER_NAME_DESCENDING="Name descending" +COM_SUPPORTGROUPS_FILTER_NUMERIC_CODE_ASCENDING="Numeric Code ascending" +COM_SUPPORTGROUPS_FILTER_NUMERIC_CODE_DESCENDING="Numeric Code descending" +COM_SUPPORTGROUPS_FILTER_PHONE_NUMBER_ASCENDING="Phone Number ascending" +COM_SUPPORTGROUPS_FILTER_PHONE_NUMBER_DESCENDING="Phone Number descending" +COM_SUPPORTGROUPS_FILTER_PUBLISHED="Status" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_ADDITIONAL_INFORMATION="Status options for additional information" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_AREAS="Status options for areas" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_AREA_TYPES="Status options for area types" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_COUNTRIES="Status options for countries" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_CURRENCIES="Status options for currencies" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_FACILITIES="Status options for facilities" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_FACILITY_TYPES="Status options for facility types" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_HELP_DOCUMENTS="Status options for help documents" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_INFO_TYPES="Status options for info types" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_PAYMENTS="Status options for payments" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_REGIONS="Status options for regions" +COM_SUPPORTGROUPS_FILTER_PUBLISHED_SUPPORT_GROUPS="Status options for support groups" +COM_SUPPORTGROUPS_FILTER_REGION_ASCENDING="Region ascending" +COM_SUPPORTGROUPS_FILTER_REGION_DESCENDING="Region descending" +COM_SUPPORTGROUPS_FILTER_SEARCH="Searchsupport groups" +COM_SUPPORTGROUPS_FILTER_SEARCH_ADDITIONAL_INFORMATION="Search the additional info items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_AREAS="Search the area items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_AREA_TYPES="Search the area type items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_COUNTRIES="Search the country items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_CURRENCIES="Search the currency items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_FACILITIES="Search the facility items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_FACILITY_TYPES="Search the facility type items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_HELP_DOCUMENTS="Search the help document items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_INFO_TYPES="Search the info type items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_PAYMENTS="Search the payment items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_REGIONS="Search the region items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SEARCH_SUPPORT_GROUPS="Search the support group items. Prefix with ID: to search for an item by ID." +COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS="Select Access" +COM_SUPPORTGROUPS_FILTER_SELECT_ADMIN_VIEWS="Select Admin Views" +COM_SUPPORTGROUPS_FILTER_SELECT_AREA="Select Area" +COM_SUPPORTGROUPS_FILTER_SELECT_COUNTRY="Select Country" +COM_SUPPORTGROUPS_FILTER_SELECT_CURRENCY="Select Currency" +COM_SUPPORTGROUPS_FILTER_SELECT_FACILITY="Select Facility" +COM_SUPPORTGROUPS_FILTER_SELECT_LOCATION="Select Location" +COM_SUPPORTGROUPS_FILTER_SELECT_REGION="Select Region" +COM_SUPPORTGROUPS_FILTER_SELECT_SITE_VIEWS="Select Site Views" +COM_SUPPORTGROUPS_FILTER_SELECT_SUPPORT_GROUP="Select Support Group" +COM_SUPPORTGROUPS_FILTER_SELECT_TYPE="Select Type" +COM_SUPPORTGROUPS_FILTER_SELECT_WORLDZONE="Select Worldzone" +COM_SUPPORTGROUPS_FILTER_SELECT_YEAR="Select Year" +COM_SUPPORTGROUPS_FILTER_SITE_VIEWS_ASCENDING="Site Views ascending" +COM_SUPPORTGROUPS_FILTER_SITE_VIEWS_DESCENDING="Site Views descending" +COM_SUPPORTGROUPS_FILTER_SUPPORT_GROUP_ASCENDING="Support Group ascending" +COM_SUPPORTGROUPS_FILTER_SUPPORT_GROUP_DESCENDING="Support Group descending" +COM_SUPPORTGROUPS_FILTER_TITLE_ASCENDING="Title ascending" +COM_SUPPORTGROUPS_FILTER_TITLE_DESCENDING="Title descending" +COM_SUPPORTGROUPS_FILTER_TYPE_ASCENDING="Type ascending" +COM_SUPPORTGROUPS_FILTER_TYPE_DESCENDING="Type descending" +COM_SUPPORTGROUPS_FILTER_WORLDZONE_ASCENDING="Worldzone ascending" +COM_SUPPORTGROUPS_FILTER_WORLDZONE_DESCENDING="Worldzone descending" +COM_SUPPORTGROUPS_FILTER_YEAR_ASCENDING="Year ascending" +COM_SUPPORTGROUPS_FILTER_YEAR_DESCENDING="Year descending" COM_SUPPORTGROUPS_HELP_DOCUMENT="Help Document" COM_SUPPORTGROUPS_HELP_DOCUMENTS="Help Documents" COM_SUPPORTGROUPS_HELP_DOCUMENTS_ACCESS="Help Documents Access" @@ -1401,6 +1489,8 @@ COM_SUPPORTGROUPS_SUPPORT_GROUP_VERSION_LABEL="Version" COM_SUPPORTGROUPS_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading" COM_SUPPORTGROUPS_THE_README_IS_LOADING="The readme is loading" COM_SUPPORTGROUPS_TRASHED="Trashed" +COM_SUPPORTGROUPS_TRASHED_ITEMS="Trashed items" +COM_SUPPORTGROUPS_TRASH_AREA="Trash Area" COM_SUPPORTGROUPS_TYPE_ADDITIONAL_INFO="Additional Info" COM_SUPPORTGROUPS_TYPE_AREA="Area" COM_SUPPORTGROUPS_TYPE_AREA_TYPE="Area Type" @@ -1417,4 +1507,6 @@ COM_SUPPORTGROUPS_UNDER_GOOGLE_API_TAP="under (Google API) tap." COM_SUPPORTGROUPS_USE_BATCH="Use Batch" COM_SUPPORTGROUPS_USE_BATCH_DESC="Allows users in this group to use batch copy/update method." COM_SUPPORTGROUPS_VERSION="Version" -COM_SUPPORTGROUPS_WEBSITE="Website" \ No newline at end of file +COM_SUPPORTGROUPS_WEBSITE="Website" +COM_SUPPORTGROUPS_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS="You are currently viewing the trashed items." +COM_SUPPORTGROUPS_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT="You are currently viewing the trash area, and you don't have any items in trash at the moment!" \ No newline at end of file diff --git a/admin/layouts/additional_info/metadata.php b/admin/layouts/additional_info/metadata.php index 85b2fd9..90ce264 100644 --- a/admin/layouts/additional_info/metadata.php +++ b/admin/layouts/additional_info/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage metadata.php diff --git a/admin/layouts/additional_info/publishing.php b/admin/layouts/additional_info/publishing.php index 5c16a3a..689723d 100644 --- a/admin/layouts/additional_info/publishing.php +++ b/admin/layouts/additional_info/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/additional_info/settings_above.php b/admin/layouts/additional_info/settings_above.php index 40a6113..3d00b43 100644 --- a/admin/layouts/additional_info/settings_above.php +++ b/admin/layouts/additional_info/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_above.php diff --git a/admin/layouts/additional_info/settings_fullwidth.php b/admin/layouts/additional_info/settings_fullwidth.php index 81ca98f..6e4137f 100644 --- a/admin/layouts/additional_info/settings_fullwidth.php +++ b/admin/layouts/additional_info/settings_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_fullwidth.php diff --git a/admin/layouts/additional_info/settings_left.php b/admin/layouts/additional_info/settings_left.php index 9742bdc..1a94e27 100644 --- a/admin/layouts/additional_info/settings_left.php +++ b/admin/layouts/additional_info/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_left.php diff --git a/admin/layouts/additional_info/support_groups_fullwidth.php b/admin/layouts/additional_info/support_groups_fullwidth.php index 1192a81..a2f8ee3 100644 --- a/admin/layouts/additional_info/support_groups_fullwidth.php +++ b/admin/layouts/additional_info/support_groups_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_groups_fullwidth.php diff --git a/admin/layouts/area/metadata.php b/admin/layouts/area/metadata.php index 85b2fd9..90ce264 100644 --- a/admin/layouts/area/metadata.php +++ b/admin/layouts/area/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage metadata.php diff --git a/admin/layouts/area/publishing.php b/admin/layouts/area/publishing.php index 5c16a3a..689723d 100644 --- a/admin/layouts/area/publishing.php +++ b/admin/layouts/area/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/area/settings_above.php b/admin/layouts/area/settings_above.php index 593495d..c2160ac 100644 --- a/admin/layouts/area/settings_above.php +++ b/admin/layouts/area/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_above.php diff --git a/admin/layouts/area/settings_fullwidth.php b/admin/layouts/area/settings_fullwidth.php index 81ca98f..6e4137f 100644 --- a/admin/layouts/area/settings_fullwidth.php +++ b/admin/layouts/area/settings_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_fullwidth.php diff --git a/admin/layouts/area/settings_left.php b/admin/layouts/area/settings_left.php index bfc2679..b24c49a 100644 --- a/admin/layouts/area/settings_left.php +++ b/admin/layouts/area/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_left.php diff --git a/admin/layouts/area/settings_right.php b/admin/layouts/area/settings_right.php index 43ab615..4bbfcca 100644 --- a/admin/layouts/area/settings_right.php +++ b/admin/layouts/area/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_right.php diff --git a/admin/layouts/area/support_groups_fullwidth.php b/admin/layouts/area/support_groups_fullwidth.php index 8da1df7..ae7017f 100644 --- a/admin/layouts/area/support_groups_fullwidth.php +++ b/admin/layouts/area/support_groups_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_groups_fullwidth.php diff --git a/admin/layouts/area_type/details_left.php b/admin/layouts/area_type/details_left.php index 6552009..f6d0ad8 100644 --- a/admin/layouts/area_type/details_left.php +++ b/admin/layouts/area_type/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_left.php diff --git a/admin/layouts/area_type/details_right.php b/admin/layouts/area_type/details_right.php index f183e2d..f32e6a3 100644 --- a/admin/layouts/area_type/details_right.php +++ b/admin/layouts/area_type/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_right.php diff --git a/admin/layouts/area_type/publishing.php b/admin/layouts/area_type/publishing.php index 284dbd3..6e673dc 100644 --- a/admin/layouts/area_type/publishing.php +++ b/admin/layouts/area_type/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/area_type/publlshing.php b/admin/layouts/area_type/publlshing.php index 4991253..952b318 100644 --- a/admin/layouts/area_type/publlshing.php +++ b/admin/layouts/area_type/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index ca652d6..2f7a6d4 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage batchselection.php diff --git a/admin/layouts/country/metadata.php b/admin/layouts/country/metadata.php index 85b2fd9..90ce264 100644 --- a/admin/layouts/country/metadata.php +++ b/admin/layouts/country/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage metadata.php diff --git a/admin/layouts/country/publishing.php b/admin/layouts/country/publishing.php index 5c16a3a..689723d 100644 --- a/admin/layouts/country/publishing.php +++ b/admin/layouts/country/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/country/regions_fullwidth.php b/admin/layouts/country/regions_fullwidth.php index 247b01f..88a47f4 100644 --- a/admin/layouts/country/regions_fullwidth.php +++ b/admin/layouts/country/regions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage regions_fullwidth.php diff --git a/admin/layouts/country/settings_above.php b/admin/layouts/country/settings_above.php index 40a6113..3d00b43 100644 --- a/admin/layouts/country/settings_above.php +++ b/admin/layouts/country/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_above.php diff --git a/admin/layouts/country/settings_left.php b/admin/layouts/country/settings_left.php index 3f7d5a1..4295dfc 100644 --- a/admin/layouts/country/settings_left.php +++ b/admin/layouts/country/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_left.php diff --git a/admin/layouts/country/settings_right.php b/admin/layouts/country/settings_right.php index 4a4dd5d..2e7b40f 100644 --- a/admin/layouts/country/settings_right.php +++ b/admin/layouts/country/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_right.php diff --git a/admin/layouts/currency/details_above.php b/admin/layouts/currency/details_above.php index 8868a6f..ebeb9f0 100644 --- a/admin/layouts/currency/details_above.php +++ b/admin/layouts/currency/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_above.php diff --git a/admin/layouts/currency/details_left.php b/admin/layouts/currency/details_left.php index 3207be4..757feba 100644 --- a/admin/layouts/currency/details_left.php +++ b/admin/layouts/currency/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_left.php diff --git a/admin/layouts/currency/details_right.php b/admin/layouts/currency/details_right.php index cadb477..8b80827 100644 --- a/admin/layouts/currency/details_right.php +++ b/admin/layouts/currency/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_right.php diff --git a/admin/layouts/currency/metadata.php b/admin/layouts/currency/metadata.php index 85b2fd9..90ce264 100644 --- a/admin/layouts/currency/metadata.php +++ b/admin/layouts/currency/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage metadata.php diff --git a/admin/layouts/currency/publishing.php b/admin/layouts/currency/publishing.php index 5c16a3a..689723d 100644 --- a/admin/layouts/currency/publishing.php +++ b/admin/layouts/currency/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/facility/location_fullwidth.php b/admin/layouts/facility/location_fullwidth.php index 7d3eaf5..0fd6c53 100644 --- a/admin/layouts/facility/location_fullwidth.php +++ b/admin/layouts/facility/location_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage location_fullwidth.php diff --git a/admin/layouts/facility/metadata.php b/admin/layouts/facility/metadata.php index 85b2fd9..90ce264 100644 --- a/admin/layouts/facility/metadata.php +++ b/admin/layouts/facility/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage metadata.php diff --git a/admin/layouts/facility/publishing.php b/admin/layouts/facility/publishing.php index 5c16a3a..689723d 100644 --- a/admin/layouts/facility/publishing.php +++ b/admin/layouts/facility/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/facility/settings_above.php b/admin/layouts/facility/settings_above.php index 40a6113..3d00b43 100644 --- a/admin/layouts/facility/settings_above.php +++ b/admin/layouts/facility/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_above.php diff --git a/admin/layouts/facility/settings_fullwidth.php b/admin/layouts/facility/settings_fullwidth.php index 81ca98f..6e4137f 100644 --- a/admin/layouts/facility/settings_fullwidth.php +++ b/admin/layouts/facility/settings_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_fullwidth.php diff --git a/admin/layouts/facility/settings_left.php b/admin/layouts/facility/settings_left.php index ff31ef6..86b99ce 100644 --- a/admin/layouts/facility/settings_left.php +++ b/admin/layouts/facility/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_left.php diff --git a/admin/layouts/facility/settings_right.php b/admin/layouts/facility/settings_right.php index 97f3615..fd85f7b 100644 --- a/admin/layouts/facility/settings_right.php +++ b/admin/layouts/facility/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_right.php diff --git a/admin/layouts/facility/settings_under.php b/admin/layouts/facility/settings_under.php index 54972dc..d43efac 100644 --- a/admin/layouts/facility/settings_under.php +++ b/admin/layouts/facility/settings_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage settings_under.php diff --git a/admin/layouts/facility_type/details_left.php b/admin/layouts/facility_type/details_left.php index 6552009..f6d0ad8 100644 --- a/admin/layouts/facility_type/details_left.php +++ b/admin/layouts/facility_type/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_left.php diff --git a/admin/layouts/facility_type/details_right.php b/admin/layouts/facility_type/details_right.php index f183e2d..f32e6a3 100644 --- a/admin/layouts/facility_type/details_right.php +++ b/admin/layouts/facility_type/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_right.php diff --git a/admin/layouts/facility_type/publishing.php b/admin/layouts/facility_type/publishing.php index 284dbd3..6e673dc 100644 --- a/admin/layouts/facility_type/publishing.php +++ b/admin/layouts/facility_type/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/facility_type/publlshing.php b/admin/layouts/facility_type/publlshing.php index 4991253..952b318 100644 --- a/admin/layouts/facility_type/publlshing.php +++ b/admin/layouts/facility_type/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index 18a2bf6..2bb0cc8 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index cb6b7a6..c36d397 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index cdadf0d..c956b0b 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index d8e3ddd..77ef3ef 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index e2ba954..cbfd36f 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 308084a..3056e87 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 4991253..952b318 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php diff --git a/admin/layouts/info_type/details_left.php b/admin/layouts/info_type/details_left.php index 6552009..f6d0ad8 100644 --- a/admin/layouts/info_type/details_left.php +++ b/admin/layouts/info_type/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_left.php diff --git a/admin/layouts/info_type/details_right.php b/admin/layouts/info_type/details_right.php index f183e2d..f32e6a3 100644 --- a/admin/layouts/info_type/details_right.php +++ b/admin/layouts/info_type/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_right.php diff --git a/admin/layouts/info_type/publishing.php b/admin/layouts/info_type/publishing.php index 284dbd3..6e673dc 100644 --- a/admin/layouts/info_type/publishing.php +++ b/admin/layouts/info_type/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/info_type/publlshing.php b/admin/layouts/info_type/publlshing.php index 4991253..952b318 100644 --- a/admin/layouts/info_type/publlshing.php +++ b/admin/layouts/info_type/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php diff --git a/admin/layouts/payment/details_above.php b/admin/layouts/payment/details_above.php index 5b26b25..9b81b22 100644 --- a/admin/layouts/payment/details_above.php +++ b/admin/layouts/payment/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_above.php diff --git a/admin/layouts/payment/details_left.php b/admin/layouts/payment/details_left.php index 7e2e66d..5515c9e 100644 --- a/admin/layouts/payment/details_left.php +++ b/admin/layouts/payment/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_left.php diff --git a/admin/layouts/payment/details_right.php b/admin/layouts/payment/details_right.php index 41be50f..4f314b0 100644 --- a/admin/layouts/payment/details_right.php +++ b/admin/layouts/payment/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_right.php diff --git a/admin/layouts/payment/publishing.php b/admin/layouts/payment/publishing.php index 284dbd3..6e673dc 100644 --- a/admin/layouts/payment/publishing.php +++ b/admin/layouts/payment/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/payment/publlshing.php b/admin/layouts/payment/publlshing.php index 4991253..952b318 100644 --- a/admin/layouts/payment/publlshing.php +++ b/admin/layouts/payment/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publlshing.php diff --git a/admin/layouts/region/details_above.php b/admin/layouts/region/details_above.php index 8868a6f..ebeb9f0 100644 --- a/admin/layouts/region/details_above.php +++ b/admin/layouts/region/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_above.php diff --git a/admin/layouts/region/details_right.php b/admin/layouts/region/details_right.php index ecf3c52..6c86d5f 100644 --- a/admin/layouts/region/details_right.php +++ b/admin/layouts/region/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_right.php diff --git a/admin/layouts/region/metadata.php b/admin/layouts/region/metadata.php index 85b2fd9..90ce264 100644 --- a/admin/layouts/region/metadata.php +++ b/admin/layouts/region/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage metadata.php diff --git a/admin/layouts/region/publishing.php b/admin/layouts/region/publishing.php index 5c16a3a..689723d 100644 --- a/admin/layouts/region/publishing.php +++ b/admin/layouts/region/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/support_group/details_above.php b/admin/layouts/support_group/details_above.php index 8868a6f..ebeb9f0 100644 --- a/admin/layouts/support_group/details_above.php +++ b/admin/layouts/support_group/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_above.php diff --git a/admin/layouts/support_group/details_fullwidth.php b/admin/layouts/support_group/details_fullwidth.php index 52c7945..854831f 100644 --- a/admin/layouts/support_group/details_fullwidth.php +++ b/admin/layouts/support_group/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_fullwidth.php diff --git a/admin/layouts/support_group/details_left.php b/admin/layouts/support_group/details_left.php index c050df7..55ed12d 100644 --- a/admin/layouts/support_group/details_left.php +++ b/admin/layouts/support_group/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_left.php diff --git a/admin/layouts/support_group/details_right.php b/admin/layouts/support_group/details_right.php index a5ad7f9..a455258 100644 --- a/admin/layouts/support_group/details_right.php +++ b/admin/layouts/support_group/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_right.php diff --git a/admin/layouts/support_group/details_under.php b/admin/layouts/support_group/details_under.php index 2afdd25..9a94ecf 100644 --- a/admin/layouts/support_group/details_under.php +++ b/admin/layouts/support_group/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage details_under.php diff --git a/admin/layouts/support_group/location_fullwidth.php b/admin/layouts/support_group/location_fullwidth.php index 7d3eaf5..0fd6c53 100644 --- a/admin/layouts/support_group/location_fullwidth.php +++ b/admin/layouts/support_group/location_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage location_fullwidth.php diff --git a/admin/layouts/support_group/location_left.php b/admin/layouts/support_group/location_left.php index d3bac6d..d038991 100644 --- a/admin/layouts/support_group/location_left.php +++ b/admin/layouts/support_group/location_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage location_left.php diff --git a/admin/layouts/support_group/metadata.php b/admin/layouts/support_group/metadata.php index 85b2fd9..90ce264 100644 --- a/admin/layouts/support_group/metadata.php +++ b/admin/layouts/support_group/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage metadata.php diff --git a/admin/layouts/support_group/payments_fullwidth.php b/admin/layouts/support_group/payments_fullwidth.php index 700435a..689af9f 100644 --- a/admin/layouts/support_group/payments_fullwidth.php +++ b/admin/layouts/support_group/payments_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payments_fullwidth.php diff --git a/admin/layouts/support_group/publishing.php b/admin/layouts/support_group/publishing.php index 5c16a3a..689723d 100644 --- a/admin/layouts/support_group/publishing.php +++ b/admin/layouts/support_group/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage publishing.php diff --git a/admin/layouts/trashhelper.php b/admin/layouts/trashhelper.php new file mode 100644 index 0000000..566da72 --- /dev/null +++ b/admin/layouts/trashhelper.php @@ -0,0 +1,87 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('JPATH_BASE') or die('Restricted access'); + + + +?> +state->get('filter.published') == -2 && ($displayData->canState && $displayData->canDelete)) : ?> + +
+ items)): ?> +

+ + +

+

+ +

+ + +

+

+ + + +
+ diff --git a/admin/models/additional_info.php b/admin/models/additional_info.php index 6db2f9c..78da2c6 100644 --- a/admin/models/additional_info.php +++ b/admin/models/additional_info.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additional_info.php diff --git a/admin/models/additional_information.php b/admin/models/additional_information.php index 86dfb9f..12a5cdc 100644 --- a/admin/models/additional_information.php +++ b/admin/models/additional_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additional_information.php @@ -73,8 +73,15 @@ class SupportgroupsModelAdditional_information extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -92,10 +99,18 @@ class SupportgroupsModelAdditional_information extends JModelList $this->setState('filter.search', $search); $info_type = $this->getUserStateFromRequest($this->context . '.filter.info_type', 'filter_info_type'); - $this->setState('filter.info_type', $info_type); + if ($formSubmited) + { + $info_type = $app->input->post->get('info_type'); + $this->setState('filter.info_type', $info_type); + } $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } // List state information. parent::populateState($ordering, $direction); @@ -373,7 +388,18 @@ class SupportgroupsModelAdditional_information extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/ajax.php b/admin/models/ajax.php index 54b799c..4f505de 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage ajax.php diff --git a/admin/models/area.php b/admin/models/area.php index 4d31839..c42e74a 100644 --- a/admin/models/area.php +++ b/admin/models/area.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area.php diff --git a/admin/models/area_type.php b/admin/models/area_type.php index 18a7697..fb5dd98 100644 --- a/admin/models/area_type.php +++ b/admin/models/area_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area_type.php diff --git a/admin/models/area_types.php b/admin/models/area_types.php index 1378f67..cf6f68d 100644 --- a/admin/models/area_types.php +++ b/admin/models/area_types.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area_types.php @@ -72,8 +72,15 @@ class SupportgroupsModelArea_types extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -91,7 +98,11 @@ class SupportgroupsModelArea_types extends JModelList $this->setState('filter.search', $search); $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } // List state information. parent::populateState($ordering, $direction); @@ -348,7 +359,18 @@ class SupportgroupsModelArea_types extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/areas.php b/admin/models/areas.php index e822cc2..c173844 100644 --- a/admin/models/areas.php +++ b/admin/models/areas.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage areas.php @@ -74,8 +74,15 @@ class SupportgroupsModelAreas extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -93,13 +100,25 @@ class SupportgroupsModelAreas extends JModelList $this->setState('filter.search', $search); $area_type = $this->getUserStateFromRequest($this->context . '.filter.area_type', 'filter_area_type'); - $this->setState('filter.area_type', $area_type); + if ($formSubmited) + { + $area_type = $app->input->post->get('area_type'); + $this->setState('filter.area_type', $area_type); + } $region = $this->getUserStateFromRequest($this->context . '.filter.region', 'filter_region'); - $this->setState('filter.region', $region); + if ($formSubmited) + { + $region = $app->input->post->get('region'); + $this->setState('filter.region', $region); + } $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } // List state information. parent::populateState($ordering, $direction); @@ -416,7 +435,18 @@ class SupportgroupsModelAreas extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/countries.php b/admin/models/countries.php index 41303e6..2a62cff 100644 --- a/admin/models/countries.php +++ b/admin/models/countries.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage countries.php @@ -76,8 +76,15 @@ class SupportgroupsModelCountries extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -95,19 +102,39 @@ class SupportgroupsModelCountries extends JModelList $this->setState('filter.search', $search); $currency = $this->getUserStateFromRequest($this->context . '.filter.currency', 'filter_currency'); - $this->setState('filter.currency', $currency); + if ($formSubmited) + { + $currency = $app->input->post->get('currency'); + $this->setState('filter.currency', $currency); + } $worldzone = $this->getUserStateFromRequest($this->context . '.filter.worldzone', 'filter_worldzone'); - $this->setState('filter.worldzone', $worldzone); + if ($formSubmited) + { + $worldzone = $app->input->post->get('worldzone'); + $this->setState('filter.worldzone', $worldzone); + } $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } $codethree = $this->getUserStateFromRequest($this->context . '.filter.codethree', 'filter_codethree'); - $this->setState('filter.codethree', $codethree); + if ($formSubmited) + { + $codethree = $app->input->post->get('codethree'); + $this->setState('filter.codethree', $codethree); + } $codetwo = $this->getUserStateFromRequest($this->context . '.filter.codetwo', 'filter_codetwo'); - $this->setState('filter.codetwo', $codetwo); + if ($formSubmited) + { + $codetwo = $app->input->post->get('codetwo'); + $this->setState('filter.codetwo', $codetwo); + } // List state information. parent::populateState($ordering, $direction); @@ -402,7 +429,18 @@ class SupportgroupsModelCountries extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/country.php b/admin/models/country.php index 322a3dc..e039650 100644 --- a/admin/models/country.php +++ b/admin/models/country.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage country.php diff --git a/admin/models/currencies.php b/admin/models/currencies.php index f09aa5a..fcc5e8b 100644 --- a/admin/models/currencies.php +++ b/admin/models/currencies.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currencies.php @@ -75,8 +75,15 @@ class SupportgroupsModelCurrencies extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -94,16 +101,32 @@ class SupportgroupsModelCurrencies extends JModelList $this->setState('filter.search', $search); $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } $codethree = $this->getUserStateFromRequest($this->context . '.filter.codethree', 'filter_codethree'); - $this->setState('filter.codethree', $codethree); + if ($formSubmited) + { + $codethree = $app->input->post->get('codethree'); + $this->setState('filter.codethree', $codethree); + } $numericcode = $this->getUserStateFromRequest($this->context . '.filter.numericcode', 'filter_numericcode'); - $this->setState('filter.numericcode', $numericcode); + if ($formSubmited) + { + $numericcode = $app->input->post->get('numericcode'); + $this->setState('filter.numericcode', $numericcode); + } $decimalplace = $this->getUserStateFromRequest($this->context . '.filter.decimalplace', 'filter_decimalplace'); - $this->setState('filter.decimalplace', $decimalplace); + if ($formSubmited) + { + $decimalplace = $app->input->post->get('decimalplace'); + $this->setState('filter.decimalplace', $decimalplace); + } // List state information. parent::populateState($ordering, $direction); @@ -360,7 +383,18 @@ class SupportgroupsModelCurrencies extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/currency.php b/admin/models/currency.php index e0fbbbb..384fabf 100644 --- a/admin/models/currency.php +++ b/admin/models/currency.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currency.php diff --git a/admin/models/facilities.php b/admin/models/facilities.php index 40b7245..cb09db6 100644 --- a/admin/models/facilities.php +++ b/admin/models/facilities.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facilities.php @@ -75,8 +75,15 @@ class SupportgroupsModelFacilities extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -94,16 +101,32 @@ class SupportgroupsModelFacilities extends JModelList $this->setState('filter.search', $search); $facility_type = $this->getUserStateFromRequest($this->context . '.filter.facility_type', 'filter_facility_type'); - $this->setState('filter.facility_type', $facility_type); + if ($formSubmited) + { + $facility_type = $app->input->post->get('facility_type'); + $this->setState('filter.facility_type', $facility_type); + } $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } $phone = $this->getUserStateFromRequest($this->context . '.filter.phone', 'filter_phone'); - $this->setState('filter.phone', $phone); + if ($formSubmited) + { + $phone = $app->input->post->get('phone'); + $this->setState('filter.phone', $phone); + } $details = $this->getUserStateFromRequest($this->context . '.filter.details', 'filter_details'); - $this->setState('filter.details', $details); + if ($formSubmited) + { + $details = $app->input->post->get('details'); + $this->setState('filter.details', $details); + } // List state information. parent::populateState($ordering, $direction); @@ -381,7 +404,18 @@ class SupportgroupsModelFacilities extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/facility.php b/admin/models/facility.php index 3f52c69..b89f683 100644 --- a/admin/models/facility.php +++ b/admin/models/facility.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility.php diff --git a/admin/models/facility_type.php b/admin/models/facility_type.php index 7410454..df290d2 100644 --- a/admin/models/facility_type.php +++ b/admin/models/facility_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility_type.php diff --git a/admin/models/facility_types.php b/admin/models/facility_types.php index fa19063..67325d0 100644 --- a/admin/models/facility_types.php +++ b/admin/models/facility_types.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility_types.php @@ -72,8 +72,15 @@ class SupportgroupsModelFacility_types extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -91,7 +98,11 @@ class SupportgroupsModelFacility_types extends JModelList $this->setState('filter.search', $search); $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } // List state information. parent::populateState($ordering, $direction); @@ -348,7 +359,18 @@ class SupportgroupsModelFacility_types extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/fields/additionalinfo.php b/admin/models/fields/additionalinfo.php index 2a782e8..0d89c8e 100644 --- a/admin/models/fields/additionalinfo.php +++ b/admin/models/fields/additionalinfo.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additionalinfo.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 9fcc6fc..9056554 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/areas.php b/admin/models/fields/areas.php index 2e37849..9439387 100644 --- a/admin/models/fields/areas.php +++ b/admin/models/fields/areas.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage areas.php diff --git a/admin/models/fields/areastype.php b/admin/models/fields/areastype.php index 2d2fc60..c4b1d3a 100644 --- a/admin/models/fields/areastype.php +++ b/admin/models/fields/areastype.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage areastype.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index a727c78..8ac61f0 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage articles.php diff --git a/admin/models/fields/countries.php b/admin/models/fields/countries.php index bdc6551..5c69537 100644 --- a/admin/models/fields/countries.php +++ b/admin/models/fields/countries.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage countries.php diff --git a/admin/models/fields/countriesfilterworldzone.php b/admin/models/fields/countriesfilterworldzone.php new file mode 100644 index 0000000..559f8ba --- /dev/null +++ b/admin/models/fields/countriesfilterworldzone.php @@ -0,0 +1,81 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Countriesfilterworldzone Form Field class for the Supportgroups component + */ +class JFormFieldCountriesfilterworldzone extends JFormFieldList +{ + /** + * The countriesfilterworldzone field type. + * + * @var string + */ + public $type = 'countriesfilterworldzone'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + protected function getOptions() + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + + // Select the text. + $query->select($db->quoteName('worldzone')); + $query->from($db->quoteName('#__supportgroups_country')); + $query->order($db->quoteName('worldzone') . ' ASC'); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + + $results = $db->loadColumn(); + $_filter = array(); + $_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_WORLDZONE') . ' -'); + + if ($results) + { + $results = array_unique($results); + foreach ($results as $worldzone) + { + // Now add the worldzone and its text to the options array + $_filter[] = JHtml::_('select.option', $worldzone, $worldzone); + } + } + return $_filter; + } +} diff --git a/admin/models/fields/currency.php b/admin/models/fields/currency.php index b38dcad..f148641 100644 --- a/admin/models/fields/currency.php +++ b/admin/models/fields/currency.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currency.php diff --git a/admin/models/fields/facilities.php b/admin/models/fields/facilities.php index 6d506d6..ae8aaee 100644 --- a/admin/models/fields/facilities.php +++ b/admin/models/fields/facilities.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facilities.php diff --git a/admin/models/fields/facilitiestype.php b/admin/models/fields/facilitiestype.php index 5459a1b..847def7 100644 --- a/admin/models/fields/facilitiestype.php +++ b/admin/models/fields/facilitiestype.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facilitiestype.php diff --git a/admin/models/fields/helpdocumentsfilterlocation.php b/admin/models/fields/helpdocumentsfilterlocation.php new file mode 100644 index 0000000..e5ac219 --- /dev/null +++ b/admin/models/fields/helpdocumentsfilterlocation.php @@ -0,0 +1,85 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Helpdocumentsfilterlocation Form Field class for the Supportgroups component + */ +class JFormFieldHelpdocumentsfilterlocation extends JFormFieldList +{ + /** + * The helpdocumentsfilterlocation field type. + * + * @var string + */ + public $type = 'helpdocumentsfilterlocation'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + protected function getOptions() + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + + // Select the text. + $query->select($db->quoteName('location')); + $query->from($db->quoteName('#__supportgroups_help_document')); + $query->order($db->quoteName('location') . ' ASC'); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + + $results = $db->loadColumn(); + $_filter = array(); + $_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_LOCATION') . ' -'); + + if ($results) + { + // get help_documentsmodel + $model = SupportgroupsHelper::getModel('help_documents'); + $results = array_unique($results); + foreach ($results as $location) + { + // Translate the location selection + $text = $model->selectionTranslation($location,'location'); + // Now add the location and its text to the options array + $_filter[] = JHtml::_('select.option', $location, JText::_($text)); + } + } + return $_filter; + } +} diff --git a/admin/models/fields/helpdocumentsfiltertype.php b/admin/models/fields/helpdocumentsfiltertype.php new file mode 100644 index 0000000..4635c20 --- /dev/null +++ b/admin/models/fields/helpdocumentsfiltertype.php @@ -0,0 +1,85 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Helpdocumentsfiltertype Form Field class for the Supportgroups component + */ +class JFormFieldHelpdocumentsfiltertype extends JFormFieldList +{ + /** + * The helpdocumentsfiltertype field type. + * + * @var string + */ + public $type = 'helpdocumentsfiltertype'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + protected function getOptions() + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + + // Select the text. + $query->select($db->quoteName('type')); + $query->from($db->quoteName('#__supportgroups_help_document')); + $query->order($db->quoteName('type') . ' ASC'); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + + $results = $db->loadColumn(); + $_filter = array(); + $_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_TYPE') . ' -'); + + if ($results) + { + // get help_documentsmodel + $model = SupportgroupsHelper::getModel('help_documents'); + $results = array_unique($results); + foreach ($results as $type) + { + // Translate the type selection + $text = $model->selectionTranslation($type,'type'); + // Now add the type and its text to the options array + $_filter[] = JHtml::_('select.option', $type, JText::_($text)); + } + } + return $_filter; + } +} diff --git a/admin/models/fields/infotype.php b/admin/models/fields/infotype.php index 0671cc4..36a2e52 100644 --- a/admin/models/fields/infotype.php +++ b/admin/models/fields/infotype.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage infotype.php diff --git a/admin/models/fields/paymentsfilteryear.php b/admin/models/fields/paymentsfilteryear.php new file mode 100644 index 0000000..50baae8 --- /dev/null +++ b/admin/models/fields/paymentsfilteryear.php @@ -0,0 +1,85 @@ + + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Support Groups + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file +defined('_JEXEC') or die('Restricted access'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Paymentsfilteryear Form Field class for the Supportgroups component + */ +class JFormFieldPaymentsfilteryear extends JFormFieldList +{ + /** + * The paymentsfilteryear field type. + * + * @var string + */ + public $type = 'paymentsfilteryear'; + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + protected function getOptions() + { + // Get a db connection. + $db = JFactory::getDbo(); + + // Create a new query object. + $query = $db->getQuery(true); + + // Select the text. + $query->select($db->quoteName('year')); + $query->from($db->quoteName('#__supportgroups_payment')); + $query->order($db->quoteName('year') . ' ASC'); + + // Reset the query using our newly populated query object. + $db->setQuery($query); + + $results = $db->loadColumn(); + $_filter = array(); + $_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_YEAR') . ' -'); + + if ($results) + { + // get paymentsmodel + $model = SupportgroupsHelper::getModel('payments'); + $results = array_unique($results); + foreach ($results as $year) + { + // Translate the year selection + $text = $model->selectionTranslation($year,'year'); + // Now add the year and its text to the options array + $_filter[] = JHtml::_('select.option', $year, JText::_($text)); + } + } + return $_filter; + } +} diff --git a/admin/models/fields/regions.php b/admin/models/fields/regions.php index 33c562b..efaedde 100644 --- a/admin/models/fields/regions.php +++ b/admin/models/fields/regions.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage regions.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index 9c8658a..c7ee0f7 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/supportgroups.php b/admin/models/fields/supportgroups.php index cf3603e..9a0bab0 100644 --- a/admin/models/fields/supportgroups.php +++ b/admin/models/fields/supportgroups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php diff --git a/admin/models/forms/additional_info.js b/admin/models/forms/additional_info.js index 83a7b79..6e6568a 100644 --- a/admin/models/forms/additional_info.js +++ b/admin/models/forms/additional_info.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additional_info.js diff --git a/admin/models/forms/area.js b/admin/models/forms/area.js index db13939..d2fc59f 100644 --- a/admin/models/forms/area.js +++ b/admin/models/forms/area.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area.js diff --git a/admin/models/forms/area_type.js b/admin/models/forms/area_type.js index ed99843..ca4ac45 100644 --- a/admin/models/forms/area_type.js +++ b/admin/models/forms/area_type.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area_type.js diff --git a/admin/models/forms/country.js b/admin/models/forms/country.js index c761419..573c24b 100644 --- a/admin/models/forms/country.js +++ b/admin/models/forms/country.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage country.js diff --git a/admin/models/forms/currency.js b/admin/models/forms/currency.js index d35c93c..2e465d6 100644 --- a/admin/models/forms/currency.js +++ b/admin/models/forms/currency.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currency.js diff --git a/admin/models/forms/facility.js b/admin/models/forms/facility.js index 46c0993..d01d542 100644 --- a/admin/models/forms/facility.js +++ b/admin/models/forms/facility.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility.js diff --git a/admin/models/forms/facility_type.js b/admin/models/forms/facility_type.js index 025b835..92afa79 100644 --- a/admin/models/forms/facility_type.js +++ b/admin/models/forms/facility_type.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility_type.js diff --git a/admin/models/forms/filter_additional_information.xml b/admin/models/forms/filter_additional_information.xml new file mode 100644 index 0000000..a619bbd --- /dev/null +++ b/admin/models/forms/filter_additional_information.xml @@ -0,0 +1,76 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_area_types.xml b/admin/models/forms/filter_area_types.xml new file mode 100644 index 0000000..645379a --- /dev/null +++ b/admin/models/forms/filter_area_types.xml @@ -0,0 +1,67 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_areas.xml b/admin/models/forms/filter_areas.xml new file mode 100644 index 0000000..4b0f093 --- /dev/null +++ b/admin/models/forms/filter_areas.xml @@ -0,0 +1,85 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_countries.xml b/admin/models/forms/filter_countries.xml new file mode 100644 index 0000000..9ad5642 --- /dev/null +++ b/admin/models/forms/filter_countries.xml @@ -0,0 +1,89 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_currencies.xml b/admin/models/forms/filter_currencies.xml new file mode 100644 index 0000000..e75418b --- /dev/null +++ b/admin/models/forms/filter_currencies.xml @@ -0,0 +1,73 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_facilities.xml b/admin/models/forms/filter_facilities.xml new file mode 100644 index 0000000..e4dc09a --- /dev/null +++ b/admin/models/forms/filter_facilities.xml @@ -0,0 +1,80 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_facility_types.xml b/admin/models/forms/filter_facility_types.xml new file mode 100644 index 0000000..0663af4 --- /dev/null +++ b/admin/models/forms/filter_facility_types.xml @@ -0,0 +1,67 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_help_documents.xml b/admin/models/forms/filter_help_documents.xml new file mode 100644 index 0000000..3e2818f --- /dev/null +++ b/admin/models/forms/filter_help_documents.xml @@ -0,0 +1,103 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_info_types.xml b/admin/models/forms/filter_info_types.xml new file mode 100644 index 0000000..23ceb63 --- /dev/null +++ b/admin/models/forms/filter_info_types.xml @@ -0,0 +1,67 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_payments.xml b/admin/models/forms/filter_payments.xml new file mode 100644 index 0000000..ca0b4e3 --- /dev/null +++ b/admin/models/forms/filter_payments.xml @@ -0,0 +1,85 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_regions.xml b/admin/models/forms/filter_regions.xml new file mode 100644 index 0000000..dffec70 --- /dev/null +++ b/admin/models/forms/filter_regions.xml @@ -0,0 +1,76 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/filter_support_groups.xml b/admin/models/forms/filter_support_groups.xml new file mode 100644 index 0000000..ed8d8c1 --- /dev/null +++ b/admin/models/forms/filter_support_groups.xml @@ -0,0 +1,91 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 7147eca..f8bf230 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help_document.js diff --git a/admin/models/forms/info_type.js b/admin/models/forms/info_type.js index 6ba51cf..99fc597 100644 --- a/admin/models/forms/info_type.js +++ b/admin/models/forms/info_type.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage info_type.js diff --git a/admin/models/forms/payment.js b/admin/models/forms/payment.js index 494c68a..cdf17c6 100644 --- a/admin/models/forms/payment.js +++ b/admin/models/forms/payment.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payment.js diff --git a/admin/models/forms/region.js b/admin/models/forms/region.js index e4b04de..9f11e3e 100644 --- a/admin/models/forms/region.js +++ b/admin/models/forms/region.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage region.js diff --git a/admin/models/forms/support_group.js b/admin/models/forms/support_group.js index 2dfe2c3..e305c68 100644 --- a/admin/models/forms/support_group.js +++ b/admin/models/forms/support_group.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_group.js diff --git a/admin/models/help_document.php b/admin/models/help_document.php index ced1a95..8af7007 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 52aea17..f9a69dd 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help_documents.php @@ -76,8 +76,15 @@ class SupportgroupsModelHelp_documents extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -95,19 +102,39 @@ class SupportgroupsModelHelp_documents extends JModelList $this->setState('filter.search', $search); $type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type'); - $this->setState('filter.type', $type); + if ($formSubmited) + { + $type = $app->input->post->get('type'); + $this->setState('filter.type', $type); + } $location = $this->getUserStateFromRequest($this->context . '.filter.location', 'filter_location'); - $this->setState('filter.location', $location); + if ($formSubmited) + { + $location = $app->input->post->get('location'); + $this->setState('filter.location', $location); + } $admin_view = $this->getUserStateFromRequest($this->context . '.filter.admin_view', 'filter_admin_view'); - $this->setState('filter.admin_view', $admin_view); + if ($formSubmited) + { + $admin_view = $app->input->post->get('admin_view'); + $this->setState('filter.admin_view', $admin_view); + } $site_view = $this->getUserStateFromRequest($this->context . '.filter.site_view', 'filter_site_view'); - $this->setState('filter.site_view', $site_view); + if ($formSubmited) + { + $site_view = $app->input->post->get('site_view'); + $this->setState('filter.site_view', $site_view); + } $title = $this->getUserStateFromRequest($this->context . '.filter.title', 'filter_title'); - $this->setState('filter.title', $title); + if ($formSubmited) + { + $title = $app->input->post->get('title'); + $this->setState('filter.title', $title); + } // List state information. parent::populateState($ordering, $direction); @@ -494,7 +521,18 @@ class SupportgroupsModelHelp_documents extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/import.php b/admin/models/import.php index 6215e9f..c2cb0c2 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage import.php diff --git a/admin/models/info_type.php b/admin/models/info_type.php index 964859c..ec6964e 100644 --- a/admin/models/info_type.php +++ b/admin/models/info_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage info_type.php diff --git a/admin/models/info_types.php b/admin/models/info_types.php index 17b850b..c74988c 100644 --- a/admin/models/info_types.php +++ b/admin/models/info_types.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage info_types.php @@ -72,8 +72,15 @@ class SupportgroupsModelInfo_types extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -91,7 +98,11 @@ class SupportgroupsModelInfo_types extends JModelList $this->setState('filter.search', $search); $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } // List state information. parent::populateState($ordering, $direction); @@ -348,7 +359,18 @@ class SupportgroupsModelInfo_types extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/payment.php b/admin/models/payment.php index f6bf9e2..f776240 100644 --- a/admin/models/payment.php +++ b/admin/models/payment.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payment.php diff --git a/admin/models/payments.php b/admin/models/payments.php index 3270382..d513cf5 100644 --- a/admin/models/payments.php +++ b/admin/models/payments.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payments.php @@ -74,8 +74,15 @@ class SupportgroupsModelPayments extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -93,13 +100,25 @@ class SupportgroupsModelPayments extends JModelList $this->setState('filter.search', $search); $support_group = $this->getUserStateFromRequest($this->context . '.filter.support_group', 'filter_support_group'); - $this->setState('filter.support_group', $support_group); + if ($formSubmited) + { + $support_group = $app->input->post->get('support_group'); + $this->setState('filter.support_group', $support_group); + } $year = $this->getUserStateFromRequest($this->context . '.filter.year', 'filter_year'); - $this->setState('filter.year', $year); + if ($formSubmited) + { + $year = $app->input->post->get('year'); + $this->setState('filter.year', $year); + } $amount = $this->getUserStateFromRequest($this->context . '.filter.amount', 'filter_amount'); - $this->setState('filter.amount', $amount); + if ($formSubmited) + { + $amount = $app->input->post->get('amount'); + $this->setState('filter.amount', $amount); + } // List state information. parent::populateState($ordering, $direction); @@ -468,7 +487,18 @@ class SupportgroupsModelPayments extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/region.php b/admin/models/region.php index 58bf9be..a9dcbca 100644 --- a/admin/models/region.php +++ b/admin/models/region.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage region.php diff --git a/admin/models/regions.php b/admin/models/regions.php index af6d53b..3397eef 100644 --- a/admin/models/regions.php +++ b/admin/models/regions.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage regions.php @@ -73,8 +73,15 @@ class SupportgroupsModelRegions extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -92,10 +99,18 @@ class SupportgroupsModelRegions extends JModelList $this->setState('filter.search', $search); $country = $this->getUserStateFromRequest($this->context . '.filter.country', 'filter_country'); - $this->setState('filter.country', $country); + if ($formSubmited) + { + $country = $app->input->post->get('country'); + $this->setState('filter.country', $country); + } $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } // List state information. parent::populateState($ordering, $direction); @@ -373,7 +388,18 @@ class SupportgroupsModelRegions extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/support_group.php b/admin/models/support_group.php index 5f66423..908a97e 100644 --- a/admin/models/support_group.php +++ b/admin/models/support_group.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_group.php diff --git a/admin/models/support_groups.php b/admin/models/support_groups.php index 4139d12..6eb6fdb 100644 --- a/admin/models/support_groups.php +++ b/admin/models/support_groups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_groups.php @@ -243,8 +243,15 @@ class SupportgroupsModelSupport_groups extends JModelList $this->context .= '.' . $layout; } + // Check if the form was submitted + $formSubmited = $app->input->post->get('form_submited'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int'); - $this->setState('filter.access', $access); + if ($formSubmited) + { + $access = $app->input->post->get('access'); + $this->setState('filter.access', $access); + } $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); @@ -262,22 +269,46 @@ class SupportgroupsModelSupport_groups extends JModelList $this->setState('filter.search', $search); $area = $this->getUserStateFromRequest($this->context . '.filter.area', 'filter_area'); - $this->setState('filter.area', $area); + if ($formSubmited) + { + $area = $app->input->post->get('area'); + $this->setState('filter.area', $area); + } $facility = $this->getUserStateFromRequest($this->context . '.filter.facility', 'filter_facility'); - $this->setState('filter.facility', $facility); + if ($formSubmited) + { + $facility = $app->input->post->get('facility'); + $this->setState('filter.facility', $facility); + } $name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name'); - $this->setState('filter.name', $name); + if ($formSubmited) + { + $name = $app->input->post->get('name'); + $this->setState('filter.name', $name); + } $phone = $this->getUserStateFromRequest($this->context . '.filter.phone', 'filter_phone'); - $this->setState('filter.phone', $phone); + if ($formSubmited) + { + $phone = $app->input->post->get('phone'); + $this->setState('filter.phone', $phone); + } $male = $this->getUserStateFromRequest($this->context . '.filter.male', 'filter_male'); - $this->setState('filter.male', $male); + if ($formSubmited) + { + $male = $app->input->post->get('male'); + $this->setState('filter.male', $male); + } $female = $this->getUserStateFromRequest($this->context . '.filter.female', 'filter_female'); - $this->setState('filter.female', $female); + if ($formSubmited) + { + $female = $app->input->post->get('female'); + $this->setState('filter.female', $female); + } // List state information. parent::populateState($ordering, $direction); @@ -576,7 +607,18 @@ class SupportgroupsModelSupport_groups extends JModelList $id .= ':' . $this->getState('filter.id'); $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.published'); - $id .= ':' . $this->getState('filter.access'); + // Check if the value is an array + $_access = $this->getState('filter.access'); + if (SupportgroupsHelper::checkArray($_access)) + { + $id .= ':' . implode(':', $_access); + } + // Check if this is only an number or string + elseif (is_numeric($_access) + || SupportgroupsHelper::checkString($_access)) + { + $id .= ':' . $_access; + } $id .= ':' . $this->getState('filter.ordering'); $id .= ':' . $this->getState('filter.created_by'); $id .= ':' . $this->getState('filter.modified_by'); diff --git a/admin/models/supportgroups.php b/admin/models/supportgroups.php index 71ae2c4..e3d6654 100644 --- a/admin/models/supportgroups.php +++ b/admin/models/supportgroups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php diff --git a/admin/supportgroups.php b/admin/supportgroups.php index 65e855b..28d69ce 100644 --- a/admin/supportgroups.php +++ b/admin/supportgroups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php diff --git a/admin/tables/additional_info.php b/admin/tables/additional_info.php index ff3ccbc..c593798 100644 --- a/admin/tables/additional_info.php +++ b/admin/tables/additional_info.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage additional_info.php diff --git a/admin/tables/area.php b/admin/tables/area.php index b8cfb93..9217016 100644 --- a/admin/tables/area.php +++ b/admin/tables/area.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area.php diff --git a/admin/tables/area_type.php b/admin/tables/area_type.php index ad5fd37..dad5eb4 100644 --- a/admin/tables/area_type.php +++ b/admin/tables/area_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage area_type.php diff --git a/admin/tables/country.php b/admin/tables/country.php index 1ddd8b8..d379957 100644 --- a/admin/tables/country.php +++ b/admin/tables/country.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage country.php diff --git a/admin/tables/currency.php b/admin/tables/currency.php index e1e77eb..a868f0a 100644 --- a/admin/tables/currency.php +++ b/admin/tables/currency.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage currency.php diff --git a/admin/tables/facility.php b/admin/tables/facility.php index f7244dd..3792b56 100644 --- a/admin/tables/facility.php +++ b/admin/tables/facility.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility.php diff --git a/admin/tables/facility_type.php b/admin/tables/facility_type.php index 118baf4..ee47e5f 100644 --- a/admin/tables/facility_type.php +++ b/admin/tables/facility_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage facility_type.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 47f9195..cfe6141 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help_document.php diff --git a/admin/tables/info_type.php b/admin/tables/info_type.php index 8d10e9f..363bc29 100644 --- a/admin/tables/info_type.php +++ b/admin/tables/info_type.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage info_type.php diff --git a/admin/tables/payment.php b/admin/tables/payment.php index 43d7e38..48d8b2b 100644 --- a/admin/tables/payment.php +++ b/admin/tables/payment.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage payment.php diff --git a/admin/tables/region.php b/admin/tables/region.php index fb41ed9..0cc0b96 100644 --- a/admin/tables/region.php +++ b/admin/tables/region.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage region.php diff --git a/admin/tables/support_group.php b/admin/tables/support_group.php index 0b269e3..e69728a 100644 --- a/admin/tables/support_group.php +++ b/admin/tables/support_group.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage support_group.php diff --git a/admin/views/additional_info/submitbutton.js b/admin/views/additional_info/submitbutton.js index 601c7a3..33b703a 100644 --- a/admin/views/additional_info/submitbutton.js +++ b/admin/views/additional_info/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/additional_info/tmpl/edit.php b/admin/views/additional_info/tmpl/edit.php index 43865c3..02bf992 100644 --- a/admin/views/additional_info/tmpl/edit.php +++ b/admin/views/additional_info/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/additional_info/view.html.php b/admin/views/additional_info/view.html.php index bc92828..f9fbc9d 100644 --- a/admin/views/additional_info/view.html.php +++ b/admin/views/additional_info/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/additional_information/tmpl/default.php b/admin/views/additional_information/tmpl/default.php index 85413b5..2d51978 100644 --- a/admin/views/additional_information/tmpl/default.php +++ b/admin/views/additional_information/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'additional_infoList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -
sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?> loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/additional_information/tmpl/default_batch_body.php b/admin/views/additional_information/tmpl/default_batch_body.php index 1011910..6289895 100644 --- a/admin/views/additional_information/tmpl/default_batch_body.php +++ b/admin/views/additional_information/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/additional_information/tmpl/default_batch_footer.php b/admin/views/additional_information/tmpl/default_batch_footer.php index 099bc4c..c72fb7e 100644 --- a/admin/views/additional_information/tmpl/default_batch_footer.php +++ b/admin/views/additional_information/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/additional_information/tmpl/default_body.php b/admin/views/additional_information/tmpl/default_body.php index c4837ca..cac5664 100644 --- a/admin/views/additional_information/tmpl/default_body.php +++ b/admin/views/additional_information/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/additional_information/tmpl/default_foot.php b/admin/views/additional_information/tmpl/default_foot.php index 86482aa..d939f12 100644 --- a/admin/views/additional_information/tmpl/default_foot.php +++ b/admin/views/additional_information/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/additional_information/tmpl/default_head.php b/admin/views/additional_information/tmpl/default_head.php index 54a49f6..7ec31d2 100644 --- a/admin/views/additional_information/tmpl/default_head.php +++ b/admin/views/additional_information/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/additional_information/tmpl/default_toolbar.php b/admin/views/additional_information/tmpl/default_toolbar.php index 908a96d..e4a95d2 100644 --- a/admin/views/additional_information/tmpl/default_toolbar.php +++ b/admin/views/additional_information/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/additional_information/view.html.php b/admin/views/additional_information/view.html.php index 71d6080..ed9563d 100644 --- a/admin/views/additional_information/view.html.php +++ b/admin/views/additional_information/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewAdditional_information extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,42 +172,6 @@ class SupportgroupsViewAdditional_information extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - // Set Info Type Name Selection - $this->info_typeNameOptions = JFormHelper::loadFieldType('Infotype')->options; - // We do some sanitation for Info Type Name filter - if (SupportgroupsHelper::checkArray($this->info_typeNameOptions) && - isset($this->info_typeNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->info_typeNameOptions[0]->value)) - { - unset($this->info_typeNameOptions[0]); - } - // Only load Info Type Name filter if it has values - if (SupportgroupsHelper::checkArray($this->info_typeNameOptions)) - { - // Info Type Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_ADDITIONAL_INFO_INFO_TYPE_LABEL') . ' -', - 'filter_info_type', - JHtml::_('select.options', $this->info_typeNameOptions, 'value', 'text', $this->state->get('filter.info_type')) - ); - } - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { @@ -227,6 +195,15 @@ class SupportgroupsViewAdditional_information extends JViewLegacy // Only load Info Type Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Info Type Name Selection + $this->info_typeNameOptions = JFormHelper::loadFieldType('Infotype')->options; + // We do some sanitation for Info Type Name filter + if (SupportgroupsHelper::checkArray($this->info_typeNameOptions) && + isset($this->info_typeNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->info_typeNameOptions[0]->value)) + { + unset($this->info_typeNameOptions[0]); + } // Info Type Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_ADDITIONAL_INFO_INFO_TYPE_LABEL').' -', diff --git a/admin/views/area/submitbutton.js b/admin/views/area/submitbutton.js index 022ecfc..c00b872 100644 --- a/admin/views/area/submitbutton.js +++ b/admin/views/area/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/area/tmpl/edit.php b/admin/views/area/tmpl/edit.php index adbf940..77356d6 100644 --- a/admin/views/area/tmpl/edit.php +++ b/admin/views/area/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/area/view.html.php b/admin/views/area/view.html.php index 33f4d75..02e6e27 100644 --- a/admin/views/area/view.html.php +++ b/admin/views/area/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/area_type/submitbutton.js b/admin/views/area_type/submitbutton.js index 4c1f702..31e9494 100644 --- a/admin/views/area_type/submitbutton.js +++ b/admin/views/area_type/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/area_type/tmpl/edit.php b/admin/views/area_type/tmpl/edit.php index 401987b..10fcf6e 100644 --- a/admin/views/area_type/tmpl/edit.php +++ b/admin/views/area_type/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/area_type/view.html.php b/admin/views/area_type/view.html.php index 75646d0..224bad0 100644 --- a/admin/views/area_type/view.html.php +++ b/admin/views/area_type/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/area_types/tmpl/default.php b/admin/views/area_types/tmpl/default.php index 9338cec..cf2861c 100644 --- a/admin/views/area_types/tmpl/default.php +++ b/admin/views/area_types/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'area_typeList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,17 +44,17 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -62,6 +62,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/area_types/tmpl/default_batch_body.php b/admin/views/area_types/tmpl/default_batch_body.php index 64e2db4..8337add 100644 --- a/admin/views/area_types/tmpl/default_batch_body.php +++ b/admin/views/area_types/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/area_types/tmpl/default_batch_footer.php b/admin/views/area_types/tmpl/default_batch_footer.php index 59153d0..78dcd80 100644 --- a/admin/views/area_types/tmpl/default_batch_footer.php +++ b/admin/views/area_types/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/area_types/tmpl/default_body.php b/admin/views/area_types/tmpl/default_body.php index b1a2222..c9a3fef 100644 --- a/admin/views/area_types/tmpl/default_body.php +++ b/admin/views/area_types/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/area_types/tmpl/default_foot.php b/admin/views/area_types/tmpl/default_foot.php index 2c0eca5..c2841f3 100644 --- a/admin/views/area_types/tmpl/default_foot.php +++ b/admin/views/area_types/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/area_types/tmpl/default_head.php b/admin/views/area_types/tmpl/default_head.php index 4770e04..3bf1641 100644 --- a/admin/views/area_types/tmpl/default_head.php +++ b/admin/views/area_types/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/area_types/tmpl/default_toolbar.php b/admin/views/area_types/tmpl/default_toolbar.php index ef70df4..a4374d5 100644 --- a/admin/views/area_types/tmpl/default_toolbar.php +++ b/admin/views/area_types/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/area_types/view.html.php b/admin/views/area_types/view.html.php index 1380048..a367fb9 100644 --- a/admin/views/area_types/view.html.php +++ b/admin/views/area_types/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewArea_types extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,22 +172,6 @@ class SupportgroupsViewArea_types extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { diff --git a/admin/views/areas/tmpl/default.php b/admin/views/areas/tmpl/default.php index 1804e10..c37c867 100644 --- a/admin/views/areas/tmpl/default.php +++ b/admin/views/areas/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'areaList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,11 +44,11 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -56,6 +56,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/areas/tmpl/default_batch_body.php b/admin/views/areas/tmpl/default_batch_body.php index 2d3ccc7..7444860 100644 --- a/admin/views/areas/tmpl/default_batch_body.php +++ b/admin/views/areas/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/areas/tmpl/default_batch_footer.php b/admin/views/areas/tmpl/default_batch_footer.php index 2165f9b..db3dc3a 100644 --- a/admin/views/areas/tmpl/default_batch_footer.php +++ b/admin/views/areas/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/areas/tmpl/default_body.php b/admin/views/areas/tmpl/default_body.php index f268632..de85e44 100644 --- a/admin/views/areas/tmpl/default_body.php +++ b/admin/views/areas/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/areas/tmpl/default_foot.php b/admin/views/areas/tmpl/default_foot.php index f4060d9..d794875 100644 --- a/admin/views/areas/tmpl/default_foot.php +++ b/admin/views/areas/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/areas/tmpl/default_head.php b/admin/views/areas/tmpl/default_head.php index 628d8eb..0c87e4b 100644 --- a/admin/views/areas/tmpl/default_head.php +++ b/admin/views/areas/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/areas/tmpl/default_toolbar.php b/admin/views/areas/tmpl/default_toolbar.php index 81b1e84..cec5fd7 100644 --- a/admin/views/areas/tmpl/default_toolbar.php +++ b/admin/views/areas/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/areas/view.html.php b/admin/views/areas/view.html.php index 52b067a..1fe1e4c 100644 --- a/admin/views/areas/view.html.php +++ b/admin/views/areas/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewAreas extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,62 +172,6 @@ class SupportgroupsViewAreas extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - // Set Area Type Name Selection - $this->area_typeNameOptions = JFormHelper::loadFieldType('Areastype')->options; - // We do some sanitation for Area Type Name filter - if (SupportgroupsHelper::checkArray($this->area_typeNameOptions) && - isset($this->area_typeNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->area_typeNameOptions[0]->value)) - { - unset($this->area_typeNameOptions[0]); - } - // Only load Area Type Name filter if it has values - if (SupportgroupsHelper::checkArray($this->area_typeNameOptions)) - { - // Area Type Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_AREA_AREA_TYPE_LABEL') . ' -', - 'filter_area_type', - JHtml::_('select.options', $this->area_typeNameOptions, 'value', 'text', $this->state->get('filter.area_type')) - ); - } - - // Set Region Name Selection - $this->regionNameOptions = JFormHelper::loadFieldType('Regions')->options; - // We do some sanitation for Region Name filter - if (SupportgroupsHelper::checkArray($this->regionNameOptions) && - isset($this->regionNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->regionNameOptions[0]->value)) - { - unset($this->regionNameOptions[0]); - } - // Only load Region Name filter if it has values - if (SupportgroupsHelper::checkArray($this->regionNameOptions)) - { - // Region Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_AREA_REGION_LABEL') . ' -', - 'filter_region', - JHtml::_('select.options', $this->regionNameOptions, 'value', 'text', $this->state->get('filter.region')) - ); - } - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { @@ -247,6 +195,15 @@ class SupportgroupsViewAreas extends JViewLegacy // Only load Area Type Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Area Type Name Selection + $this->area_typeNameOptions = JFormHelper::loadFieldType('Areastype')->options; + // We do some sanitation for Area Type Name filter + if (SupportgroupsHelper::checkArray($this->area_typeNameOptions) && + isset($this->area_typeNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->area_typeNameOptions[0]->value)) + { + unset($this->area_typeNameOptions[0]); + } // Area Type Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_AREA_AREA_TYPE_LABEL').' -', @@ -258,6 +215,15 @@ class SupportgroupsViewAreas extends JViewLegacy // Only load Region Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Region Name Selection + $this->regionNameOptions = JFormHelper::loadFieldType('Regions')->options; + // We do some sanitation for Region Name filter + if (SupportgroupsHelper::checkArray($this->regionNameOptions) && + isset($this->regionNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->regionNameOptions[0]->value)) + { + unset($this->regionNameOptions[0]); + } // Region Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_AREA_REGION_LABEL').' -', diff --git a/admin/views/countries/tmpl/default.php b/admin/views/countries/tmpl/default.php index a147156..12831c9 100644 --- a/admin/views/countries/tmpl/default.php +++ b/admin/views/countries/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'countryList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,13 +44,13 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -60,7 +60,7 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -68,6 +68,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/countries/tmpl/default_batch_body.php b/admin/views/countries/tmpl/default_batch_body.php index 3eabecb..79f8311 100644 --- a/admin/views/countries/tmpl/default_batch_body.php +++ b/admin/views/countries/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/countries/tmpl/default_batch_footer.php b/admin/views/countries/tmpl/default_batch_footer.php index 5a3b406..735903e 100644 --- a/admin/views/countries/tmpl/default_batch_footer.php +++ b/admin/views/countries/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/countries/tmpl/default_body.php b/admin/views/countries/tmpl/default_body.php index a33ce98..6b71c85 100644 --- a/admin/views/countries/tmpl/default_body.php +++ b/admin/views/countries/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/countries/tmpl/default_foot.php b/admin/views/countries/tmpl/default_foot.php index f4060d9..d794875 100644 --- a/admin/views/countries/tmpl/default_foot.php +++ b/admin/views/countries/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/countries/tmpl/default_head.php b/admin/views/countries/tmpl/default_head.php index e241587..2f66386 100644 --- a/admin/views/countries/tmpl/default_head.php +++ b/admin/views/countries/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/countries/tmpl/default_toolbar.php b/admin/views/countries/tmpl/default_toolbar.php index bea0807..d9aac3c 100644 --- a/admin/views/countries/tmpl/default_toolbar.php +++ b/admin/views/countries/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/countries/view.html.php b/admin/views/countries/view.html.php index 749e28c..351ccc3 100644 --- a/admin/views/countries/view.html.php +++ b/admin/views/countries/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewCountries extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,62 +172,6 @@ class SupportgroupsViewCountries extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - // Set Currency Name Selection - $this->currencyNameOptions = JFormHelper::loadFieldType('Currency')->options; - // We do some sanitation for Currency Name filter - if (SupportgroupsHelper::checkArray($this->currencyNameOptions) && - isset($this->currencyNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->currencyNameOptions[0]->value)) - { - unset($this->currencyNameOptions[0]); - } - // Only load Currency Name filter if it has values - if (SupportgroupsHelper::checkArray($this->currencyNameOptions)) - { - // Currency Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_COUNTRY_CURRENCY_LABEL') . ' -', - 'filter_currency', - JHtml::_('select.options', $this->currencyNameOptions, 'value', 'text', $this->state->get('filter.currency')) - ); - } - - // Set Worldzone Selection - $this->worldzoneOptions = $this->getTheWorldzoneSelections(); - // We do some sanitation for Worldzone filter - if (SupportgroupsHelper::checkArray($this->worldzoneOptions) && - isset($this->worldzoneOptions[0]->value) && - !SupportgroupsHelper::checkString($this->worldzoneOptions[0]->value)) - { - unset($this->worldzoneOptions[0]); - } - // Only load Worldzone filter if it has values - if (SupportgroupsHelper::checkArray($this->worldzoneOptions)) - { - // Worldzone Filter - JHtmlSidebar::addFilter( - '- Select '.JText::_('COM_SUPPORTGROUPS_COUNTRY_WORLDZONE_LABEL').' -', - 'filter_worldzone', - JHtml::_('select.options', $this->worldzoneOptions, 'value', 'text', $this->state->get('filter.worldzone')) - ); - } - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { @@ -247,6 +195,15 @@ class SupportgroupsViewCountries extends JViewLegacy // Only load Currency Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Currency Name Selection + $this->currencyNameOptions = JFormHelper::loadFieldType('Currency')->options; + // We do some sanitation for Currency Name filter + if (SupportgroupsHelper::checkArray($this->currencyNameOptions) && + isset($this->currencyNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->currencyNameOptions[0]->value)) + { + unset($this->currencyNameOptions[0]); + } // Currency Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_COUNTRY_CURRENCY_LABEL').' -', @@ -258,6 +215,15 @@ class SupportgroupsViewCountries extends JViewLegacy // Only load Worldzone batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Worldzone Selection + $this->worldzoneOptions = JFormHelper::loadFieldType('countriesfilterworldzone')->options; + // We do some sanitation for Worldzone filter + if (SupportgroupsHelper::checkArray($this->worldzoneOptions) && + isset($this->worldzoneOptions[0]->value) && + !SupportgroupsHelper::checkString($this->worldzoneOptions[0]->value)) + { + unset($this->worldzoneOptions[0]); + } // Worldzone Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_COUNTRY_WORLDZONE_LABEL').' -', @@ -317,36 +283,5 @@ class SupportgroupsViewCountries extends JViewLegacy 'a.codetwo' => JText::_('COM_SUPPORTGROUPS_COUNTRY_CODETWO_LABEL'), 'a.id' => JText::_('JGRID_HEADING_ID') ); - } - - protected function getTheWorldzoneSelections() - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - - // Select the text. - $query->select($db->quoteName('worldzone')); - $query->from($db->quoteName('#__supportgroups_country')); - $query->order($db->quoteName('worldzone') . ' ASC'); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - - $results = $db->loadColumn(); - $_filter = array(); - - if ($results) - { - $results = array_unique($results); - foreach ($results as $worldzone) - { - // Now add the worldzone and its text to the options array - $_filter[] = JHtml::_('select.option', $worldzone, $worldzone); - } - } - return $_filter; } } diff --git a/admin/views/country/submitbutton.js b/admin/views/country/submitbutton.js index 2138b59..e9aec57 100644 --- a/admin/views/country/submitbutton.js +++ b/admin/views/country/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/country/tmpl/edit.php b/admin/views/country/tmpl/edit.php index 3ae4b55..ea2b25d 100644 --- a/admin/views/country/tmpl/edit.php +++ b/admin/views/country/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/country/view.html.php b/admin/views/country/view.html.php index c090bf7..7abc755 100644 --- a/admin/views/country/view.html.php +++ b/admin/views/country/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/currencies/tmpl/default.php b/admin/views/currencies/tmpl/default.php index 4f1ae7a..f6e2fe3 100644 --- a/admin/views/currencies/tmpl/default.php +++ b/admin/views/currencies/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'currencyList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,23 +44,23 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -68,6 +68,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/currencies/tmpl/default_batch_body.php b/admin/views/currencies/tmpl/default_batch_body.php index aa44e71..b7f6816 100644 --- a/admin/views/currencies/tmpl/default_batch_body.php +++ b/admin/views/currencies/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/currencies/tmpl/default_batch_footer.php b/admin/views/currencies/tmpl/default_batch_footer.php index 555f9a9..f287069 100644 --- a/admin/views/currencies/tmpl/default_batch_footer.php +++ b/admin/views/currencies/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/currencies/tmpl/default_body.php b/admin/views/currencies/tmpl/default_body.php index 52a2f2f..1506bb2 100644 --- a/admin/views/currencies/tmpl/default_body.php +++ b/admin/views/currencies/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/currencies/tmpl/default_foot.php b/admin/views/currencies/tmpl/default_foot.php index f4060d9..d794875 100644 --- a/admin/views/currencies/tmpl/default_foot.php +++ b/admin/views/currencies/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/currencies/tmpl/default_head.php b/admin/views/currencies/tmpl/default_head.php index f3163a8..29f08e2 100644 --- a/admin/views/currencies/tmpl/default_head.php +++ b/admin/views/currencies/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/currencies/tmpl/default_toolbar.php b/admin/views/currencies/tmpl/default_toolbar.php index a701b72..ee284dd 100644 --- a/admin/views/currencies/tmpl/default_toolbar.php +++ b/admin/views/currencies/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/currencies/view.html.php b/admin/views/currencies/view.html.php index 50fb6d6..26e40b2 100644 --- a/admin/views/currencies/view.html.php +++ b/admin/views/currencies/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewCurrencies extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,22 +172,6 @@ class SupportgroupsViewCurrencies extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { diff --git a/admin/views/currency/submitbutton.js b/admin/views/currency/submitbutton.js index c4bd29d..0d36866 100644 --- a/admin/views/currency/submitbutton.js +++ b/admin/views/currency/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/currency/tmpl/edit.php b/admin/views/currency/tmpl/edit.php index ae6da9c..eda4105 100644 --- a/admin/views/currency/tmpl/edit.php +++ b/admin/views/currency/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/currency/view.html.php b/admin/views/currency/view.html.php index a530d7b..d646140 100644 --- a/admin/views/currency/view.html.php +++ b/admin/views/currency/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/facilities/tmpl/default.php b/admin/views/facilities/tmpl/default.php index 12691b3..9a612de 100644 --- a/admin/views/facilities/tmpl/default.php +++ b/admin/views/facilities/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'facilityList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,23 +44,23 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -68,6 +68,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/facilities/tmpl/default_batch_body.php b/admin/views/facilities/tmpl/default_batch_body.php index 973d123..9e09f3c 100644 --- a/admin/views/facilities/tmpl/default_batch_body.php +++ b/admin/views/facilities/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/facilities/tmpl/default_batch_footer.php b/admin/views/facilities/tmpl/default_batch_footer.php index 2479ac2..a7a4c05 100644 --- a/admin/views/facilities/tmpl/default_batch_footer.php +++ b/admin/views/facilities/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/facilities/tmpl/default_body.php b/admin/views/facilities/tmpl/default_body.php index fbd1e57..70cde2a 100644 --- a/admin/views/facilities/tmpl/default_body.php +++ b/admin/views/facilities/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/facilities/tmpl/default_foot.php b/admin/views/facilities/tmpl/default_foot.php index 95ae7b5..b278910 100644 --- a/admin/views/facilities/tmpl/default_foot.php +++ b/admin/views/facilities/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/facilities/tmpl/default_head.php b/admin/views/facilities/tmpl/default_head.php index a87c491..f104449 100644 --- a/admin/views/facilities/tmpl/default_head.php +++ b/admin/views/facilities/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/facilities/tmpl/default_toolbar.php b/admin/views/facilities/tmpl/default_toolbar.php index 804d675..1ba64cb 100644 --- a/admin/views/facilities/tmpl/default_toolbar.php +++ b/admin/views/facilities/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/facilities/view.html.php b/admin/views/facilities/view.html.php index cd35062..598da4f 100644 --- a/admin/views/facilities/view.html.php +++ b/admin/views/facilities/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewFacilities extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,42 +172,6 @@ class SupportgroupsViewFacilities extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - // Set Facility Type Name Selection - $this->facility_typeNameOptions = JFormHelper::loadFieldType('Facilitiestype')->options; - // We do some sanitation for Facility Type Name filter - if (SupportgroupsHelper::checkArray($this->facility_typeNameOptions) && - isset($this->facility_typeNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->facility_typeNameOptions[0]->value)) - { - unset($this->facility_typeNameOptions[0]); - } - // Only load Facility Type Name filter if it has values - if (SupportgroupsHelper::checkArray($this->facility_typeNameOptions)) - { - // Facility Type Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_FACILITY_FACILITY_TYPE_LABEL') . ' -', - 'filter_facility_type', - JHtml::_('select.options', $this->facility_typeNameOptions, 'value', 'text', $this->state->get('filter.facility_type')) - ); - } - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { @@ -227,6 +195,15 @@ class SupportgroupsViewFacilities extends JViewLegacy // Only load Facility Type Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Facility Type Name Selection + $this->facility_typeNameOptions = JFormHelper::loadFieldType('Facilitiestype')->options; + // We do some sanitation for Facility Type Name filter + if (SupportgroupsHelper::checkArray($this->facility_typeNameOptions) && + isset($this->facility_typeNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->facility_typeNameOptions[0]->value)) + { + unset($this->facility_typeNameOptions[0]); + } // Facility Type Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_FACILITY_FACILITY_TYPE_LABEL').' -', diff --git a/admin/views/facility/submitbutton.js b/admin/views/facility/submitbutton.js index 486a63c..eaac3c0 100644 --- a/admin/views/facility/submitbutton.js +++ b/admin/views/facility/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/facility/tmpl/edit.php b/admin/views/facility/tmpl/edit.php index 67be921..b56267a 100644 --- a/admin/views/facility/tmpl/edit.php +++ b/admin/views/facility/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/facility/view.html.php b/admin/views/facility/view.html.php index c978790..81383c5 100644 --- a/admin/views/facility/view.html.php +++ b/admin/views/facility/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/facility_type/submitbutton.js b/admin/views/facility_type/submitbutton.js index d5c8e4d..d537c63 100644 --- a/admin/views/facility_type/submitbutton.js +++ b/admin/views/facility_type/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/facility_type/tmpl/edit.php b/admin/views/facility_type/tmpl/edit.php index 5014682..6f1416f 100644 --- a/admin/views/facility_type/tmpl/edit.php +++ b/admin/views/facility_type/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/facility_type/view.html.php b/admin/views/facility_type/view.html.php index b028436..4cb3f9a 100644 --- a/admin/views/facility_type/view.html.php +++ b/admin/views/facility_type/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/facility_types/tmpl/default.php b/admin/views/facility_types/tmpl/default.php index aa10f6a..07a1607 100644 --- a/admin/views/facility_types/tmpl/default.php +++ b/admin/views/facility_types/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'facility_typeList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,20 +44,20 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -65,6 +65,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/facility_types/tmpl/default_batch_body.php b/admin/views/facility_types/tmpl/default_batch_body.php index 0503273..1888697 100644 --- a/admin/views/facility_types/tmpl/default_batch_body.php +++ b/admin/views/facility_types/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/facility_types/tmpl/default_batch_footer.php b/admin/views/facility_types/tmpl/default_batch_footer.php index cde14c2..0b9744c 100644 --- a/admin/views/facility_types/tmpl/default_batch_footer.php +++ b/admin/views/facility_types/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/facility_types/tmpl/default_body.php b/admin/views/facility_types/tmpl/default_body.php index d52a230..ca597e8 100644 --- a/admin/views/facility_types/tmpl/default_body.php +++ b/admin/views/facility_types/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/facility_types/tmpl/default_foot.php b/admin/views/facility_types/tmpl/default_foot.php index 2c0eca5..c2841f3 100644 --- a/admin/views/facility_types/tmpl/default_foot.php +++ b/admin/views/facility_types/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/facility_types/tmpl/default_head.php b/admin/views/facility_types/tmpl/default_head.php index caa90a3..ff0e44a 100644 --- a/admin/views/facility_types/tmpl/default_head.php +++ b/admin/views/facility_types/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/facility_types/tmpl/default_toolbar.php b/admin/views/facility_types/tmpl/default_toolbar.php index 9110d1b..c81d7da 100644 --- a/admin/views/facility_types/tmpl/default_toolbar.php +++ b/admin/views/facility_types/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/facility_types/view.html.php b/admin/views/facility_types/view.html.php index 9dd3ee9..f4a045a 100644 --- a/admin/views/facility_types/view.html.php +++ b/admin/views/facility_types/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewFacility_types extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,22 +172,6 @@ class SupportgroupsViewFacility_types extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js index 9e58a2e..7855514 100644 --- a/admin/views/help_document/submitbutton.js +++ b/admin/views/help_document/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php index d30a224..761ead4 100644 --- a/admin/views/help_document/tmpl/edit.php +++ b/admin/views/help_document/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php index ea078f8..a1bd3e7 100644 --- a/admin/views/help_document/view.html.php +++ b/admin/views/help_document/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php index 8ce69a2..7439c84 100644 --- a/admin/views/help_documents/tmpl/default.php +++ b/admin/views/help_documents/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'help_documentList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,11 +44,11 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -56,6 +56,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php index f5b22a6..42669e3 100644 --- a/admin/views/help_documents/tmpl/default_batch_body.php +++ b/admin/views/help_documents/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php index a788adf..78ab2b2 100644 --- a/admin/views/help_documents/tmpl/default_batch_footer.php +++ b/admin/views/help_documents/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php index 4ab96b8..d40f202 100644 --- a/admin/views/help_documents/tmpl/default_body.php +++ b/admin/views/help_documents/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php index 4cd1cbb..fc597fe 100644 --- a/admin/views/help_documents/tmpl/default_foot.php +++ b/admin/views/help_documents/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php index 9f6a76b..2216807 100644 --- a/admin/views/help_documents/tmpl/default_head.php +++ b/admin/views/help_documents/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php index 3b999d3..ce3d971 100644 --- a/admin/views/help_documents/tmpl/default_toolbar.php +++ b/admin/views/help_documents/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php index 9a2a8d5..70dd6fc 100644 --- a/admin/views/help_documents/view.html.php +++ b/admin/views/help_documents/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewHelp_documents extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,102 +172,6 @@ class SupportgroupsViewHelp_documents extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - // Set Type Selection - $this->typeOptions = $this->getTheTypeSelections(); - // We do some sanitation for Type filter - if (SupportgroupsHelper::checkArray($this->typeOptions) && - isset($this->typeOptions[0]->value) && - !SupportgroupsHelper::checkString($this->typeOptions[0]->value)) - { - unset($this->typeOptions[0]); - } - // Only load Type filter if it has values - if (SupportgroupsHelper::checkArray($this->typeOptions)) - { - // Type Filter - JHtmlSidebar::addFilter( - '- Select '.JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_TYPE_LABEL').' -', - 'filter_type', - JHtml::_('select.options', $this->typeOptions, 'value', 'text', $this->state->get('filter.type')) - ); - } - - // Set Location Selection - $this->locationOptions = $this->getTheLocationSelections(); - // We do some sanitation for Location filter - if (SupportgroupsHelper::checkArray($this->locationOptions) && - isset($this->locationOptions[0]->value) && - !SupportgroupsHelper::checkString($this->locationOptions[0]->value)) - { - unset($this->locationOptions[0]); - } - // Only load Location filter if it has values - if (SupportgroupsHelper::checkArray($this->locationOptions)) - { - // Location Filter - JHtmlSidebar::addFilter( - '- Select '.JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_LOCATION_LABEL').' -', - 'filter_location', - JHtml::_('select.options', $this->locationOptions, 'value', 'text', $this->state->get('filter.location')) - ); - } - - // Set Admin View Selection - $this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options; - // We do some sanitation for Admin View filter - if (SupportgroupsHelper::checkArray($this->admin_viewOptions) && - isset($this->admin_viewOptions[0]->value) && - !SupportgroupsHelper::checkString($this->admin_viewOptions[0]->value)) - { - unset($this->admin_viewOptions[0]); - } - // Only load Admin View filter if it has values - if (SupportgroupsHelper::checkArray($this->admin_viewOptions)) - { - // Admin View Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_ADMIN_VIEW_LABEL') . ' -', - 'filter_admin_view', - JHtml::_('select.options', $this->admin_viewOptions, 'value', 'text', $this->state->get('filter.admin_view')) - ); - } - - // Set Site View Selection - $this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options; - // We do some sanitation for Site View filter - if (SupportgroupsHelper::checkArray($this->site_viewOptions) && - isset($this->site_viewOptions[0]->value) && - !SupportgroupsHelper::checkString($this->site_viewOptions[0]->value)) - { - unset($this->site_viewOptions[0]); - } - // Only load Site View filter if it has values - if (SupportgroupsHelper::checkArray($this->site_viewOptions)) - { - // Site View Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_SITE_VIEW_LABEL') . ' -', - 'filter_site_view', - JHtml::_('select.options', $this->site_viewOptions, 'value', 'text', $this->state->get('filter.site_view')) - ); - } - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { @@ -287,6 +195,15 @@ class SupportgroupsViewHelp_documents extends JViewLegacy // Only load Type batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Type Selection + $this->typeOptions = JFormHelper::loadFieldType('helpdocumentsfiltertype')->options; + // We do some sanitation for Type filter + if (SupportgroupsHelper::checkArray($this->typeOptions) && + isset($this->typeOptions[0]->value) && + !SupportgroupsHelper::checkString($this->typeOptions[0]->value)) + { + unset($this->typeOptions[0]); + } // Type Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_TYPE_LABEL').' -', @@ -298,6 +215,15 @@ class SupportgroupsViewHelp_documents extends JViewLegacy // Only load Location batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Location Selection + $this->locationOptions = JFormHelper::loadFieldType('helpdocumentsfilterlocation')->options; + // We do some sanitation for Location filter + if (SupportgroupsHelper::checkArray($this->locationOptions) && + isset($this->locationOptions[0]->value) && + !SupportgroupsHelper::checkString($this->locationOptions[0]->value)) + { + unset($this->locationOptions[0]); + } // Location Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_LOCATION_LABEL').' -', @@ -309,6 +235,15 @@ class SupportgroupsViewHelp_documents extends JViewLegacy // Only load Admin View batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Admin View Selection + $this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options; + // We do some sanitation for Admin View filter + if (SupportgroupsHelper::checkArray($this->admin_viewOptions) && + isset($this->admin_viewOptions[0]->value) && + !SupportgroupsHelper::checkString($this->admin_viewOptions[0]->value)) + { + unset($this->admin_viewOptions[0]); + } // Admin View Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -', @@ -320,6 +255,15 @@ class SupportgroupsViewHelp_documents extends JViewLegacy // Only load Site View batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Site View Selection + $this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options; + // We do some sanitation for Site View filter + if (SupportgroupsHelper::checkArray($this->site_viewOptions) && + isset($this->site_viewOptions[0]->value) && + !SupportgroupsHelper::checkString($this->site_viewOptions[0]->value)) + { + unset($this->site_viewOptions[0]); + } // Site View Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_SITE_VIEW_LABEL').' -', @@ -379,75 +323,5 @@ class SupportgroupsViewHelp_documents extends JViewLegacy 'h.' => JText::_('COM_SUPPORTGROUPS_HELP_DOCUMENT_SITE_VIEW_LABEL'), 'a.id' => JText::_('JGRID_HEADING_ID') ); - } - - protected function getTheTypeSelections() - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - - // Select the text. - $query->select($db->quoteName('type')); - $query->from($db->quoteName('#__supportgroups_help_document')); - $query->order($db->quoteName('type') . ' ASC'); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - - $results = $db->loadColumn(); - $_filter = array(); - - if ($results) - { - // get model - $model = $this->getModel(); - $results = array_unique($results); - foreach ($results as $type) - { - // Translate the type selection - $text = $model->selectionTranslation($type,'type'); - // Now add the type and its text to the options array - $_filter[] = JHtml::_('select.option', $type, JText::_($text)); - } - } - return $_filter; - } - - protected function getTheLocationSelections() - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - - // Select the text. - $query->select($db->quoteName('location')); - $query->from($db->quoteName('#__supportgroups_help_document')); - $query->order($db->quoteName('location') . ' ASC'); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - - $results = $db->loadColumn(); - $_filter = array(); - - if ($results) - { - // get model - $model = $this->getModel(); - $results = array_unique($results); - foreach ($results as $location) - { - // Translate the location selection - $text = $model->selectionTranslation($location,'location'); - // Now add the location and its text to the options array - $_filter[] = JHtml::_('select.option', $location, JText::_($text)); - } - } - return $_filter; } } diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index 993cafc..a54fcb0 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 6f99142..d0e481f 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/info_type/submitbutton.js b/admin/views/info_type/submitbutton.js index 9a73432..1e96c6a 100644 --- a/admin/views/info_type/submitbutton.js +++ b/admin/views/info_type/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/info_type/tmpl/edit.php b/admin/views/info_type/tmpl/edit.php index ff19f14..fa8e77b 100644 --- a/admin/views/info_type/tmpl/edit.php +++ b/admin/views/info_type/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/info_type/view.html.php b/admin/views/info_type/view.html.php index 7dc2dc1..b4fad54 100644 --- a/admin/views/info_type/view.html.php +++ b/admin/views/info_type/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/info_types/tmpl/default.php b/admin/views/info_types/tmpl/default.php index 82fac05..fb19eb5 100644 --- a/admin/views/info_types/tmpl/default.php +++ b/admin/views/info_types/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'info_typeList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,26 +44,26 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -71,6 +71,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/info_types/tmpl/default_batch_body.php b/admin/views/info_types/tmpl/default_batch_body.php index 54a49b2..55fa8a8 100644 --- a/admin/views/info_types/tmpl/default_batch_body.php +++ b/admin/views/info_types/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/info_types/tmpl/default_batch_footer.php b/admin/views/info_types/tmpl/default_batch_footer.php index 6e6dfd0..1f5bd61 100644 --- a/admin/views/info_types/tmpl/default_batch_footer.php +++ b/admin/views/info_types/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/info_types/tmpl/default_body.php b/admin/views/info_types/tmpl/default_body.php index 8971c0f..7bce744 100644 --- a/admin/views/info_types/tmpl/default_body.php +++ b/admin/views/info_types/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/info_types/tmpl/default_foot.php b/admin/views/info_types/tmpl/default_foot.php index 2c0eca5..c2841f3 100644 --- a/admin/views/info_types/tmpl/default_foot.php +++ b/admin/views/info_types/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/info_types/tmpl/default_head.php b/admin/views/info_types/tmpl/default_head.php index 2688f12..bdd8a54 100644 --- a/admin/views/info_types/tmpl/default_head.php +++ b/admin/views/info_types/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/info_types/tmpl/default_toolbar.php b/admin/views/info_types/tmpl/default_toolbar.php index 2bbe652..53a5f65 100644 --- a/admin/views/info_types/tmpl/default_toolbar.php +++ b/admin/views/info_types/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/info_types/view.html.php b/admin/views/info_types/view.html.php index c69d28e..cfea294 100644 --- a/admin/views/info_types/view.html.php +++ b/admin/views/info_types/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewInfo_types extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,22 +172,6 @@ class SupportgroupsViewInfo_types extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { diff --git a/admin/views/payment/submitbutton.js b/admin/views/payment/submitbutton.js index a5bc73c..b95dde5 100644 --- a/admin/views/payment/submitbutton.js +++ b/admin/views/payment/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/payment/tmpl/edit.php b/admin/views/payment/tmpl/edit.php index 8712f03..4a16eaa 100644 --- a/admin/views/payment/tmpl/edit.php +++ b/admin/views/payment/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/payment/view.html.php b/admin/views/payment/view.html.php index 05d20dd..5562e19 100644 --- a/admin/views/payment/view.html.php +++ b/admin/views/payment/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/payments/tmpl/default.php b/admin/views/payments/tmpl/default.php index 5db8ef4..002cc12 100644 --- a/admin/views/payments/tmpl/default.php +++ b/admin/views/payments/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'paymentList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,11 +44,11 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -56,6 +56,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/payments/tmpl/default_batch_body.php b/admin/views/payments/tmpl/default_batch_body.php index af05c8f..4d0f9c0 100644 --- a/admin/views/payments/tmpl/default_batch_body.php +++ b/admin/views/payments/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/payments/tmpl/default_batch_footer.php b/admin/views/payments/tmpl/default_batch_footer.php index 49eb533..c75ae9b 100644 --- a/admin/views/payments/tmpl/default_batch_footer.php +++ b/admin/views/payments/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/payments/tmpl/default_body.php b/admin/views/payments/tmpl/default_body.php index 04b24bc..33db314 100644 --- a/admin/views/payments/tmpl/default_body.php +++ b/admin/views/payments/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/payments/tmpl/default_foot.php b/admin/views/payments/tmpl/default_foot.php index 86482aa..d939f12 100644 --- a/admin/views/payments/tmpl/default_foot.php +++ b/admin/views/payments/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/payments/tmpl/default_head.php b/admin/views/payments/tmpl/default_head.php index c247a24..a521710 100644 --- a/admin/views/payments/tmpl/default_head.php +++ b/admin/views/payments/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/payments/tmpl/default_toolbar.php b/admin/views/payments/tmpl/default_toolbar.php index 266bada..4de6eb3 100644 --- a/admin/views/payments/tmpl/default_toolbar.php +++ b/admin/views/payments/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/payments/view.html.php b/admin/views/payments/view.html.php index 7b7e399..da8e90a 100644 --- a/admin/views/payments/view.html.php +++ b/admin/views/payments/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewPayments extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,62 +172,6 @@ class SupportgroupsViewPayments extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - // Set Support Group Name Selection - $this->support_groupNameOptions = JFormHelper::loadFieldType('Supportgroups')->options; - // We do some sanitation for Support Group Name filter - if (SupportgroupsHelper::checkArray($this->support_groupNameOptions) && - isset($this->support_groupNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->support_groupNameOptions[0]->value)) - { - unset($this->support_groupNameOptions[0]); - } - // Only load Support Group Name filter if it has values - if (SupportgroupsHelper::checkArray($this->support_groupNameOptions)) - { - // Support Group Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_PAYMENT_SUPPORT_GROUP_LABEL') . ' -', - 'filter_support_group', - JHtml::_('select.options', $this->support_groupNameOptions, 'value', 'text', $this->state->get('filter.support_group')) - ); - } - - // Set Year Selection - $this->yearOptions = $this->getTheYearSelections(); - // We do some sanitation for Year filter - if (SupportgroupsHelper::checkArray($this->yearOptions) && - isset($this->yearOptions[0]->value) && - !SupportgroupsHelper::checkString($this->yearOptions[0]->value)) - { - unset($this->yearOptions[0]); - } - // Only load Year filter if it has values - if (SupportgroupsHelper::checkArray($this->yearOptions)) - { - // Year Filter - JHtmlSidebar::addFilter( - '- Select '.JText::_('COM_SUPPORTGROUPS_PAYMENT_YEAR_LABEL').' -', - 'filter_year', - JHtml::_('select.options', $this->yearOptions, 'value', 'text', $this->state->get('filter.year')) - ); - } - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { @@ -247,6 +195,15 @@ class SupportgroupsViewPayments extends JViewLegacy // Only load Support Group Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Support Group Name Selection + $this->support_groupNameOptions = JFormHelper::loadFieldType('Supportgroups')->options; + // We do some sanitation for Support Group Name filter + if (SupportgroupsHelper::checkArray($this->support_groupNameOptions) && + isset($this->support_groupNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->support_groupNameOptions[0]->value)) + { + unset($this->support_groupNameOptions[0]); + } // Support Group Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_PAYMENT_SUPPORT_GROUP_LABEL').' -', @@ -258,6 +215,15 @@ class SupportgroupsViewPayments extends JViewLegacy // Only load Year batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Year Selection + $this->yearOptions = JFormHelper::loadFieldType('paymentsfilteryear')->options; + // We do some sanitation for Year filter + if (SupportgroupsHelper::checkArray($this->yearOptions) && + isset($this->yearOptions[0]->value) && + !SupportgroupsHelper::checkString($this->yearOptions[0]->value)) + { + unset($this->yearOptions[0]); + } // Year Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_PAYMENT_YEAR_LABEL').' -', @@ -315,40 +281,5 @@ class SupportgroupsViewPayments extends JViewLegacy 'a.amount' => JText::_('COM_SUPPORTGROUPS_PAYMENT_AMOUNT_LABEL'), 'a.id' => JText::_('JGRID_HEADING_ID') ); - } - - protected function getTheYearSelections() - { - // Get a db connection. - $db = JFactory::getDbo(); - - // Create a new query object. - $query = $db->getQuery(true); - - // Select the text. - $query->select($db->quoteName('year')); - $query->from($db->quoteName('#__supportgroups_payment')); - $query->order($db->quoteName('year') . ' ASC'); - - // Reset the query using our newly populated query object. - $db->setQuery($query); - - $results = $db->loadColumn(); - $_filter = array(); - - if ($results) - { - // get model - $model = $this->getModel(); - $results = array_unique($results); - foreach ($results as $year) - { - // Translate the year selection - $text = $model->selectionTranslation($year,'year'); - // Now add the year and its text to the options array - $_filter[] = JHtml::_('select.option', $year, JText::_($text)); - } - } - return $_filter; } } diff --git a/admin/views/region/submitbutton.js b/admin/views/region/submitbutton.js index 5e9c2b8..7f1692a 100644 --- a/admin/views/region/submitbutton.js +++ b/admin/views/region/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/region/tmpl/edit.php b/admin/views/region/tmpl/edit.php index 1e1757c..d3de942 100644 --- a/admin/views/region/tmpl/edit.php +++ b/admin/views/region/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/region/view.html.php b/admin/views/region/view.html.php index 79a828e..c3ded93 100644 --- a/admin/views/region/view.html.php +++ b/admin/views/region/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/regions/tmpl/default.php b/admin/views/regions/tmpl/default.php index 0c55d55..1f4ccb7 100644 --- a/admin/views/regions/tmpl/default.php +++ b/admin/views/regions/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'regionList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,17 +44,17 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -62,6 +62,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/regions/tmpl/default_batch_body.php b/admin/views/regions/tmpl/default_batch_body.php index 81353af..e9299d0 100644 --- a/admin/views/regions/tmpl/default_batch_body.php +++ b/admin/views/regions/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/regions/tmpl/default_batch_footer.php b/admin/views/regions/tmpl/default_batch_footer.php index b347876..ca3f7d8 100644 --- a/admin/views/regions/tmpl/default_batch_footer.php +++ b/admin/views/regions/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/regions/tmpl/default_body.php b/admin/views/regions/tmpl/default_body.php index 3c1ab4f..37b54b9 100644 --- a/admin/views/regions/tmpl/default_body.php +++ b/admin/views/regions/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/regions/tmpl/default_foot.php b/admin/views/regions/tmpl/default_foot.php index 88d4a63..4be9baf 100644 --- a/admin/views/regions/tmpl/default_foot.php +++ b/admin/views/regions/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/regions/tmpl/default_head.php b/admin/views/regions/tmpl/default_head.php index 397851d..33f5bbd 100644 --- a/admin/views/regions/tmpl/default_head.php +++ b/admin/views/regions/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/regions/tmpl/default_toolbar.php b/admin/views/regions/tmpl/default_toolbar.php index d48c104..11e3e8f 100644 --- a/admin/views/regions/tmpl/default_toolbar.php +++ b/admin/views/regions/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/regions/view.html.php b/admin/views/regions/view.html.php index 31fb75c..5112c95 100644 --- a/admin/views/regions/view.html.php +++ b/admin/views/regions/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewRegions extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -168,42 +172,6 @@ class SupportgroupsViewRegions extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - // Set Country Name Selection - $this->countryNameOptions = JFormHelper::loadFieldType('Countries')->options; - // We do some sanitation for Country Name filter - if (SupportgroupsHelper::checkArray($this->countryNameOptions) && - isset($this->countryNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->countryNameOptions[0]->value)) - { - unset($this->countryNameOptions[0]); - } - // Only load Country Name filter if it has values - if (SupportgroupsHelper::checkArray($this->countryNameOptions)) - { - // Country Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_REGION_COUNTRY_LABEL') . ' -', - 'filter_country', - JHtml::_('select.options', $this->countryNameOptions, 'value', 'text', $this->state->get('filter.country')) - ); - } - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { @@ -227,6 +195,15 @@ class SupportgroupsViewRegions extends JViewLegacy // Only load Country Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Country Name Selection + $this->countryNameOptions = JFormHelper::loadFieldType('Countries')->options; + // We do some sanitation for Country Name filter + if (SupportgroupsHelper::checkArray($this->countryNameOptions) && + isset($this->countryNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->countryNameOptions[0]->value)) + { + unset($this->countryNameOptions[0]); + } // Country Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_REGION_COUNTRY_LABEL').' -', diff --git a/admin/views/support_group/submitbutton.js b/admin/views/support_group/submitbutton.js index aa4034c..66f65c5 100644 --- a/admin/views/support_group/submitbutton.js +++ b/admin/views/support_group/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage submitbutton.js diff --git a/admin/views/support_group/tmpl/edit.php b/admin/views/support_group/tmpl/edit.php index a3c40c9..adb7404 100644 --- a/admin/views/support_group/tmpl/edit.php +++ b/admin/views/support_group/tmpl/edit.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage edit.php diff --git a/admin/views/support_group/view.html.php b/admin/views/support_group/view.html.php index 99a6582..f6880f4 100644 --- a/admin/views/support_group/view.html.php +++ b/admin/views/support_group/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/admin/views/support_groups/tmpl/default.php b/admin/views/support_groups/tmpl/default.php index fb70688..a75220c 100644 --- a/admin/views/support_groups/tmpl/default.php +++ b/admin/views/support_groups/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php @@ -29,6 +29,7 @@ defined('_JEXEC') or die('Restricted access'); JHtml::_('behavior.tooltip'); JHtml::_('behavior.multiselect'); JHtml::_('dropdown.init'); +JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_SUPPORTGROUPS_FILTER_SELECT_ACCESS') . ' -')); JHtml::_('formbehavior.chosen', 'select'); if ($this->saveOrder) { @@ -36,23 +37,6 @@ if ($this->saveOrder) JHtml::_('sortablelist.sortable', 'support_groupList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl); } ?> -sidebar)): ?>
@@ -62,13 +46,17 @@ if ($this->saveOrder)
+ $this)); +?> items)): ?> - loadTemplate('toolbar');?>
- loadTemplate('toolbar');?>
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,14 +44,14 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -59,6 +59,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>
loadTemplate('head');?>loadTemplate('foot');?> @@ -86,8 +74,6 @@ if ($this->saveOrder) $this->loadTemplate('batch_body') ); ?> - - diff --git a/admin/views/support_groups/tmpl/default_batch_body.php b/admin/views/support_groups/tmpl/default_batch_body.php index 765825b..616abfe 100644 --- a/admin/views/support_groups/tmpl/default_batch_body.php +++ b/admin/views/support_groups/tmpl/default_batch_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_body.php diff --git a/admin/views/support_groups/tmpl/default_batch_footer.php b/admin/views/support_groups/tmpl/default_batch_footer.php index c1d47cb..6e6c874 100644 --- a/admin/views/support_groups/tmpl/default_batch_footer.php +++ b/admin/views/support_groups/tmpl/default_batch_footer.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_batch_footer.php diff --git a/admin/views/support_groups/tmpl/default_body.php b/admin/views/support_groups/tmpl/default_body.php index 3fbc06c..b813b5a 100644 --- a/admin/views/support_groups/tmpl/default_body.php +++ b/admin/views/support_groups/tmpl/default_body.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_body.php diff --git a/admin/views/support_groups/tmpl/default_foot.php b/admin/views/support_groups/tmpl/default_foot.php index 4cd1cbb..fc597fe 100644 --- a/admin/views/support_groups/tmpl/default_foot.php +++ b/admin/views/support_groups/tmpl/default_foot.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_foot.php diff --git a/admin/views/support_groups/tmpl/default_head.php b/admin/views/support_groups/tmpl/default_head.php index 7658462..4bad99d 100644 --- a/admin/views/support_groups/tmpl/default_head.php +++ b/admin/views/support_groups/tmpl/default_head.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_head.php @@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access'); canEdit&& $this->canState): ?> canState): ?> \ No newline at end of file diff --git a/admin/views/support_groups/tmpl/default_toolbar.php b/admin/views/support_groups/tmpl/default_toolbar.php index c3e4111..06ba1e9 100644 --- a/admin/views/support_groups/tmpl/default_toolbar.php +++ b/admin/views/support_groups/tmpl/default_toolbar.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_toolbar.php diff --git a/admin/views/support_groups/view.html.php b/admin/views/support_groups/view.html.php index d1483aa..a68ed11 100644 --- a/admin/views/support_groups/view.html.php +++ b/admin/views/support_groups/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php @@ -48,6 +48,10 @@ class SupportgroupsViewSupport_groups extends JViewLegacy $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); $this->user = JFactory::getUser(); + // Load the filter form from xml. + $this->filterForm = $this->get('FilterForm'); + // Load the active filters. + $this->activeFilters = $this->get('ActiveFilters'); // Add the list ordering clause. $this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id')); $this->listDirn = $this->escape($this->state->get('list.direction', 'DESC')); @@ -173,62 +177,6 @@ class SupportgroupsViewSupport_groups extends JViewLegacy JToolBarHelper::preferences('com_supportgroups'); } - // Only load publish filter if state change is allowed - if ($this->canState) - { - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true) - ); - } - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - // Set Area Name Selection - $this->areaNameOptions = JFormHelper::loadFieldType('Areas')->options; - // We do some sanitation for Area Name filter - if (SupportgroupsHelper::checkArray($this->areaNameOptions) && - isset($this->areaNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->areaNameOptions[0]->value)) - { - unset($this->areaNameOptions[0]); - } - // Only load Area Name filter if it has values - if (SupportgroupsHelper::checkArray($this->areaNameOptions)) - { - // Area Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_SUPPORT_GROUP_AREA_LABEL') . ' -', - 'filter_area', - JHtml::_('select.options', $this->areaNameOptions, 'value', 'text', $this->state->get('filter.area')) - ); - } - - // Set Facility Name Selection - $this->facilityNameOptions = JFormHelper::loadFieldType('Facilities')->options; - // We do some sanitation for Facility Name filter - if (SupportgroupsHelper::checkArray($this->facilityNameOptions) && - isset($this->facilityNameOptions[0]->value) && - !SupportgroupsHelper::checkString($this->facilityNameOptions[0]->value)) - { - unset($this->facilityNameOptions[0]); - } - // Only load Facility Name filter if it has values - if (SupportgroupsHelper::checkArray($this->facilityNameOptions)) - { - // Facility Name Filter - JHtmlSidebar::addFilter( - '- Select ' . JText::_('COM_SUPPORTGROUPS_SUPPORT_GROUP_FACILITY_LABEL') . ' -', - 'filter_facility', - JHtml::_('select.options', $this->facilityNameOptions, 'value', 'text', $this->state->get('filter.facility')) - ); - } - // Only load published batch if state and batch is allowed if ($this->canState && $this->canBatch) { @@ -252,6 +200,15 @@ class SupportgroupsViewSupport_groups extends JViewLegacy // Only load Area Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Area Name Selection + $this->areaNameOptions = JFormHelper::loadFieldType('Areas')->options; + // We do some sanitation for Area Name filter + if (SupportgroupsHelper::checkArray($this->areaNameOptions) && + isset($this->areaNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->areaNameOptions[0]->value)) + { + unset($this->areaNameOptions[0]); + } // Area Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_SUPPORT_GROUP_AREA_LABEL').' -', @@ -263,6 +220,15 @@ class SupportgroupsViewSupport_groups extends JViewLegacy // Only load Facility Name batch if create, edit, and batch is allowed if ($this->canBatch && $this->canCreate && $this->canEdit) { + // Set Facility Name Selection + $this->facilityNameOptions = JFormHelper::loadFieldType('Facilities')->options; + // We do some sanitation for Facility Name filter + if (SupportgroupsHelper::checkArray($this->facilityNameOptions) && + isset($this->facilityNameOptions[0]->value) && + !SupportgroupsHelper::checkString($this->facilityNameOptions[0]->value)) + { + unset($this->facilityNameOptions[0]); + } // Facility Name Batch Selection JHtmlBatch_::addListSelection( '- Keep Original '.JText::_('COM_SUPPORTGROUPS_SUPPORT_GROUP_FACILITY_LABEL').' -', diff --git a/admin/views/supportgroups/tmpl/default.php b/admin/views/supportgroups/tmpl/default.php index fdebb4a..34f6e43 100644 --- a/admin/views/supportgroups/tmpl/default.php +++ b/admin/views/supportgroups/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php diff --git a/admin/views/supportgroups/tmpl/default_main.php b/admin/views/supportgroups/tmpl/default_main.php index 237fadf..284dc06 100644 --- a/admin/views/supportgroups/tmpl/default_main.php +++ b/admin/views/supportgroups/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_main.php diff --git a/admin/views/supportgroups/tmpl/default_readme_information.php b/admin/views/supportgroups/tmpl/default_readme_information.php index faf446a..64bac61 100644 --- a/admin/views/supportgroups/tmpl/default_readme_information.php +++ b/admin/views/supportgroups/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_readme_information.php diff --git a/admin/views/supportgroups/tmpl/default_vast_development_method_notice_board.php b/admin/views/supportgroups/tmpl/default_vast_development_method_notice_board.php index 20646f5..f2e526a 100644 --- a/admin/views/supportgroups/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/supportgroups/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/supportgroups/tmpl/default_vdm.php b/admin/views/supportgroups/tmpl/default_vdm.php index ebcb75e..85cc25e 100644 --- a/admin/views/supportgroups/tmpl/default_vdm.php +++ b/admin/views/supportgroups/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default_vdm.php diff --git a/admin/views/supportgroups/view.html.php b/admin/views/supportgroups/view.html.php index cd833c4..639ab42 100644 --- a/admin/views/supportgroups/view.html.php +++ b/admin/views/supportgroups/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/script.php b/script.php index 8bc5689..1e6f123 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage script.php diff --git a/site/assets/css/map.css b/site/assets/css/map.css index fb3a3f0..f1a5a13 100644 --- a/site/assets/css/map.css +++ b/site/assets/css/map.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage map.css diff --git a/site/assets/css/site.css b/site/assets/css/site.css index ad9e4a2..9f44249 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage site.css diff --git a/site/assets/css/supportgroups.css b/site/assets/css/supportgroups.css index 515f487..5240c41 100644 --- a/site/assets/css/supportgroups.css +++ b/site/assets/css/supportgroups.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 44d65f3..75683c0 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage site.js diff --git a/site/controller.php b/site/controller.php index f64ffae..5253727 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage controller.php diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php index d30dccb..36358c7 100644 --- a/site/controllers/ajax.json.php +++ b/site/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage ajax.json.php diff --git a/site/controllers/help.php b/site/controllers/help.php index 7dc9741..aa52776 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index 8bcb18e..738084a 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage category.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index d11eae5..55e1f74 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 867bacd..21800a9 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage route.php diff --git a/site/helpers/supportgroups.php b/site/helpers/supportgroups.php index 660e68e..940e916 100644 --- a/site/helpers/supportgroups.php +++ b/site/helpers/supportgroups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php diff --git a/site/models/ajax.php b/site/models/ajax.php index 8703311..b989bf4 100644 --- a/site/models/ajax.php +++ b/site/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage ajax.php diff --git a/site/models/map.php b/site/models/map.php index a8e1794..b75a1d3 100644 --- a/site/models/map.php +++ b/site/models/map.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage map.php diff --git a/site/models/supportgroups.php b/site/models/supportgroups.php index 935cd80..20a482e 100644 --- a/site/models/supportgroups.php +++ b/site/models/supportgroups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php diff --git a/site/router.php b/site/router.php index bd45d10..d324859 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage router.php diff --git a/site/supportgroups.php b/site/supportgroups.php index b4cadac..361ff7d 100644 --- a/site/supportgroups.php +++ b/site/supportgroups.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage supportgroups.php diff --git a/site/views/map/tmpl/default.php b/site/views/map/tmpl/default.php index ccd399c..d506a59 100644 --- a/site/views/map/tmpl/default.php +++ b/site/views/map/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php diff --git a/site/views/map/view.html.php b/site/views/map/view.html.php index 4c75370..cf570f6 100644 --- a/site/views/map/view.html.php +++ b/site/views/map/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/site/views/supportgroups/tmpl/default.php b/site/views/supportgroups/tmpl/default.php index 9946a66..908647a 100644 --- a/site/views/supportgroups/tmpl/default.php +++ b/site/views/supportgroups/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage default.php diff --git a/site/views/supportgroups/view.html.php b/site/views/supportgroups/view.html.php index 861c531..d076996 100644 --- a/site/views/supportgroups/view.html.php +++ b/site/views/supportgroups/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 1.0.11 - @build 7th February, 2021 + @build 8th February, 2021 @created 24th February, 2016 @package Support Groups @subpackage view.html.php diff --git a/supportgroups.xml b/supportgroups.xml index 55758a1..4694417 100644 --- a/supportgroups.xml +++ b/supportgroups.xml @@ -1,7 +1,7 @@ COM_SUPPORTGROUPS - 7th February, 2021 + 8th February, 2021 Llewellyn van der Merwe joomla@vdm.io http://www.vdm.io
- ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?> @@ -44,26 +44,26 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?> @@ -71,6 +71,6 @@ defined('_JEXEC') or die('Restricted access'); - listDirn, $this->listOrder); ?> + listDirn, $this->listOrder); ?>