diff --git a/README.md b/README.md index cb7b8a81f..6581fff47 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Component Builder (2.1.20) +# Component Builder (2.1.21) This is a [Joomla 3.x] (http://www.joomla.org/) component. @@ -32,12 +32,12 @@ Would you require more help please open and issue here on [gitHub today](https:/ + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io) + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 7th September, 2016 -+ *Version*: 2.1.20 ++ *Last Build*: 11th September, 2016 ++ *Version*: 2.1.21 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **84031** -+ *File count*: **513** ++ *Line count*: **85041** ++ *File count*: **516** + *Folder count*: **98** > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder). diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 315d3c61c..4ec5ebb71 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index e1bc9e38f..857186916 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.css diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css index dda214bd6..1d7effb5d 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/component.css b/admin/assets/css/component.css index 0dbb12d94..851d09593 100644 --- a/admin/assets/css/component.css +++ b/admin/assets/css/component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.css diff --git a/admin/assets/css/components.css b/admin/assets/css/components.css index c72e16695..d149c062d 100644 --- a/admin/assets/css/components.css +++ b/admin/assets/css/components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.css diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css index bbaa46986..c8e20f28d 100644 --- a/admin/assets/css/custom_admin_view.css +++ b/admin/assets/css/custom_admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.css diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css index e1eba519a..709bf9323 100644 --- a/admin/assets/css/custom_admin_views.css +++ b/admin/assets/css/custom_admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 55a033dd8..c03c22663 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css index 64f2ff49a..476130d8d 100644 --- a/admin/assets/css/dynamic_get.css +++ b/admin/assets/css/dynamic_get.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.css diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css index 59889ce26..8f729a545 100644 --- a/admin/assets/css/dynamic_gets.css +++ b/admin/assets/css/dynamic_gets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.css diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css index 97acb23b2..acafa4c17 100644 --- a/admin/assets/css/field.css +++ b/admin/assets/css/field.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.css diff --git a/admin/assets/css/fields.css b/admin/assets/css/fields.css index ecb9f2680..e20b124f2 100644 --- a/admin/assets/css/fields.css +++ b/admin/assets/css/fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.css diff --git a/admin/assets/css/fieldtype.css b/admin/assets/css/fieldtype.css index 261474a96..f39b61d9b 100644 --- a/admin/assets/css/fieldtype.css +++ b/admin/assets/css/fieldtype.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.css diff --git a/admin/assets/css/fieldtypes.css b/admin/assets/css/fieldtypes.css index d74bfd4a4..2a30d8bc2 100644 --- a/admin/assets/css/fieldtypes.css +++ b/admin/assets/css/fieldtypes.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.css diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css index 06ae4d313..b148bd089 100644 --- a/admin/assets/css/help_document.css +++ b/admin/assets/css/help_document.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.css diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css index ee538594d..93f48cd0c 100644 --- a/admin/assets/css/help_documents.css +++ b/admin/assets/css/help_documents.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.css diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css index 694661a58..7e79daac8 100644 --- a/admin/assets/css/layout.css +++ b/admin/assets/css/layout.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.css diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css index 3eab0bcb5..7f255112c 100644 --- a/admin/assets/css/layouts.css +++ b/admin/assets/css/layouts.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.css diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css index 332154444..8452bf89f 100644 --- a/admin/assets/css/site_view.css +++ b/admin/assets/css/site_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.css diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css index f3403552d..231a60c79 100644 --- a/admin/assets/css/site_views.css +++ b/admin/assets/css/site_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.css diff --git a/admin/assets/css/snippet.css b/admin/assets/css/snippet.css index 322dac468..371791341 100644 --- a/admin/assets/css/snippet.css +++ b/admin/assets/css/snippet.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.css diff --git a/admin/assets/css/snippets.css b/admin/assets/css/snippets.css index 3530e7c7e..ebae1e768 100644 --- a/admin/assets/css/snippets.css +++ b/admin/assets/css/snippets.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.css diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css index 7eabf479f..5c7b2ef97 100644 --- a/admin/assets/css/template.css +++ b/admin/assets/css/template.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.css diff --git a/admin/assets/css/templates.css b/admin/assets/css/templates.css index e17a92daf..4f2a0217c 100644 --- a/admin/assets/css/templates.css +++ b/admin/assets/css/templates.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.css diff --git a/admin/compiler/joomla_3/JControllerForm.php b/admin/compiler/joomla_3/JControllerForm.php index 5f2de245a..dd0e15a85 100644 --- a/admin/compiler/joomla_3/JControllerForm.php +++ b/admin/compiler/joomla_3/JControllerForm.php @@ -50,7 +50,7 @@ class ###Component###Controller###View### extends JControllerForm { $this->view_list = '###Views###'; // safeguard for setting the return view listing to the main view. parent::__construct($config); - } + }###ADMIN_CUSTOM_BUTTONS_CONTROLLER### /** * Method override to check if you can add a new record. diff --git a/admin/compiler/joomla_3/JModelAdmin.php b/admin/compiler/joomla_3/JModelAdmin.php index b2726ff05..c4e9120e5 100644 --- a/admin/compiler/joomla_3/JModelAdmin.php +++ b/admin/compiler/joomla_3/JModelAdmin.php @@ -67,7 +67,7 @@ class ###Component###Model###View### extends JModelAdmin public function getTable($type = '###view###', $prefix = '###Component###Table', $config = array()) { return JTable::getInstance($type, $prefix, $config); - } + }###ADMIN_CUSTOM_BUTTONS_METHOD### /** * Method to get a single record. diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index a4162e3a9..685e3dc0c 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 707029271..262b4a9c7 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 48d88620b..0d99ce4b2 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index 6c8705cdf..8680aabd5 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index dd9a7fc19..70e920c53 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 753c5930e..c39cf251b 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/controllers/component.php b/admin/controllers/component.php index a0730fc85..b56371bea 100644 --- a/admin/controllers/component.php +++ b/admin/controllers/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index f3b4e7768..6330c6c4b 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/components.php b/admin/controllers/components.php index eed3a0249..a81064521 100644 --- a/admin/controllers/components.php +++ b/admin/controllers/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php index f32797dd6..64ee66511 100644 --- a/admin/controllers/custom_admin_view.php +++ b/admin/controllers/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php index 96953e0d1..60b13dc02 100644 --- a/admin/controllers/custom_admin_views.php +++ b/admin/controllers/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php index 1a9dd7d27..09916468d 100644 --- a/admin/controllers/dynamic_get.php +++ b/admin/controllers/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php index e34cdb375..bf8e667c8 100644 --- a/admin/controllers/dynamic_gets.php +++ b/admin/controllers/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/controllers/field.php b/admin/controllers/field.php index e56376165..159bc6190 100644 --- a/admin/controllers/field.php +++ b/admin/controllers/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php index af1c48ca3..af351f4d2 100644 --- a/admin/controllers/fields.php +++ b/admin/controllers/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php index 25b23d183..b749fe17b 100644 --- a/admin/controllers/fieldtype.php +++ b/admin/controllers/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php index 9f37c8ba1..396beddc4 100644 --- a/admin/controllers/fieldtypes.php +++ b/admin/controllers/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index bf2a985c4..3191ce1cf 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php index f4cc1c225..6fe638815 100644 --- a/admin/controllers/help_document.php +++ b/admin/controllers/help_document.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php index b86d28162..605c8e3b8 100644 --- a/admin/controllers/help_documents.php +++ b/admin/controllers/help_documents.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 82d8feb1b..01bbda0e9 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php index b863d2b2d..a4ad8caa5 100644 --- a/admin/controllers/layout.php +++ b/admin/controllers/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php index b5e1e2591..7518f9f29 100644 --- a/admin/controllers/layouts.php +++ b/admin/controllers/layouts.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.php diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php index 611c45dba..6f44edd9e 100644 --- a/admin/controllers/site_view.php +++ b/admin/controllers/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php index e54a242f9..304ccb488 100644 --- a/admin/controllers/site_views.php +++ b/admin/controllers/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php index f0b397be0..0ca772c7e 100644 --- a/admin/controllers/snippet.php +++ b/admin/controllers/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php index 4fda00327..401473ab4 100644 --- a/admin/controllers/snippets.php +++ b/admin/controllers/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/controllers/template.php b/admin/controllers/template.php index bab4e44c7..221980be0 100644 --- a/admin/controllers/template.php +++ b/admin/controllers/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php index 9463ffe3e..61e3663b6 100644 --- a/admin/controllers/templates.php +++ b/admin/controllers/templates.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php index f17a6cc52..8a8d10423 100644 --- a/admin/helpers/compiler/a_Get.php +++ b/admin/helpers/compiler/a_Get.php @@ -1081,7 +1081,31 @@ class Get unset($view->$scripter); } } - + // add the custom buttons + if (isset($view->add_custom_button) && $view->add_custom_button == 1) + { + if (ComponentbuilderHelper::checkString($view->php_model)) + { + $view->php_model = base64_decode($view->php_model); + $view->php_model = $this->setCustomContentLang($view->php_model); + } + $view->php_controller = base64_decode($view->php_controller); + $view->php_controller = $this->setCustomContentLang($view->php_controller); + // set the button array + $buttons = json_decode($view->custom_button,true); + unset($view->custom_button); + // sort the values + if (ComponentbuilderHelper::checkArray($buttons)) + { + foreach ($buttons as $option => $values) + { + foreach ($values as $nr => $value) + { + $view->custom_buttons[$nr][$option] = $value; + } + } + } + } // set custom import scripts if (isset($view->add_custom_import) && $view->add_custom_import == 1) { diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index f3d5006bf..e8b9aa64d 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -139,7 +139,7 @@ class Interpretation extends Fields /** * @param $view */ - public function setLockLicensePer($view) + public function setLockLicensePer(&$view) { if ($this->componentData->add_license && $this->componentData->license_type == 3) { @@ -1051,7 +1051,7 @@ class Interpretation extends Fields return ''; } - public function setCustomViewMenu($view) + public function setCustomViewMenu(&$view) { $xml = ''; // build the file @@ -2526,7 +2526,7 @@ class Interpretation extends Fields return $method; } - public function setPrepareDocument($view) + public function setPrepareDocument(&$view) { // ensure correct target is set $TARGET = ComponentbuilderHelper::safeString($this->target,'U'); @@ -2642,12 +2642,12 @@ class Interpretation extends Fields return ''; } - public function setCustomGetForm($view) + public function setCustomGetForm(&$view) { return ''; } - public function setDocumentCustomPHP($view) + public function setDocumentCustomPHP(&$view) { if ($view['settings']->add_php_document == 1) { @@ -2660,45 +2660,52 @@ class Interpretation extends Fields return ''; } - public function setCustomButtons($view) + public function setCustomButtons(&$view, $type = 1, $tab = '') { + if (1 == $type) + { + $viewName = $view['settings']->code; + } + if (2 == $type) + { + $viewName = ComponentbuilderHelper::safeString($view['settings']->name_single); + } // ensure correct target is set $TARGET = ComponentbuilderHelper::safeString($this->target,'U'); // set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER### - $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] = ''; + $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] = ''; // set the custom buttons ###CUSTOM_BUTTONS_METHOD### - $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] = ''; + $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] = ''; // if site add buttons to view if ($this->target == 'site') { // set the custom buttons ###SITE_TOP_BUTTON### - $this->fileContentDynamic[$view['settings']->code]['###SITE_TOP_BUTTON###'] = ''; + $this->fileContentDynamic[$viewName]['###SITE_TOP_BUTTON###'] = ''; // set the custom buttons ###SITE_BOTTOM_BUTTON### - $this->fileContentDynamic[$view['settings']->code]['###SITE_BOTTOM_BUTTON###'] = ''; + $this->fileContentDynamic[$viewName]['###SITE_BOTTOM_BUTTON###'] = ''; // load into place switch ($view['settings']->button_position) { case 1: // set buttons to top right of the view - $this->fileContentDynamic[$view['settings']->code]['###SITE_TOP_BUTTON###'] = '
toolbar->render(); ?>
'; + $this->fileContentDynamic[$viewName]['###SITE_TOP_BUTTON###'] = '
toolbar->render(); ?>
'; break; case 2: // set buttons to top left of the view - $this->fileContentDynamic[$view['settings']->code]['###SITE_TOP_BUTTON###'] = 'toolbar->render(); ?>'; + $this->fileContentDynamic[$viewName]['###SITE_TOP_BUTTON###'] = 'toolbar->render(); ?>'; break; case 3: // set buttons to buttom right of the view - $this->fileContentDynamic[$view['settings']->code]['###SITE_BOTTOM_BUTTON###'] = '
toolbar->render(); ?>
'; + $this->fileContentDynamic[$viewName]['###SITE_BOTTOM_BUTTON###'] = '
toolbar->render(); ?>
'; break; case 4: // set buttons to buttom left of the view - $this->fileContentDynamic[$view['settings']->code]['###SITE_BOTTOM_BUTTON###'] = 'toolbar->render(); ?>'; + $this->fileContentDynamic[$viewName]['###SITE_BOTTOM_BUTTON###'] = 'toolbar->render(); ?>'; break; case 5: // set buttons to buttom left of the view $this->placeholders['[[[SITE_TOOLBAR]]]'] = 'toolbar->render(); ?>'; - break; - + break; } } @@ -2717,11 +2724,11 @@ class Interpretation extends Fields $keyCode = ComponentbuilderHelper::safeString($custom_button['name']); $this->langContent[$this->lang][$keyLang] = trim($custom_button['name']); // add cpanel button - $buttons[] = "\t\tif (\$this->canDo->get('".$view['settings']->code.".".$keyCode."'))"; - $buttons[] = "\t\t{"; - $buttons[] = "\t\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button."; - $buttons[] = "\t\t\tJToolBarHelper::custom('".$view['settings']->code.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);"; - $buttons[] = "\t\t}"; + $buttons[] = "\t".$tab."\tif (\$this->canDo->get('".$viewName.".".$keyCode."'))"; + $buttons[] = "\t".$tab."\t{"; + $buttons[] = "\t".$tab."\t\t//".$this->setLine(__LINE__)." add ".$custom_button['name']." button."; + $buttons[] = "\t".$tab."\t\tJToolBarHelper::custom('".$viewName.".".$custom_button['method']."', '".$custom_button['icomoon']."', '', '".$keyLang."', false);"; + $buttons[] = "\t".$tab."\t}"; } } if (ComponentbuilderHelper::checkArray($buttons)) @@ -2729,13 +2736,13 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkString($view['settings']->php_controller)) { // set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER### - $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] = + $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_controller); if ('site' == $this->target) { // add the controller for this view // build the file - $target = array($this->target => $view['settings']->code); + $target = array($this->target => $viewName); $this->buildDynamique($target,'custom_form'); ###GET_FORM_CUSTOM### } @@ -2743,7 +2750,7 @@ class Interpretation extends Fields if (ComponentbuilderHelper::checkString($view['settings']->php_model)) { // set the custom buttons ###CUSTOM_BUTTONS_METHOD### - $this->fileContentDynamic[$view['settings']->code]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] = + $this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] = "\n\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$view['settings']->php_model); } @@ -2754,7 +2761,7 @@ class Interpretation extends Fields return ''; } - public function setCustomCSS($view) + public function setCustomCSS(&$view) { if ($view['settings']->add_css == 1) { @@ -2766,7 +2773,7 @@ class Interpretation extends Fields return ''; } - public function setDocumentCustomCSS($view) + public function setDocumentCustomCSS(&$view) { if ($view['settings']->add_css_document == 1) { @@ -2781,7 +2788,7 @@ class Interpretation extends Fields return ''; } - public function setDocumentCustomJS($view) + public function setDocumentCustomJS(&$view) { if ($view['settings']->add_js_document == 1) { @@ -2796,7 +2803,7 @@ class Interpretation extends Fields return ''; } - public function setFootableScriptsLoader($view) + public function setFootableScriptsLoader(&$view) { if (isset($this->footableScripts[$this->target][$view['settings']->code]) && $this->footableScripts[$this->target][$view['settings']->code]) { @@ -2805,7 +2812,7 @@ class Interpretation extends Fields return ''; } - public function setDocumentMetadata($view) + public function setDocumentMetadata(&$view) { if ($view['settings']->main_get->gettype == 1 && $view['metadata'] == 1) { @@ -2919,7 +2926,7 @@ class Interpretation extends Fields return implode("\n",$meta); } - public function setGoogleChartLoader($view) + public function setGoogleChartLoader(&$view) { if (isset($this->googleChart[$this->target][$view['settings']->code]) && $this->googleChart[$this->target][$view['settings']->code]) { @@ -2935,7 +2942,7 @@ class Interpretation extends Fields return ''; } - public function setUikitLoader($view) + public function setUikitLoader(&$view) { // reset buktes $setter = ''; @@ -3289,7 +3296,7 @@ class Interpretation extends Fields return false; } - public function setMethodGetItem($view) + public function setMethodGetItem(&$view) { $script = ''; // go from json to array @@ -3377,7 +3384,7 @@ class Interpretation extends Fields return $script; } - public function setCheckboxSave($view) + public function setCheckboxSave(&$view) { $script = ''; if(isset($this->checkboxBuilder[$view]) && ComponentbuilderHelper::checkArray($this->checkboxBuilder[$view])) @@ -3394,7 +3401,7 @@ class Interpretation extends Fields return $script; } - public function setMethodItemSave($view) + public function setMethodItemSave(&$view) { $script = ''; // turn array into JSON string @@ -3480,7 +3487,7 @@ class Interpretation extends Fields return $script; } - public function setJtableConstructor($view) + public function setJtableConstructor(&$view) { // reset $oserver = ""; @@ -3501,7 +3508,7 @@ class Interpretation extends Fields return $oserver; } - public function setJtableAliasCategory($view) + public function setJtableAliasCategory(&$view) { // only add Observers if both title, alias and category is availabe in view if (array_key_exists($view, $this->catCodeBuilder)) @@ -3966,7 +3973,7 @@ class Interpretation extends Fields return ''; } - public function routerParseSwitch($view) + public function routerParseSwitch(&$view) { // add if tags is added, also for all front item views if (1) @@ -4006,7 +4013,7 @@ class Interpretation extends Fields return ''; } - public function routerBuildViews($view) + public function routerBuildViews(&$view) { if (isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) && ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###'])) { @@ -8455,7 +8462,7 @@ class Interpretation extends Fields return $clear; } - public function setViewScript($view) + public function setViewScript(&$view) { if (isset($this->editBodyViewScriptBuilder[$view]) && isset($this->editBodyViewScriptBuilder[$view]['fileScript'])) { @@ -8464,7 +8471,7 @@ class Interpretation extends Fields return ''; } - public function setEditBodyScript($view) + public function setEditBodyScript(&$view) { if (isset($this->editBodyViewScriptBuilder[$view]) && isset($this->editBodyViewScriptBuilder[$view]['footerScript'])) { @@ -8517,7 +8524,7 @@ class Interpretation extends Fields return $fix; } - public function setAjaxToke($view) + public function setAjaxToke(&$view) { $fix = ''; if (isset($this->customScriptBuilder['token'][$view]) && $this->customScriptBuilder['token'][$view]) @@ -8803,7 +8810,7 @@ class Interpretation extends Fields return ''; } - public function setUniqueFields($view) + public function setUniqueFields(&$view) { $fields = array(); $fields[] = "\n\n\t/**"; @@ -8828,7 +8835,7 @@ class Interpretation extends Fields return implode("\n",$fields); } - public function setOtherFilter($view) + public function setOtherFilter(&$view) { if (isset($this->filterBuilder[$view]) && ComponentbuilderHelper::checkArray($this->filterBuilder[$view])) { @@ -9785,7 +9792,7 @@ class Interpretation extends Fields return implode("\n",$allow); } - public function setFieldSetAccessControl($view) + public function setFieldSetAccessControl(&$view) { $access = ''; if ($view != 'component') @@ -9821,7 +9828,7 @@ class Interpretation extends Fields return $access; } - public function setFilterFields($view) + public function setFilterFields(&$view) { // keep track of all fields already added $donelist = array('id','search','published','access','created_by','modified_by'); @@ -9897,7 +9904,7 @@ class Interpretation extends Fields return $fields; } - public function setStoredId($view) + public function setStoredId(&$view) { // keep track of all fields already added $donelist = array('id','search','published','access','created_by','modified_by'); @@ -9974,7 +9981,7 @@ class Interpretation extends Fields return $stored; } - public function setAddToolBar($view) + public function setAddToolBar(&$view) { // set view name $viewName = ComponentbuilderHelper::safeString($view['settings']->name_single); @@ -10131,6 +10138,8 @@ class Interpretation extends Fields $toolBar .= "\n\t\t\t\t{"; $toolBar .= "\n\t\t\t\t\tJToolBarHelper::custom('".$viewName.".save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false);"; $toolBar .= "\n\t\t\t\t}"; + // add custom buttons + $toolBar .= $this->setCustomButtons($view, 2, "\t\t"); $toolBar .= "\n\t\t\t\tJToolBarHelper::cancel('".$viewName.".cancel', 'JTOOLBAR_CLOSE');"; $toolBar .= "\n\t\t\t}"; $toolBar .= "\n\t\t}"; @@ -10145,7 +10154,7 @@ class Interpretation extends Fields return $toolBar; } - public function setPopulateState($view) + public function setPopulateState(&$view) { // rest buket $state = ''; @@ -10259,7 +10268,7 @@ class Interpretation extends Fields return $state; } - public function setSortFields($view) + public function setSortFields(&$view) { // keep track of all fields already added $donelist = array('sorting','published'); @@ -12579,7 +12588,7 @@ for developing fast and powerful web interfaces. For more info visit componentHead[] = "\t\t".''; // set the menu controller lookup - $menuControllers = array('submenu','dashboard_list','dashboard_add'); + $menuControllers = array('access','submenu','dashboard_list','dashboard_add'); // set the custom admin views permissions if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views)) { @@ -12595,20 +12604,7 @@ for developing fast and powerful web interfaces. For more info visit langContent['admin'][$customAdminDesc] = ' Allows the users in this group to access '.ComponentbuilderHelper::safeString($customAdminName,'w').'.'; $this->componentGlobal[$sortKey] = "\t\t".''; // add the custom permissions to use the buttons of this view - if (isset($custom_admin_view['settings']->custom_buttons) && ComponentbuilderHelper::checkArray($custom_admin_view['settings']->custom_buttons)) - { - foreach ($custom_admin_view['settings']->custom_buttons as $custom_buttons) - { - $customAdminButtonName = $custom_buttons['name']; - $customAdminButtonCode = ComponentbuilderHelper::safeString($customAdminButtonName); - $customAdminButtonTitle = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($customAdminName.' '.$customAdminButtonName.' Button Access','U'); - $customAdminButtonDesc = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($customAdminName.' '.$customAdminButtonName.' Button Access','U').'_DESC'; - $sortButtonKey = ComponentbuilderHelper::safeString($customAdminName.' '.$customAdminButtonName.' Button Access'); - $this->langContent['admin'][$customAdminButtonTitle] = $customAdminName.' '.$customAdminButtonName.' Button Access'; - $this->langContent['admin'][$customAdminButtonDesc] = ' Allows the users in this group to access the '.ComponentbuilderHelper::safeString($customAdminButtonName,'w').' button.'; - $this->componentGlobal[$sortButtonKey] = "\t\t".''; - } - } + $this->addCustomButtonPermissions($custom_admin_view['settings'], $customAdminName, $customAdminCode); // add menu controll view that has menus options foreach ($menuControllers as $menuController) { @@ -12685,6 +12681,8 @@ for developing fast and powerful web interfaces. For more info visit name_single); $nameViews = ComponentbuilderHelper::safeString($view['settings']->name_list); + // add the custom permissions to use the buttons of this view + $this->addCustomButtonPermissions($view['settings'], $view['settings']->name_single, $nameView); if ($nameView != 'component') { @@ -12790,6 +12788,25 @@ for developing fast and powerful web interfaces. For more info visit custom_buttons) && ComponentbuilderHelper::checkArray($settings->custom_buttons)) + { + foreach ($settings->custom_buttons as $custom_buttons) + { + $customButtonName = $custom_buttons['name']; + $customButtonCode = ComponentbuilderHelper::safeString($customButtonName); + $customButtonTitle = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($nameView.' '.$customButtonName.' Button Access','U'); + $customButtonDesc = $this->langPrefix.'_'.ComponentbuilderHelper::safeString($nameView.' '.$customButtonName.' Button Access','U').'_DESC'; + $sortButtonKey = ComponentbuilderHelper::safeString($nameView.' '.$customButtonName.' Button Access'); + $this->langContent['admin'][$customButtonTitle] = $nameView.' '.$customButtonName.' Button Access'; + $this->langContent['admin'][$customButtonDesc] = ' Allows the users in this group to access the '.ComponentbuilderHelper::safeString($customButtonName,'w').' button.'; + $this->componentGlobal[$sortButtonKey] = "\t\t".''; + } + } + } public function buildPermissions(&$view, $nameView, $nameViews, $menuControllers, $type = 'admin') { diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 853b33a18..3830ca3cf 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -193,630 +193,627 @@ class Infusion extends Interpretation // add the helper emailer if set $this->fileContentStatic['###HELPER_EMAIL###'] = $this->addEmailHelper(); - // setup back-views and all needed stuff for the admin - if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views)) - { - // reset view array - $viewarray = array(); - $site_edit_view_array = array(); - // start dynamic build - foreach ($this->componentData->admin_views as $view) - { - $this->lang = 'admin'; - // set main keys - $viewName_single = ComponentbuilderHelper::safeString($view['settings']->name_single); - $viewName_list = ComponentbuilderHelper::safeString($view['settings']->name_list); - // set site edit view array - if ($view['edit_create_site_view']) - { - $site_edit_view_array[] = "\t\t\t\t'".$viewName_single."'"; - $this->lang = 'both'; - } - // check if help is being loaded - $this->checkHelp($viewName_single); - // set custom admin view list links - $this->setCustomAdminViewListLink($view,$viewName_list); - - // set view array - $viewarray[] = "\t\t\t\t'".$viewName_single."' => '".$viewName_list."'"; - // set the view names - if ($view['settings']->name_single != 'null') - { - // ###VIEW### <<>> - $viewName_u = ComponentbuilderHelper::safeString($view['settings']->name_single,'U'); - $this->fileContentDynamic[$viewName_single]['###VIEW###'] = $viewName_u; - $this->fileContentDynamic[$viewName_list]['###VIEW###'] = $viewName_u; - - // ###View### <<>> - $viewName_f = ComponentbuilderHelper::safeString($view['settings']->name_single,'F'); - $this->fileContentDynamic[$viewName_single]['###View###'] = $viewName_f; - $this->fileContentDynamic[$viewName_list]['###View###'] = $viewName_f; - - // ###view### <<>> - $this->fileContentDynamic[$viewName_single]['###view###'] = $viewName_single; - $this->fileContentDynamic[$viewName_list]['###view###'] = $viewName_single; - - // set some place holder for the views - $this->placeholders['###view###'] = $viewName_single; - $this->placeholders['###VIEW###'] = $viewName_u; - $this->placeholders['###View###'] = $viewName_f; - - // set license per view if needed - $this->setLockLicensePer($viewName_single); - $this->setLockLicensePer($viewName_list); - - // ###FIELDSETS### <<>> - $this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']); - - // ###ACCESSCONTROL### <<>> - $this->fileContentDynamic[$viewName_single]['###ACCESSCONTROL###'] = $this->setFieldSetAccessControl($viewName_single); - - // ###LINKEDVIEWITEMS### <<>> - $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWITEMS###'] = ''; - - // ###ADDTOOLBAR### <<>> - $this->fileContentDynamic[$viewName_single]['###ADDTOOLBAR###'] = $this->setAddToolBar($view); - - // set the script for this view - $this->buildTheViewScript($view); - - // ###VIEW_SCRIPT### - $this->fileContentDynamic[$viewName_single]['###VIEW_SCRIPT###'] = $this->setViewScript($viewName_single); - - // ###EDITBODYSCRIPT### - $this->fileContentDynamic[$viewName_single]['###EDITBODYSCRIPT###'] = $this->setEditBodyScript($viewName_single); - - // ###AJAXTOKE### <<>> - $this->fileContentDynamic[$viewName_single]['###AJAXTOKE###'] = $this->setAjaxToke($viewName_single); - - if (isset($this->customScriptBuilder['php_document'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single])) - { - // ###DOCUMENT_CUSTOM_PHP### <<>> - $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] - = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_document'][$viewName_single]); - // clear some memory - unset($this->customScriptBuilder['php_document'][$viewName_single]); - } - else - { - $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] = ''; - } - - // ###LINKEDVIEWTABLESCRIPTS### <<>> - $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = ''; - - // ###VALIDATEFIX### <<>> - $this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] = $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']); - - // ###EDITBODY### <<>> - $this->fileContentDynamic[$viewName_single]['###EDITBODY###'] = $this->setEditBody($view); - - // ###EDITBODY### <<>> - $this->fileContentDynamic[$viewName_single]['###EDITBODYFADEIN###'] = $this->setFadeInEfect($view); - - // ###JTABLECONSTRUCTOR### <<>> - $this->fileContentDynamic[$viewName_single]['###JTABLECONSTRUCTOR###'] = $this->setJtableConstructor($viewName_single); - - // ###JTABLEALIASCATEGORY### <<>> - $this->fileContentDynamic[$viewName_single]['###JTABLEALIASCATEGORY###'] = $this->setJtableAliasCategory($viewName_single); - - // ###METHOD_GET_ITEM### <<>> - $this->fileContentDynamic[$viewName_single]['###METHOD_GET_ITEM###'] = $this->setMethodGetItem($viewName_single); - - // ###LINKEDVIEWGLOBAL### <<>> - $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] = ''; - - // ###LINKEDVIEWMETHODS### <<>> - $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = ''; - - // ###JMODELADMIN_BEFORE_DELETE### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, "\n"); - - // ###JMODELADMIN_AFTER_DELETE### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, "\n\n"); - - // ###JMODELADMIN_BEFORE_DELETE### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, "\n"); - - // ###JMODELADMIN_AFTER_DELETE### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, "\n\n"); - - // ###CHECKBOX_SAVE### <<>> - $this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single); - - // ###METHOD_ITEM_SAVE### <<>> - $this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single); - - // ###POSTSAVEHOOK### <<>> - $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, "\n", null, true, "\n\t\treturn;", "\n\n\t\treturn;"); - - if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single])) - { - // ###VIEWCSS### <<>> - $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'] - = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_view'][$viewName_single]); - // clear some memory - unset($this->customScriptBuilder['css_view'][$viewName_single]); - } - else - { - // ###VIEWCSS### <<>> - $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'] = ''; - } - // add css to front end - if ($view['edit_create_site_view']) - { - $this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] = $this->fileContentDynamic[$viewName_single]['###VIEWCSS###']; - } - } - // set the views names - if ($view['settings']->name_list != 'null') - { - $this->lang = 'admin'; - // ###VIEWS### <<>> - $viewsName_u = ComponentbuilderHelper::safeString($view['settings']->name_list,'U'); - $this->fileContentDynamic[$viewName_list]['###VIEWS###'] = $viewsName_u; - $this->fileContentDynamic[$viewName_single]['###VIEWS###'] = $viewsName_u; - - // ###Views### <<>> - $viewsName_f = ComponentbuilderHelper::safeString($view['settings']->name_list,'F'); - $this->fileContentDynamic[$viewName_list]['###Views###'] = $viewsName_f; - $this->fileContentDynamic[$viewName_single]['###Views###'] = $viewsName_f; - - // ###views### <<>> - $this->fileContentDynamic[$viewName_list]['###views###'] = $viewName_list; - $this->fileContentDynamic[$viewName_single]['###views###'] = $viewName_list; - // ###ICOMOON### <<>> - $this->fileContentDynamic[$viewName_list]['###ICOMOON###'] = $view['icomoon']; - - // set some place holder for the views - $this->placeholders['###views###'] = $viewName_list; - $this->placeholders['###VIEWS###'] = $viewsName_u; - $this->placeholders['###Views###'] = $viewsName_f; - - // set the export/import option - if ($view['port']) - { - $this->eximportView[$viewName_list] = true; - if (1 == $view['settings']->add_custom_import) - { - // this view has custom import scripting - $this->importCustomScripts[$viewName_list] = true; - $this->setImportCustomScripts($viewName_list); - } - } - else - { - $this->eximportView[$viewName_list] = false; - } - - // set Autocheckin function - if ($view['checkin'] == 1) - { - // ###AUTOCHECKIN### <<>> - $this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = $this->setAutoCheckin($viewName_single,$this->fileContentStatic['###component###']); - // ###CHECKINCALL### <<>> - $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = $this->setCheckinCall(); - } - else - { - // ###AUTOCHECKIN### <<>> - $this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = ''; - // ###CHECKINCALL### <<>> - $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = ''; - } - - // ###GET_ITEMS_METHOD_STRING_FIX### <<>> - $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']); - - // ###GET_ITEMS_METHOD_AFTER_ALL### <<>> - $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n"); - - // ###SELECTIONTRANSLATIONFIX### <<>> - $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']); - - // ###SELECTIONTRANSLATIONFIXFUNC### <<>> - $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###'] = $this->setSelectionTranslationFixFunc($viewName_list,$this->fileContentStatic['###Component###']); - - // ###FILTER_FIELDS### <<>> - $this->fileContentDynamic[$viewName_list]['###FILTER_FIELDS###'] = $this->setFilterFields($viewName_list); - - // ###STOREDID### <<>> - $this->fileContentDynamic[$viewName_list]['###STOREDID###'] = $this->setStoredId($viewName_list); - - // ###POPULATESTATE### <<>> - $this->fileContentDynamic[$viewName_list]['###POPULATESTATE###'] = $this->setPopulateState($viewName_list); - - // ###SORTFIELDS### <<>> - $this->fileContentDynamic[$viewName_list]['###SORTFIELDS###'] = $this->setSortFields($viewName_list); - - // ###CATEGORYFILTER### <<>> - $this->fileContentDynamic[$viewName_list]['###CATEGORYFILTER###'] = $this->setCategoryFilter($viewName_list); - - // ###CATEGORY_VIEWS### - if (!isset($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'])) - { - $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] = ''; - } - $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] .= $this->setRouterCategoryViews($viewName_single,$viewName_list); - - // ###OTHERFILTERS### <<>> - $this->fileContentDynamic[$viewName_list]['###OTHERFILTERS###'] = $this->setOtherFilter($viewName_list); - - // ###FILTERFUNCTIONS### <<>> - $this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] = $this->setFilterFunctions($viewName_single,$viewName_list); - - // ###LISTQUERY### <<>> - $this->fileContentDynamic[$viewName_list]['###LISTQUERY###'] = $this->setListQuery($viewName_single,$viewName_list); - - // ###MODELEXPORTMETHOD### <<>> - $this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] = $this->setModelExportMethod($viewName_single, $viewName_list); - - // ###MODELEXIMPORTMETHOD### <<>> - $this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] = $this->setControllerEximportMethod($viewName_single, $viewName_list); - - // ###EXPORTBUTTON### <<>> - $this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] = $this->setExportButton($viewName_single, $viewName_list); - - // ###IMPORTBUTTON### <<>> - $this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] = $this->setImportButton($viewName_single, $viewName_list); - - // ###LISTHEAD### <<>> - $this->fileContentDynamic[$viewName_list]['###LISTHEAD###'] = $this->setListHead($viewName_single,$viewName_list); - - // ###LISTBODY### <<>> - $this->fileContentDynamic[$viewName_list]['###LISTBODY###'] = $this->setListBody($viewName_single,$viewName_list); - - // ###LISTCOLNR### <<>> - $this->fileContentDynamic[$viewName_list]['###LISTCOLNR###'] = $this->setListColnr($viewName_list); - - // ###JVIEWLISTCANDO### <<>> - $this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] = $this->setJviewListCanDo($viewName_single,$viewName_list); - - if (isset($this->customScriptBuilder['css_views'][$viewName_list]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list])) - { - // ###VIEWCSS### <<>> - $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] - = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_views'][$viewName_list]); - // clear some memory - unset($this->customScriptBuilder['css_views'][$viewName_list]); - } - else - { - // ###VIEWCSS### <<>> - $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] = ''; - } - } - - // set u fields used in batch - $this->fileContentDynamic[$viewName_single]['###UNIQUEFIELDS###'] = $this->setUniqueFields($viewName_single); - - // ###TITLEALIASFIX### <<>> - $this->fileContentDynamic[$viewName_single]['###TITLEALIASFIX###'] = $this->setAliasTitleFix($viewName_single); - - // ###GENERATENEWTITLE### <<>> - $this->fileContentDynamic[$viewName_single]['###GENERATENEWTITLE###'] = $this->setGenerateNewTitle($viewName_single); - - // ###MODEL_BATCH_COPY### <<>> - $this->fileContentDynamic[$viewName_single]['###MODEL_BATCH_COPY###'] = $this->setBatchCopy($viewName_single); - - // ###MODEL_BATCH_MOVE### <<>> - $this->fileContentDynamic[$viewName_single]['###MODEL_BATCH_MOVE###'] = $this->setBatchMove($viewName_single); - - // ###BATCH_ONCLICK_CANCEL_SCRIPT### <<>> - $this->fileContentDynamic[$viewName_list]['###BATCH_ONCLICK_CANCEL_SCRIPT###'] = ''; // TODO <-- must still be build - - // ###JCONTROLLERFORM_ALLOWADD### <<>> - $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] = $this->setJcontrollerAllowAdd($viewName_single,$viewName_list); - - // ###JCONTROLLERFORM_ALLOWEDIT### <<>> - $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] = $this->setJcontrollerAllowEdit($viewName_single,$viewName_list); - - // ###JMODELADMIN_GETFORM### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] = $this->setJmodelAdminGetForm($viewName_single,$viewName_list); - - // ###JMODELADMIN_ALLOWEDIT### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] = $this->setJmodelAdminAllowEdit($viewName_single,$viewName_list); - - // ###JMODELADMIN_CANDELETE### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] = $this->setJmodelAdminCanDelete($viewName_single,$viewName_list); - - // ###JMODELADMIN_CANEDITSTATE### <<>> - $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] = $this->setJmodelAdminCanEditState($viewName_single,$viewName_list); - - // set custom admin view Toolbare buttons - // ###CUSTOM_ADMIN_DYNAMIC_BUTTONS### <<>> - $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] = $this->setCustomAdminDynamicButton($viewName_list); - // ###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER### <<>> - $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] = $this->setCustomAdminDynamicButtonController($viewName_list); - - // set helper router - if (!isset($this->fileContentStatic['###ROUTEHELPER###'])) - { - $this->fileContentStatic['###ROUTEHELPER###'] = ''; - } - $this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($viewName_single, $viewName_list); - - if ($view['edit_create_site_view']) - { - // add needed router stuff for front edit views - $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($viewName_single); - $this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($viewName_single); - } - - // ###ACCESS_SECTIONS### - if (!isset($this->fileContentStatic['###ACCESS_SECTIONS###'])) - { - $this->fileContentStatic['###ACCESS_SECTIONS###'] = ''; - } - $this->fileContentStatic['###ACCESS_SECTIONS###'] .= $this->setAccessSectionsCategory($viewName_single, $viewName_list); - - // ###HELPER_EXEL### - $this->fileContentStatic['###HELPER_EXEL###'] = $this->setExelHelperMethods(); - - } - - // setup custom_admin_views and all needed stuff for the site - if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views)) - { - $this->target = 'custom_admin'; - $this->lang = 'admin'; - // var_dump($this->componentData->custom_admin_views);exit; - // start dynamic build - foreach ($this->componentData->custom_admin_views as $view) - { - // for single views - $this->fileContentDynamic[$view['settings']->code]['###SView###'] = $view['settings']->Code; - $this->fileContentDynamic[$view['settings']->code]['###sview###'] = $view['settings']->code; - $this->fileContentDynamic[$view['settings']->code]['###SVIEW###'] = $view['settings']->CODE; - // for list views - $this->fileContentDynamic[$view['settings']->code]['###SViews###'] = $view['settings']->Code; - $this->fileContentDynamic[$view['settings']->code]['###sviews###'] = $view['settings']->code; - $this->fileContentDynamic[$view['settings']->code]['###SVIEWS###'] = $view['settings']->CODE; - // add to lang array - if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE])) - { - $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE] = $view['settings']->name; - } - if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'])) - { - $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] = $view['settings']->description; - } - // ###ICOMOON### <<>> - $this->fileContentDynamic[$view['settings']->code]['###ICOMOON###'] = $view['icomoon']; - - // set placeholders - $this->placeholders['###SView###'] = $view['settings']->Code; - $this->placeholders['###sview###'] = $view['settings']->code; - $this->placeholders['###SVIEW###'] = $view['settings']->CODE; - $this->placeholders['[[[SView]]]'] = $view['settings']->Code; - $this->placeholders['[[[sview]]]'] = $view['settings']->code; - $this->placeholders['[[[SVIEW]]]'] = $view['settings']->CODE; - $this->placeholders['###SViews###'] = $view['settings']->Code; - $this->placeholders['###sviews###'] = $view['settings']->code; - $this->placeholders['###SVIEWS###'] = $view['settings']->CODE; - $this->placeholders['[[[SViews]]]'] = $view['settings']->Code; - $this->placeholders['[[[sviews]]]'] = $view['settings']->code; - $this->placeholders['[[[SVIEWS]]]'] = $view['settings']->CODE; - - // set license per view if needed - $this->setLockLicensePer($view['settings']->code); - - if ($view['settings']->main_get->gettype == 1) - { - // check if there is any custom script - if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code])) - { - // ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###'] - = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]); - // clear some memory - unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]); - } - else - { - // ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###'] = ''; - } - - // ###CUSTOM_ADMIN_GET_ITEM### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t"); - - // check if there is any custom script - if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code])) - { - // ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###'] - = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]); - // clear some memory - unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]); - } - else - { - // ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###'] = ''; - } - } - elseif ($view['settings']->main_get->gettype == 2) - { - // ###CUSTOM_ADMIN_GET_LIST_QUERY### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code); - - // check if there is any custom script - if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code])) - { - // ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###'] - = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]); - // clear some memory - unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]); - } - else - { - // ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###'] = ''; - } - - // check if there is any custom script - if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code])) - { - // ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###'] - = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]); - // clear some memory - unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]); - } - else - { - // ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###'] = ''; - } - - // ###CUSTOM_ADMIN_GET_ITEMS### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code); - - // check if there is any custom script - if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code])) - { - // ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###'] - = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]); - // clear some memory - unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]); - } - else - { - // ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###'] = ''; - } - } - - // ###CUSTOM_ADMIN_CUSTOM_METHODS### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code); - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code); - // ###CUSTOM_ADMIN_DIPLAY_METHOD### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view); - // set document details - $this->setPrepareDocument($view); - // ###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view); - // ###CUSTOM_ADMIN_CODE_BODY### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CODE_BODY###'] = $this->setCustomViewCodeBody($view); - // ###CUSTOM_ADMIN_BODY### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BODY###'] = $this->setCustomViewBody($view); - // ###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT### <<>> - $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] = $this->setCustomViewSubmitButtonScript($view); - - // setup the templates - $this->setCustomViewTemplateBody($view); - } - - // setup the layouts - $this->setCustomViewLayouts(); - } - - // ###VIEWARRAY### - $this->fileContentStatic['###VIEWARRAY###'] = "\n".implode(",\n",$viewarray); - - // ###CUSTOM_ADMIN_EDIT_VIEW_ARRAY### - $this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = "\n".implode(",\n",$site_edit_view_array); - - // ###MAINMENUS### - $this->fileContentStatic['###MAINMENUS###'] = $this->setMainMenus(); - - // ###SUBMENU### - $this->fileContentStatic['###SUBMENU###'] = $this->setSubMenus(); - - // ###GET_CRYPT_KEY### - $this->fileContentStatic['###GET_CRYPT_KEY###'] = $this->setGetCryptKey(); - - // set the license locker - $this->setLockLicense(); - - // ###CONTRIBUTORS### - $this->fileContentStatic['###CONTRIBUTORS###'] = $this->theContributors; - - // ###INSTALL### - $this->fileContentStatic['###INSTALL###'] = $this->setInstall(); - - // ###UNINSTALL### - $this->fileContentStatic['###UNINSTALL###'] = $this->setUninstall(); - - // ###DASHBOARDICONS### - $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONS###'] = $this->setDashboardIcons(); - - // ###DASHBOARDICONACCESS### - $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONACCESS###'] = $this->setDashboardIconAccess(); - - // ###DASH_MODEL_METHODS### - $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_MODEL_METHODS###'] = $this->setDashboardModelMethods(); - - // ###DASH_GET_CUSTOM_DATA### - $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_GET_CUSTOM_DATA###'] = $this->setDashboardGetCustomData(); - - // ###DASH_DISPLAY_DATA### - $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_DISPLAY_DATA###'] = $this->setDashboardDisplayData(); - - // add import - if (isset($this->addEximport) && $this->addEximport) - { - // setup import files - $target = array('admin' => 'import'); - $this->buildDynamique($target,'import'); - // set the controller - $this->fileContentDynamic['import']['###BLABLABLA###'] = ''; - } - - // ensure that the ajax model and controller is set if needed - if (isset($this->addAjax) && $this->addAjax) - { - // setup Ajax files - $target = array('admin' => 'ajax'); - $this->buildDynamique($target,'ajax'); - // set the controller - $this->fileContentDynamic['ajax']['###REGISTER_AJAX_TASK###'] = $this->setRegisterAjaxTask('admin'); - $this->fileContentDynamic['ajax']['###AJAX_INPUT_RETURN###'] = $this->setAjaxInputReturn('admin'); - // set the module - $this->fileContentDynamic['ajax']['###AJAX_MODEL_METHODS###'] = $this->setAjaxModelMethods('admin'); - } - - // ensure that the site ajax model and controller is set if needed - if (isset($this->addSiteAjax) && $this->addSiteAjax) - { - // setup Ajax files - $target = array('site' => 'ajax'); - $this->buildDynamique($target,'ajax'); - // set the controller - $this->fileContentDynamic['ajax']['###REGISTER_SITE_AJAX_TASK###'] = $this->setRegisterAjaxTask('site' ); - $this->fileContentDynamic['ajax']['###AJAX_SITE_INPUT_RETURN###'] = $this->setAjaxInputReturn('site' ); - // set the module - $this->fileContentDynamic['ajax']['###AJAX_SITE_MODEL_METHODS###'] = $this->setAjaxModelMethods('site'); - } - - // run the second run if needed - if (isset($this->secondRunAdmin) && ComponentbuilderHelper::checkArray($this->secondRunAdmin)) - { - // start dynamic build - foreach ($this->secondRunAdmin as $function => $arrays) - { - if (ComponentbuilderHelper::checkArray($arrays) && ComponentbuilderHelper::checkString($function)) - { - foreach ($arrays as $array) - { - $this->{$function}($array); - } - } - } - - } - - // ###CONFIG_FIELDSETS### - $keepLang = $this->lang; - $this->lang = 'admin'; - // run field sets for second time - $this->setConfigFieldsets(2); - $this->lang = $keepLang; - } + // reset view array + $viewarray = array(); + $site_edit_view_array = array(); + // start dynamic build + foreach ($this->componentData->admin_views as $view) + { + $this->target = 'admin'; + $this->lang = 'admin'; + // set main keys + $viewName_single = ComponentbuilderHelper::safeString($view['settings']->name_single); + $viewName_list = ComponentbuilderHelper::safeString($view['settings']->name_list); + // set site edit view array + if ($view['edit_create_site_view']) + { + $site_edit_view_array[] = "\t\t\t\t'".$viewName_single."'"; + $this->lang = 'both'; + } + // check if help is being loaded + $this->checkHelp($viewName_single); + // set custom admin view list links + $this->setCustomAdminViewListLink($view,$viewName_list); + + // set view array + $viewarray[] = "\t\t\t\t'".$viewName_single."' => '".$viewName_list."'"; + // set the view names + if ($view['settings']->name_single != 'null') + { + // ###VIEW### <<>> + $viewName_u = ComponentbuilderHelper::safeString($view['settings']->name_single,'U'); + $this->fileContentDynamic[$viewName_single]['###VIEW###'] = $viewName_u; + $this->fileContentDynamic[$viewName_list]['###VIEW###'] = $viewName_u; + + // ###View### <<>> + $viewName_f = ComponentbuilderHelper::safeString($view['settings']->name_single,'F'); + $this->fileContentDynamic[$viewName_single]['###View###'] = $viewName_f; + $this->fileContentDynamic[$viewName_list]['###View###'] = $viewName_f; + + // ###view### <<>> + $this->fileContentDynamic[$viewName_single]['###view###'] = $viewName_single; + $this->fileContentDynamic[$viewName_list]['###view###'] = $viewName_single; + + // set some place holder for the views + $this->placeholders['###view###'] = $viewName_single; + $this->placeholders['###VIEW###'] = $viewName_u; + $this->placeholders['###View###'] = $viewName_f; + + // set license per view if needed + $this->setLockLicensePer($viewName_single); + $this->setLockLicensePer($viewName_list); + + // ###FIELDSETS### <<>> + $this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']); + + // ###ACCESSCONTROL### <<>> + $this->fileContentDynamic[$viewName_single]['###ACCESSCONTROL###'] = $this->setFieldSetAccessControl($viewName_single); + + // ###LINKEDVIEWITEMS### <<>> + $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWITEMS###'] = ''; + + // ###ADDTOOLBAR### <<>> + $this->fileContentDynamic[$viewName_single]['###ADDTOOLBAR###'] = $this->setAddToolBar($view); + + // set the script for this view + $this->buildTheViewScript($view); + + // ###VIEW_SCRIPT### + $this->fileContentDynamic[$viewName_single]['###VIEW_SCRIPT###'] = $this->setViewScript($viewName_single); + + // ###EDITBODYSCRIPT### + $this->fileContentDynamic[$viewName_single]['###EDITBODYSCRIPT###'] = $this->setEditBodyScript($viewName_single); + + // ###AJAXTOKE### <<>> + $this->fileContentDynamic[$viewName_single]['###AJAXTOKE###'] = $this->setAjaxToke($viewName_single); + + if (isset($this->customScriptBuilder['php_document'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single])) + { + // ###DOCUMENT_CUSTOM_PHP### <<>> + $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] + = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_document'][$viewName_single]); + // clear some memory + unset($this->customScriptBuilder['php_document'][$viewName_single]); + } + else + { + $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] = ''; + } + + // ###LINKEDVIEWTABLESCRIPTS### <<>> + $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = ''; + + // ###VALIDATEFIX### <<>> + $this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] = $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']); + + // ###EDITBODY### <<>> + $this->fileContentDynamic[$viewName_single]['###EDITBODY###'] = $this->setEditBody($view); + + // ###EDITBODY### <<>> + $this->fileContentDynamic[$viewName_single]['###EDITBODYFADEIN###'] = $this->setFadeInEfect($view); + + // ###JTABLECONSTRUCTOR### <<>> + $this->fileContentDynamic[$viewName_single]['###JTABLECONSTRUCTOR###'] = $this->setJtableConstructor($viewName_single); + + // ###JTABLEALIASCATEGORY### <<>> + $this->fileContentDynamic[$viewName_single]['###JTABLEALIASCATEGORY###'] = $this->setJtableAliasCategory($viewName_single); + + // ###METHOD_GET_ITEM### <<>> + $this->fileContentDynamic[$viewName_single]['###METHOD_GET_ITEM###'] = $this->setMethodGetItem($viewName_single); + + // ###LINKEDVIEWGLOBAL### <<>> + $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWGLOBAL###'] = ''; + + // ###LINKEDVIEWMETHODS### <<>> + $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = ''; + + // ###JMODELADMIN_BEFORE_DELETE### <<>> + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, "\n"); + + // ###JMODELADMIN_AFTER_DELETE### <<>> + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, "\n\n"); + + // ###JMODELADMIN_BEFORE_DELETE### <<>> + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, "\n"); + + // ###JMODELADMIN_AFTER_DELETE### <<>> + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, "\n\n"); + + // ###CHECKBOX_SAVE### <<>> + $this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single); + + // ###METHOD_ITEM_SAVE### <<>> + $this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single); + + // ###POSTSAVEHOOK### <<>> + $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, "\n", null, true, "\n\t\treturn;", "\n\n\t\treturn;"); + + if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single])) + { + // ###VIEWCSS### <<>> + $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'] + = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_view'][$viewName_single]); + // clear some memory + unset($this->customScriptBuilder['css_view'][$viewName_single]); + } + else + { + // ###VIEWCSS### <<>> + $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'] = ''; + } + // add css to front end + if ($view['edit_create_site_view']) + { + $this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] = $this->fileContentDynamic[$viewName_single]['###VIEWCSS###']; + } + } + // set the views names + if ($view['settings']->name_list != 'null') + { + $this->lang = 'admin'; + // ###VIEWS### <<>> + $viewsName_u = ComponentbuilderHelper::safeString($view['settings']->name_list,'U'); + $this->fileContentDynamic[$viewName_list]['###VIEWS###'] = $viewsName_u; + $this->fileContentDynamic[$viewName_single]['###VIEWS###'] = $viewsName_u; + + // ###Views### <<>> + $viewsName_f = ComponentbuilderHelper::safeString($view['settings']->name_list,'F'); + $this->fileContentDynamic[$viewName_list]['###Views###'] = $viewsName_f; + $this->fileContentDynamic[$viewName_single]['###Views###'] = $viewsName_f; + + // ###views### <<>> + $this->fileContentDynamic[$viewName_list]['###views###'] = $viewName_list; + $this->fileContentDynamic[$viewName_single]['###views###'] = $viewName_list; + // ###ICOMOON### <<>> + $this->fileContentDynamic[$viewName_list]['###ICOMOON###'] = $view['icomoon']; + + // set some place holder for the views + $this->placeholders['###views###'] = $viewName_list; + $this->placeholders['###VIEWS###'] = $viewsName_u; + $this->placeholders['###Views###'] = $viewsName_f; + + // set the export/import option + if ($view['port']) + { + $this->eximportView[$viewName_list] = true; + if (1 == $view['settings']->add_custom_import) + { + // this view has custom import scripting + $this->importCustomScripts[$viewName_list] = true; + $this->setImportCustomScripts($viewName_list); + } + } + else + { + $this->eximportView[$viewName_list] = false; + } + + // set Autocheckin function + if ($view['checkin'] == 1) + { + // ###AUTOCHECKIN### <<>> + $this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = $this->setAutoCheckin($viewName_single,$this->fileContentStatic['###component###']); + // ###CHECKINCALL### <<>> + $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = $this->setCheckinCall(); + } + else + { + // ###AUTOCHECKIN### <<>> + $this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = ''; + // ###CHECKINCALL### <<>> + $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = ''; + } + + // ###GET_ITEMS_METHOD_STRING_FIX### <<>> + $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']); + + // ###GET_ITEMS_METHOD_AFTER_ALL### <<>> + $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n"); + + // ###SELECTIONTRANSLATIONFIX### <<>> + $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']); + + // ###SELECTIONTRANSLATIONFIXFUNC### <<>> + $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###'] = $this->setSelectionTranslationFixFunc($viewName_list,$this->fileContentStatic['###Component###']); + + // ###FILTER_FIELDS### <<>> + $this->fileContentDynamic[$viewName_list]['###FILTER_FIELDS###'] = $this->setFilterFields($viewName_list); + + // ###STOREDID### <<>> + $this->fileContentDynamic[$viewName_list]['###STOREDID###'] = $this->setStoredId($viewName_list); + + // ###POPULATESTATE### <<>> + $this->fileContentDynamic[$viewName_list]['###POPULATESTATE###'] = $this->setPopulateState($viewName_list); + + // ###SORTFIELDS### <<>> + $this->fileContentDynamic[$viewName_list]['###SORTFIELDS###'] = $this->setSortFields($viewName_list); + + // ###CATEGORYFILTER### <<>> + $this->fileContentDynamic[$viewName_list]['###CATEGORYFILTER###'] = $this->setCategoryFilter($viewName_list); + + // ###CATEGORY_VIEWS### + if (!isset($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'])) + { + $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] = ''; + } + $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] .= $this->setRouterCategoryViews($viewName_single,$viewName_list); + + // ###OTHERFILTERS### <<>> + $this->fileContentDynamic[$viewName_list]['###OTHERFILTERS###'] = $this->setOtherFilter($viewName_list); + + // ###FILTERFUNCTIONS### <<>> + $this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] = $this->setFilterFunctions($viewName_single,$viewName_list); + + // ###LISTQUERY### <<>> + $this->fileContentDynamic[$viewName_list]['###LISTQUERY###'] = $this->setListQuery($viewName_single,$viewName_list); + + // ###MODELEXPORTMETHOD### <<>> + $this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] = $this->setModelExportMethod($viewName_single, $viewName_list); + + // ###MODELEXIMPORTMETHOD### <<>> + $this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] = $this->setControllerEximportMethod($viewName_single, $viewName_list); + + // ###EXPORTBUTTON### <<>> + $this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] = $this->setExportButton($viewName_single, $viewName_list); + + // ###IMPORTBUTTON### <<>> + $this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] = $this->setImportButton($viewName_single, $viewName_list); + + // ###LISTHEAD### <<>> + $this->fileContentDynamic[$viewName_list]['###LISTHEAD###'] = $this->setListHead($viewName_single,$viewName_list); + + // ###LISTBODY### <<>> + $this->fileContentDynamic[$viewName_list]['###LISTBODY###'] = $this->setListBody($viewName_single,$viewName_list); + + // ###LISTCOLNR### <<>> + $this->fileContentDynamic[$viewName_list]['###LISTCOLNR###'] = $this->setListColnr($viewName_list); + + // ###JVIEWLISTCANDO### <<>> + $this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] = $this->setJviewListCanDo($viewName_single,$viewName_list); + + if (isset($this->customScriptBuilder['css_views'][$viewName_list]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list])) + { + // ###VIEWCSS### <<>> + $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] + = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_views'][$viewName_list]); + // clear some memory + unset($this->customScriptBuilder['css_views'][$viewName_list]); + } + else + { + // ###VIEWCSS### <<>> + $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] = ''; + } + } + + // set u fields used in batch + $this->fileContentDynamic[$viewName_single]['###UNIQUEFIELDS###'] = $this->setUniqueFields($viewName_single); + + // ###TITLEALIASFIX### <<>> + $this->fileContentDynamic[$viewName_single]['###TITLEALIASFIX###'] = $this->setAliasTitleFix($viewName_single); + + // ###GENERATENEWTITLE### <<>> + $this->fileContentDynamic[$viewName_single]['###GENERATENEWTITLE###'] = $this->setGenerateNewTitle($viewName_single); + + // ###MODEL_BATCH_COPY### <<>> + $this->fileContentDynamic[$viewName_single]['###MODEL_BATCH_COPY###'] = $this->setBatchCopy($viewName_single); + + // ###MODEL_BATCH_MOVE### <<>> + $this->fileContentDynamic[$viewName_single]['###MODEL_BATCH_MOVE###'] = $this->setBatchMove($viewName_single); + + // ###BATCH_ONCLICK_CANCEL_SCRIPT### <<>> + $this->fileContentDynamic[$viewName_list]['###BATCH_ONCLICK_CANCEL_SCRIPT###'] = ''; // TODO <-- must still be build + + // ###JCONTROLLERFORM_ALLOWADD### <<>> + $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] = $this->setJcontrollerAllowAdd($viewName_single,$viewName_list); + + // ###JCONTROLLERFORM_ALLOWEDIT### <<>> + $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] = $this->setJcontrollerAllowEdit($viewName_single,$viewName_list); + + // ###JMODELADMIN_GETFORM### <<>> + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] = $this->setJmodelAdminGetForm($viewName_single,$viewName_list); + + // ###JMODELADMIN_ALLOWEDIT### <<>> + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] = $this->setJmodelAdminAllowEdit($viewName_single,$viewName_list); + + // ###JMODELADMIN_CANDELETE### <<>> + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] = $this->setJmodelAdminCanDelete($viewName_single,$viewName_list); + + // ###JMODELADMIN_CANEDITSTATE### <<>> + $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] = $this->setJmodelAdminCanEditState($viewName_single,$viewName_list); + + // set custom admin view Toolbare buttons + // ###CUSTOM_ADMIN_DYNAMIC_BUTTONS### <<>> + $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] = $this->setCustomAdminDynamicButton($viewName_list); + // ###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER### <<>> + $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] = $this->setCustomAdminDynamicButtonController($viewName_list); + + // set helper router + if (!isset($this->fileContentStatic['###ROUTEHELPER###'])) + { + $this->fileContentStatic['###ROUTEHELPER###'] = ''; + } + $this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($viewName_single, $viewName_list); + + if ($view['edit_create_site_view']) + { + // add needed router stuff for front edit views + $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($viewName_single); + $this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($viewName_single); + } + + // ###ACCESS_SECTIONS### + if (!isset($this->fileContentStatic['###ACCESS_SECTIONS###'])) + { + $this->fileContentStatic['###ACCESS_SECTIONS###'] = ''; + } + $this->fileContentStatic['###ACCESS_SECTIONS###'] .= $this->setAccessSectionsCategory($viewName_single, $viewName_list); + + // ###HELPER_EXEL### + $this->fileContentStatic['###HELPER_EXEL###'] = $this->setExelHelperMethods(); + + } + + // setup custom_admin_views and all needed stuff for the site + if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views)) + { + $this->target = 'custom_admin'; + $this->lang = 'admin'; + // var_dump($this->componentData->custom_admin_views);exit; + // start dynamic build + foreach ($this->componentData->custom_admin_views as $view) + { + // for single views + $this->fileContentDynamic[$view['settings']->code]['###SView###'] = $view['settings']->Code; + $this->fileContentDynamic[$view['settings']->code]['###sview###'] = $view['settings']->code; + $this->fileContentDynamic[$view['settings']->code]['###SVIEW###'] = $view['settings']->CODE; + // for list views + $this->fileContentDynamic[$view['settings']->code]['###SViews###'] = $view['settings']->Code; + $this->fileContentDynamic[$view['settings']->code]['###sviews###'] = $view['settings']->code; + $this->fileContentDynamic[$view['settings']->code]['###SVIEWS###'] = $view['settings']->CODE; + // add to lang array + if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE])) + { + $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE] = $view['settings']->name; + } + if (!isset($this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'])) + { + $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] = $view['settings']->description; + } + // ###ICOMOON### <<>> + $this->fileContentDynamic[$view['settings']->code]['###ICOMOON###'] = $view['icomoon']; + + // set placeholders + $this->placeholders['###SView###'] = $view['settings']->Code; + $this->placeholders['###sview###'] = $view['settings']->code; + $this->placeholders['###SVIEW###'] = $view['settings']->CODE; + $this->placeholders['[[[SView]]]'] = $view['settings']->Code; + $this->placeholders['[[[sview]]]'] = $view['settings']->code; + $this->placeholders['[[[SVIEW]]]'] = $view['settings']->CODE; + $this->placeholders['###SViews###'] = $view['settings']->Code; + $this->placeholders['###sviews###'] = $view['settings']->code; + $this->placeholders['###SVIEWS###'] = $view['settings']->CODE; + $this->placeholders['[[[SViews]]]'] = $view['settings']->Code; + $this->placeholders['[[[sviews]]]'] = $view['settings']->code; + $this->placeholders['[[[SVIEWS]]]'] = $view['settings']->CODE; + + // set license per view if needed + $this->setLockLicensePer($view['settings']->code); + + if ($view['settings']->main_get->gettype == 1) + { + // check if there is any custom script + if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code])) + { + // ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###'] + = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]); + // clear some memory + unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]); + } + else + { + // ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###'] = ''; + } + + // ###CUSTOM_ADMIN_GET_ITEM### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t"); + + // check if there is any custom script + if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code])) + { + // ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###'] + = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]); + // clear some memory + unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]); + } + else + { + // ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###'] = ''; + } + } + elseif ($view['settings']->main_get->gettype == 2) + { + // ###CUSTOM_ADMIN_GET_LIST_QUERY### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code); + + // check if there is any custom script + if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code])) + { + // ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###'] + = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]); + // clear some memory + unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]); + } + else + { + // ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###'] = ''; + } + + // check if there is any custom script + if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code])) + { + // ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###'] + = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]); + // clear some memory + unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]); + } + else + { + // ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###'] = ''; + } + + // ###CUSTOM_ADMIN_GET_ITEMS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code); + + // check if there is any custom script + if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code])) + { + // ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###'] + = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]); + // clear some memory + unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]); + } + else + { + // ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###'] = ''; + } + } + + // ###CUSTOM_ADMIN_CUSTOM_METHODS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code); + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code); + // ###CUSTOM_ADMIN_DIPLAY_METHOD### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view); + // set document details + $this->setPrepareDocument($view); + // ###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view); + // ###CUSTOM_ADMIN_CODE_BODY### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CODE_BODY###'] = $this->setCustomViewCodeBody($view); + // ###CUSTOM_ADMIN_BODY### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BODY###'] = $this->setCustomViewBody($view); + // ###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT### <<>> + $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] = $this->setCustomViewSubmitButtonScript($view); + + // setup the templates + $this->setCustomViewTemplateBody($view); + } + + // setup the layouts + $this->setCustomViewLayouts(); + } + + // ###VIEWARRAY### + $this->fileContentStatic['###VIEWARRAY###'] = "\n".implode(",\n",$viewarray); + + // ###CUSTOM_ADMIN_EDIT_VIEW_ARRAY### + $this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = "\n".implode(",\n",$site_edit_view_array); + + // ###MAINMENUS### + $this->fileContentStatic['###MAINMENUS###'] = $this->setMainMenus(); + + // ###SUBMENU### + $this->fileContentStatic['###SUBMENU###'] = $this->setSubMenus(); + + // ###GET_CRYPT_KEY### + $this->fileContentStatic['###GET_CRYPT_KEY###'] = $this->setGetCryptKey(); + + // set the license locker + $this->setLockLicense(); + + // ###CONTRIBUTORS### + $this->fileContentStatic['###CONTRIBUTORS###'] = $this->theContributors; + + // ###INSTALL### + $this->fileContentStatic['###INSTALL###'] = $this->setInstall(); + + // ###UNINSTALL### + $this->fileContentStatic['###UNINSTALL###'] = $this->setUninstall(); + + // ###DASHBOARDICONS### + $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONS###'] = $this->setDashboardIcons(); + + // ###DASHBOARDICONACCESS### + $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONACCESS###'] = $this->setDashboardIconAccess(); + + // ###DASH_MODEL_METHODS### + $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_MODEL_METHODS###'] = $this->setDashboardModelMethods(); + + // ###DASH_GET_CUSTOM_DATA### + $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_GET_CUSTOM_DATA###'] = $this->setDashboardGetCustomData(); + + // ###DASH_DISPLAY_DATA### + $this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_DISPLAY_DATA###'] = $this->setDashboardDisplayData(); + + // add import + if (isset($this->addEximport) && $this->addEximport) + { + // setup import files + $target = array('admin' => 'import'); + $this->buildDynamique($target,'import'); + // set the controller + $this->fileContentDynamic['import']['###BLABLABLA###'] = ''; + } + + // ensure that the ajax model and controller is set if needed + if (isset($this->addAjax) && $this->addAjax) + { + // setup Ajax files + $target = array('admin' => 'ajax'); + $this->buildDynamique($target,'ajax'); + // set the controller + $this->fileContentDynamic['ajax']['###REGISTER_AJAX_TASK###'] = $this->setRegisterAjaxTask('admin'); + $this->fileContentDynamic['ajax']['###AJAX_INPUT_RETURN###'] = $this->setAjaxInputReturn('admin'); + // set the module + $this->fileContentDynamic['ajax']['###AJAX_MODEL_METHODS###'] = $this->setAjaxModelMethods('admin'); + } + + // ensure that the site ajax model and controller is set if needed + if (isset($this->addSiteAjax) && $this->addSiteAjax) + { + // setup Ajax files + $target = array('site' => 'ajax'); + $this->buildDynamique($target,'ajax'); + // set the controller + $this->fileContentDynamic['ajax']['###REGISTER_SITE_AJAX_TASK###'] = $this->setRegisterAjaxTask('site' ); + $this->fileContentDynamic['ajax']['###AJAX_SITE_INPUT_RETURN###'] = $this->setAjaxInputReturn('site' ); + // set the module + $this->fileContentDynamic['ajax']['###AJAX_SITE_MODEL_METHODS###'] = $this->setAjaxModelMethods('site'); + } + + // run the second run if needed + if (isset($this->secondRunAdmin) && ComponentbuilderHelper::checkArray($this->secondRunAdmin)) + { + // start dynamic build + foreach ($this->secondRunAdmin as $function => $arrays) + { + if (ComponentbuilderHelper::checkArray($arrays) && ComponentbuilderHelper::checkString($function)) + { + foreach ($arrays as $array) + { + $this->{$function}($array); + } + } + } + + } + + // ###CONFIG_FIELDSETS### + $keepLang = $this->lang; + $this->lang = 'admin'; + // run field sets for second time + $this->setConfigFieldsets(2); + $this->lang = $keepLang; // setup front-views and all needed stuff for the site if (isset($this->componentData->site_views) && ComponentbuilderHelper::checkArray($this->componentData->site_views)) diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 99ee1a01c..5eec5fe24 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index 8295f056f..696589993 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index aa57cf6a3..3d4ac2318 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index 6ec9f0587..f1c8b388d 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 2cf6e34a9..0285ffe00 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage minify.php diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini index a3867b94f..bf2653cce 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -64,6 +64,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL="Add New Button" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS="Addpermissions" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION="Set permissions for this view" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_SELECT="Add" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADDRESS="Address" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES="Addtables" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS="Addtabs" @@ -73,6 +74,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW="Add Css View" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS="Add Css Views" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS_LABEL="Add CSS (views)" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW_LABEL="Add CSS (view)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON="Add Custom Button" +COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL="Add Custom Button" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT="Add Custom Import" COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION="Override the default import methods." COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL="Add Custom Import" @@ -130,12 +133,66 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ALIGNMENT_DESCRIPTION="Select the field alignmen COM_COMPONENTBUILDER_ADMIN_VIEW_ALIGNMENT_LABEL="Alignment" COM_COMPONENTBUILDER_ADMIN_VIEW_ALNUM="ALNUM" COM_COMPONENTBUILDER_ADMIN_VIEW_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST="Any Selection (only 4 list/radio/checkboxes/dynamic_list)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="Archive" COM_COMPONENTBUILDER_ADMIN_VIEW_ARRAY="ARRAY" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN="Arrow Down" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN_FOUR="Arrow Down 4" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN_THREE="Arrow Down 3" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN_TWO="Arrow Down 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_FIRST="Arrow First" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LAST="Arrow Last" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LEFT="Arrow Left" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LEFT_FOUR="Arrow Left 4" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LEFT_THREE="Arrow Left 3" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LEFT_TWO="Arrow Left 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_RIGHT="Arrow Right" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_RIGHT_FOUR="Arrow Right 4" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_RIGHT_THREE="Arrow Right 3" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_RIGHT_TWO="Arrow Right 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP="Arrow Up" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_FOUR="Arrow Up 4" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_THREE="Arrow Up 3" +COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_TWO="Arrow Up 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_ATTACHMENT="Attachment" +COM_COMPONENTBUILDER_ADMIN_VIEW_BACKWARD_CIRCLE="Backward Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_BAN_CIRCLE="Ban Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_BARS="Bars" COM_COMPONENTBUILDER_ADMIN_VIEW_BASESIXTY_FOUR="BASE64" +COM_COMPONENTBUILDER_ADMIN_VIEW_BASKET="Basket" +COM_COMPONENTBUILDER_ADMIN_VIEW_BOOK="Book" +COM_COMPONENTBUILDER_ADMIN_VIEW_BOOKMARK="Bookmark" +COM_COMPONENTBUILDER_ADMIN_VIEW_BOOKMARK_TWO="Bookmark 2" COM_COMPONENTBUILDER_ADMIN_VIEW_BOOLEAN="BOOLEAN" COM_COMPONENTBUILDER_ADMIN_VIEW_BOTH="Both" +COM_COMPONENTBUILDER_ADMIN_VIEW_BOX_ADD="Box Add" +COM_COMPONENTBUILDER_ADMIN_VIEW_BOX_REMOVE="Box Remove" +COM_COMPONENTBUILDER_ADMIN_VIEW_BRIEFCASE="Briefcase" +COM_COMPONENTBUILDER_ADMIN_VIEW_BRUSH="Brush" +COM_COMPONENTBUILDER_ADMIN_VIEW_BUBBLE_QUOTE="Bubble Quote" +COM_COMPONENTBUILDER_ADMIN_VIEW_CALENDAR="Calendar" +COM_COMPONENTBUILDER_ADMIN_VIEW_CALENDAR_THREE="Calendar 3" +COM_COMPONENTBUILDER_ADMIN_VIEW_CALENDAR_TWO="Calendar 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_CAMERA="Camera" +COM_COMPONENTBUILDER_ADMIN_VIEW_CAMERA_TWO_VIDEO="Camera 2 / Video" +COM_COMPONENTBUILDER_ADMIN_VIEW_CANCEL_CIRCLE="Cancel Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_CART="Cart" COM_COMPONENTBUILDER_ADMIN_VIEW_CHAIN="Chain" +COM_COMPONENTBUILDER_ADMIN_VIEW_CHART="Chart" +COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKBOX="Checkbox" +COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKBOX_PARTIAL="Checkbox Partial" +COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKBOX_UNCHECKED="Checkbox Unchecked" +COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKMARK_CIRCLE="Checkmark Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKMARK_TWO="Checkmark 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_CIRCLE="Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_CLOCK="Clock" COM_COMPONENTBUILDER_ADMIN_VIEW_CMD="CMD" +COM_COMPONENTBUILDER_ADMIN_VIEW_COG="Cog" +COM_COMPONENTBUILDER_ADMIN_VIEW_COGS="Cogs" +COM_COMPONENTBUILDER_ADMIN_VIEW_COMMENT="Comment" +COM_COMPONENTBUILDER_ADMIN_VIEW_COMMENTS_TWO="Comments 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_COMPASS="Compass" +COM_COMPONENTBUILDER_ADMIN_VIEW_CONTRACT="Contract" +COM_COMPONENTBUILDER_ADMIN_VIEW_CONTRACT_TWO="Contract 2" COM_COMPONENTBUILDER_ADMIN_VIEW_CORECREATE="core.create" COM_COMPONENTBUILDER_ADMIN_VIEW_COREDELETE="core.delete" COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDIT="core.edit" @@ -147,6 +204,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Admi COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created By" COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date this Admin View was created." COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL="Created Date" +COM_COMPONENTBUILDER_ADMIN_VIEW_CREDIT="Credit" +COM_COMPONENTBUILDER_ADMIN_VIEW_CREDIT_TWO="Credit 2" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS="CSS" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW="Css View" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS="Css Views" @@ -156,29 +215,79 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_LABEL="CSS" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_DESCRIPTION="Add your CSS here! [Do not add the style tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_HINT="// CSS for the edit view" COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_LABEL="CSS" +COM_COMPONENTBUILDER_ADMIN_VIEW_CUBE="Cube" +COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON="Custom Button" +COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTONS="Custom Buttons" +COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_SELECT="Add" COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import" +COM_COMPONENTBUILDER_ADMIN_VIEW_DASHBOARD="Dashboard" +COM_COMPONENTBUILDER_ADMIN_VIEW_DATABASE="Database" +COM_COMPONENTBUILDER_ADMIN_VIEW_DELETE="Delete" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION="Add Description Here" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT="Add Description Here" COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_LABEL="Description" +COM_COMPONENTBUILDER_ADMIN_VIEW_DOWNLOAD="Download" COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP="Dump" COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT="Editing the Admin View" +COM_COMPONENTBUILDER_ADMIN_VIEW_ENTER="Enter" +COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE="Envelope" +COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE_OPENED="Envelope Opened" +COM_COMPONENTBUILDER_ADMIN_VIEW_EQUALIZER="Equalizer" COM_COMPONENTBUILDER_ADMIN_VIEW_ERROR_UNIQUE_ALIAS="Another Admin View has the same alias." COM_COMPONENTBUILDER_ADMIN_VIEW_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD="Exact Length (only 4 text_field)" +COM_COMPONENTBUILDER_ADMIN_VIEW_EXIT="Exit" +COM_COMPONENTBUILDER_ADMIN_VIEW_EXPAND="Expand" +COM_COMPONENTBUILDER_ADMIN_VIEW_EXPAND_TWO="Expand 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_EXPIRED="Expired" +COM_COMPONENTBUILDER_ADMIN_VIEW_EYE_CLOSE="Eye Close" +COM_COMPONENTBUILDER_ADMIN_VIEW_EYE_OPEN="Eye Open" +COM_COMPONENTBUILDER_ADMIN_VIEW_FEATURED="Featured" +COM_COMPONENTBUILDER_ADMIN_VIEW_FEED="Feed" COM_COMPONENTBUILDER_ADMIN_VIEW_FIELD="Field" COM_COMPONENTBUILDER_ADMIN_VIEW_FIELDS="Fields" COM_COMPONENTBUILDER_ADMIN_VIEW_FIELD_DESCRIPTION="Select a field" COM_COMPONENTBUILDER_ADMIN_VIEW_FIELD_LABEL="Field" +COM_COMPONENTBUILDER_ADMIN_VIEW_FILE="File" +COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_ADD="File Add" +COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_CHECK="File Check" +COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_MINUS="File Minus" +COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_REMOVE="File Remove" +COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_TWO="File 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_FILTER="Filter" COM_COMPONENTBUILDER_ADMIN_VIEW_FILTER_DESCRIPTION="Select if the field is to be used as a filter in list view, if shown." COM_COMPONENTBUILDER_ADMIN_VIEW_FILTER_LABEL="Filter" +COM_COMPONENTBUILDER_ADMIN_VIEW_FIRST="First" +COM_COMPONENTBUILDER_ADMIN_VIEW_FLAG="Flag" +COM_COMPONENTBUILDER_ADMIN_VIEW_FLAG_THREE="Flag 3" +COM_COMPONENTBUILDER_ADMIN_VIEW_FLASH="Flash" COM_COMPONENTBUILDER_ADMIN_VIEW_FLOAT="FLOAT" +COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_CLOSE="Folder Close" +COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_MINUS="Folder Minus" +COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_OPEN="Folder Open" +COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_PLUS="Folder Plus" +COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_PLUS_TWO="Folder Plus 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_REMOVE="Folder Remove" +COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_THREE="Folder 3" +COM_COMPONENTBUILDER_ADMIN_VIEW_FORWARD_CIRCLE="Forward Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_FORWARD_TWO="Forward 2" COM_COMPONENTBUILDER_ADMIN_VIEW_FULL_WIDTH_IN_TAB="Full Width in Tab" +COM_COMPONENTBUILDER_ADMIN_VIEW_GENERIC="Generic" +COM_COMPONENTBUILDER_ADMIN_VIEW_GRID="Grid" +COM_COMPONENTBUILDER_ADMIN_VIEW_GRID_TWO="Grid 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_HEALTH="Health" +COM_COMPONENTBUILDER_ADMIN_VIEW_HEART="Heart" +COM_COMPONENTBUILDER_ADMIN_VIEW_HEART_TWO="Heart 2" COM_COMPONENTBUILDER_ADMIN_VIEW_HIDE="Hide" +COM_COMPONENTBUILDER_ADMIN_VIEW_HOME="Home" +COM_COMPONENTBUILDER_ADMIN_VIEW_HOME_TWO="Home 2" COM_COMPONENTBUILDER_ADMIN_VIEW_HTML="HTML" COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW="Html Import View" COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION="Add your HTML & PHP here! [Use for PHP]" COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT="// The HTML for the view of your custom import method." COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL="HTML & PHP (view)" +COM_COMPONENTBUILDER_ADMIN_VIEW_ICOMOON_DESCRIPTION="Joomla Standard Icomoon Fonts" +COM_COMPONENTBUILDER_ADMIN_VIEW_ICOMOON_LABEL="Icon" COM_COMPONENTBUILDER_ADMIN_VIEW_ICON="Icon" COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD="Icon Add" COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION="Must be 128px x 128px and a png format.." @@ -189,8 +298,12 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_CATEGORY_LABEL="Category Icon" COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION="Must be 128px x 128px and a png format." COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_LABEL="Icon" COM_COMPONENTBUILDER_ADMIN_VIEW_ID="Id" +COM_COMPONENTBUILDER_ADMIN_VIEW_IMAGE="Image" +COM_COMPONENTBUILDER_ADMIN_VIEW_IMAGES="Images" COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION="Select applicable implementation." COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL="Implementation" +COM_COMPONENTBUILDER_ADMIN_VIEW_INFO="Info" +COM_COMPONENTBUILDER_ADMIN_VIEW_INFO_CIRCLE="Info Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_DESCRIPTION="Enter default input value" COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_HINT="Default Value Here" COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_LABEL="Default" @@ -219,6 +332,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER="Javascript View Footer" COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_HINT="// JavaScript for the edit view that is loaded in the footer inside script tags" COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript" +COM_COMPONENTBUILDER_ADMIN_VIEW_JOOMLA="Joomla" +COM_COMPONENTBUILDER_ADMIN_VIEW_KEY="Key" COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION="The key to use to link the child view." COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT="country" COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key" @@ -226,12 +341,20 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_WORD_ALL_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIEL COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_WORD_ALL_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word All case-sensitive (only 4 text_field)" COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word Any case-insensitive (only 4 text_field)" COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word Any case-sensitive (only 4 text_field)" +COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp" +COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last" COM_COMPONENTBUILDER_ADMIN_VIEW_LEFT_IN_TAB="Left in Tab" COM_COMPONENTBUILDER_ADMIN_VIEW_LEFT_OF_TABS="Left of Tabs" +COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK_DESCRIPTION="Select if the field is to be used as a link to a single record, if shown." COM_COMPONENTBUILDER_ADMIN_VIEW_LINK_LABEL="Link" +COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_DESCRIPTION="Select if the field it to show in the list view." COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_LABEL="Admin List" +COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location" +COM_COMPONENTBUILDER_ADMIN_VIEW_LOCK="Lock" +COM_COMPONENTBUILDER_ADMIN_VIEW_LOOP="Loop" COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_BEHAVIOR_DESCRIPTION="Select the match behavior." COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_BEHAVIOR_LABEL="Match Behavior" COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_FIELD="Match Field" @@ -240,14 +363,25 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_FIELD_LABEL="Match Field" COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_OPTIONS_HINT="Options here" COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_OPTIONS_LABEL="Match Options" COM_COMPONENTBUILDER_ADMIN_VIEW_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD="Max Length (only 4 text_field)" +COM_COMPONENTBUILDER_ADMIN_VIEW_MENU="Menu" +COM_COMPONENTBUILDER_ADMIN_VIEW_MENU_THREE="Menu 3" +COM_COMPONENTBUILDER_ADMIN_VIEW_MENU_TWO="Menu 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_DESCRIPTION="Add Controller Method Name Here" +COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_HINT="methodName" +COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_LABEL="Target Controller Method" COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_DESCRIPTION="Enter method name." COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_HINT="Method Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_LABEL="Method Name" +COM_COMPONENTBUILDER_ADMIN_VIEW_MINUS="Minus" +COM_COMPONENTBUILDER_ADMIN_VIEW_MINUS_SIGN="Minus Sign" COM_COMPONENTBUILDER_ADMIN_VIEW_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)" +COM_COMPONENTBUILDER_ADMIN_VIEW_MOBILE="Mobile" COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_DESC="The last user that modified this Admin View." COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_LABEL="Modified By" COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Admin View was modified." COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date" +COM_COMPONENTBUILDER_ADMIN_VIEW_MOVE="Move" +COM_COMPONENTBUILDER_ADMIN_VIEW_MUSIC="Music" COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL="MySQL" COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION="Enter Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT="Name Here" @@ -261,6 +395,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_DESCRIPTION="Type null if single rec COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_HINT="Single Record Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL="Name (single record)" COM_COMPONENTBUILDER_ADMIN_VIEW_NEW="A New Admin View" +COM_COMPONENTBUILDER_ADMIN_VIEW_NEW_TAB="New Tab" +COM_COMPONENTBUILDER_ADMIN_VIEW_NEW_TAB_TWO="New Tab 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_NEXT="Next" COM_COMPONENTBUILDER_ADMIN_VIEW_NO="No" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION="

The scripts that are automatic added to the input fields below is identical to the default import scripts used. Adapt them to your own custom needs.

" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL="Advanced notice." @@ -274,19 +411,32 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION="If no tabs has been se COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL="Tab Setup Options" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_VIEWS_DESCRIPTION="id, asset_id, state, access, ordering, created_by, date_created, modified_by, date_modified, checked_out, checked_out_time, version, hits, metakey, metadesc, metadata (you don't need to add them again)" COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_VIEWS_LABEL="The following fields are added by default to all views" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION="Notification" +COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION_CIRCLE="Notification Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_NOT_REQUIRED="Not Required" COM_COMPONENTBUILDER_ADMIN_VIEW_ORDERING_LABEL="Ordering" COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_EDIT_DESCRIPTION="Order in relation to tab & alignment of admin and site." COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_EDIT_LABEL="Order in Edit" COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_LIST_DESCRIPTION="Ordering in relation to list view of admin and site" COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_LIST_LABEL="Order in list views" +COM_COMPONENTBUILDER_ADMIN_VIEW_PALETTE="Palette" +COM_COMPONENTBUILDER_ADMIN_VIEW_PARAGRAPH_CENTER="Paragraph Center" +COM_COMPONENTBUILDER_ADMIN_VIEW_PARAGRAPH_JUSTIFY="Paragraph Justify" +COM_COMPONENTBUILDER_ADMIN_VIEW_PARAGRAPH_LEFT="Paragraph Left" +COM_COMPONENTBUILDER_ADMIN_VIEW_PARAGRAPH_RIGHT="Paragraph Right" COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_DESCRIPTION="The key to use to link the parent view." COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT="id" COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_LABEL="Parent Key" COM_COMPONENTBUILDER_ADMIN_VIEW_PATH="PATH" +COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE="Pause" +COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE_CIRCLE="Pause Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL="Pencil" +COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL_TWO="Pencil 2" COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION="Permissions" COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION_DESCRIPTION="Should permission be used." COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION_LABEL="Permissions" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP="PHP" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE="Php After Delete" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION="Add your PHP here! [Do not add the php tags]" @@ -320,6 +470,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH="Php Before Publish" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_HINT="// PHP Here that should run in the publish Method before items published state is changed. Array $pks is an array of record primary keys and $value is the published state." COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL="PHP" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER="Php Controller" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LABEL="PHP (controller methods)" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT="Php Document" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="PHP script to the document method." COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT="// add custom PHP script to the document method." @@ -356,6 +510,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA="Php Import Setdata" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT="// PHP Here that should run in the setData Method, $package,$table,$target_headers" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL="setData Method PHP" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL="Php Model" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION="Add your PHP here! [Do not add the php tags]" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_HINT="// PHP methods for the model that the controller will use" +COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL="PHP (model methods)" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK="Php Postsavehook" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_HINT="// PHP Here that should run in the postSaveHook Method (object) $model is the data model object and (array) $validData is the validated data." @@ -364,22 +522,58 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE="Php Save" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_HINT="// PHP Here that should run in the save Method (array) $data is where all values are" COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_LABEL="PHP" +COM_COMPONENTBUILDER_ADMIN_VIEW_PIE="Pie" +COM_COMPONENTBUILDER_ADMIN_VIEW_PIN="Pin" +COM_COMPONENTBUILDER_ADMIN_VIEW_PLAY="Play" +COM_COMPONENTBUILDER_ADMIN_VIEW_PLAY_CIRCLE="Play Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_PLUS="Plus" +COM_COMPONENTBUILDER_ADMIN_VIEW_PLUS_CIRCLE="Plus Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_POWER_CORD="Power Cord" +COM_COMPONENTBUILDER_ADMIN_VIEW_PREVIOUS="Previous" +COM_COMPONENTBUILDER_ADMIN_VIEW_PRINT="Print" +COM_COMPONENTBUILDER_ADMIN_VIEW_PUBLISH="Publish" COM_COMPONENTBUILDER_ADMIN_VIEW_PUBLISHING="Publishing" +COM_COMPONENTBUILDER_ADMIN_VIEW_PURGE="Purge" +COM_COMPONENTBUILDER_ADMIN_VIEW_PUZZLE="Puzzle" +COM_COMPONENTBUILDER_ADMIN_VIEW_QUESTION="Question" +COM_COMPONENTBUILDER_ADMIN_VIEW_QUESTION_TWO="Question 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_QUOTES_LEFT="Quotes Left" +COM_COMPONENTBUILDER_ADMIN_VIEW_QUOTES_RIGHT="Quotes Right" +COM_COMPONENTBUILDER_ADMIN_VIEW_RADIO_UNCHECKED="Radio Unchecked" COM_COMPONENTBUILDER_ADMIN_VIEW_RAW="RAW" COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY="readonly" COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE="read/write" COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE="Remove" +COM_COMPONENTBUILDER_ADMIN_VIEW_REPLY="Reply" COM_COMPONENTBUILDER_ADMIN_VIEW_RIGHT_IN_TAB="Right in Tab" COM_COMPONENTBUILDER_ADMIN_VIEW_RIGHT_OF_TABS="Right of Tabs" +COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_COPY="Save Copy" +COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_NEW="Save New" COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Admin View to customise the alias." +COM_COMPONENTBUILDER_ADMIN_VIEW_SCISSORS="Scissors" +COM_COMPONENTBUILDER_ADMIN_VIEW_SCREEN="Screen" +COM_COMPONENTBUILDER_ADMIN_VIEW_SCREWDRIVER="Screwdriver" +COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH="Search" COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH_DESCRIPTION="Select if the field is to be searchable in list view, if shown." COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH_LABEL="Searchable" COM_COMPONENTBUILDER_ADMIN_VIEW_SETTINGS="Settings" +COM_COMPONENTBUILDER_ADMIN_VIEW_SHARE="Share" +COM_COMPONENTBUILDER_ADMIN_VIEW_SHARE_ALT="Share Alt" +COM_COMPONENTBUILDER_ADMIN_VIEW_SHIELD="Shield" COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION="Short Description" COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_DESCRIPTION="Enter short description" COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT="Your Short Description Here" COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_LABEL="Short Description" COM_COMPONENTBUILDER_ADMIN_VIEW_SHOW="Show" +COM_COMPONENTBUILDER_ADMIN_VIEW_SHUFFLE="Shuffle" +COM_COMPONENTBUILDER_ADMIN_VIEW_SIGNUP="Signup" +COM_COMPONENTBUILDER_ADMIN_VIEW_SINGLE="Single" +COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY="Smiley" +COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL="Smiley Neutral" +COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL_TWO="Smiley Neutral 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_SAD="Smiley Sad" +COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_SAD_TWO="Smiley Sad 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_TWO="Smiley 2" COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_DESCRIPTION="Select if the field it to be sortable in list view, if shown." COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_LABEL="Sortable" COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCE="Source" @@ -391,41 +585,70 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_SQL="Sql" COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_DESCRIPTION="Add your MySQL here!" COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT="// Add MySQL Table Dump Here" COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_LABEL="MySQL" +COM_COMPONENTBUILDER_ADMIN_VIEW_SQUARE="Square" +COM_COMPONENTBUILDER_ADMIN_VIEW_STACK="Stack" +COM_COMPONENTBUILDER_ADMIN_VIEW_STAR_TWO="Star 2" COM_COMPONENTBUILDER_ADMIN_VIEW_STATUS="Status" +COM_COMPONENTBUILDER_ADMIN_VIEW_STOP="Stop" +COM_COMPONENTBUILDER_ADMIN_VIEW_STOP_CIRCLE="Stop Circle" COM_COMPONENTBUILDER_ADMIN_VIEW_STRING="STRING" +COM_COMPONENTBUILDER_ADMIN_VIEW_SUPPORT="Support" +COM_COMPONENTBUILDER_ADMIN_VIEW_SWITCH="Switch" COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME="System Name" COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_DESCRIPTION="Used only in the system." COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_HINT="The System Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL="System Name" COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE="Table" +COM_COMPONENTBUILDER_ADMIN_VIEW_TABLET="Tablet" COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL="Select a Table" COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION="Select the tab this field belongs to." COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_LABEL="Tab" +COM_COMPONENTBUILDER_ADMIN_VIEW_TAG="Tag" +COM_COMPONENTBUILDER_ADMIN_VIEW_TAGS="Tags" +COM_COMPONENTBUILDER_ADMIN_VIEW_TAGS_TWO="Tags 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_TAG_TWO="Tag 2" COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_BEHAVIOR_DESCRIPTION="Select the target field/s behavior." COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_BEHAVIOR_LABEL="Target Behavior" +COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_DESCRIPTION="Set the target view type" COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_FIELD="Target Field" COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_FIELD_DESCRIPTION="Select the target field/s." COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_FIELD_LABEL="Target Field/s" +COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_LABEL="Target" COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_RELATION_DESCRIPTION="Select the target field/s relation to other of the same target field/s." COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_RELATION_LABEL="Target Relation" COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_DESCRIPTION="Enter Task Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_HINT="Task Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_LABEL="Task Name" +COM_COMPONENTBUILDER_ADMIN_VIEW_THUMBS_DOWN="Thumbs Down" +COM_COMPONENTBUILDER_ADMIN_VIEW_THUMBS_UP="Thumbs Up" COM_COMPONENTBUILDER_ADMIN_VIEW_TITLE_DESCRIPTION="Select if the field is the title field." COM_COMPONENTBUILDER_ADMIN_VIEW_TITLE_LABEL="Title" +COM_COMPONENTBUILDER_ADMIN_VIEW_TREE="Tree" +COM_COMPONENTBUILDER_ADMIN_VIEW_TREE_TWO="Tree 2" COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE="Type" COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="Set the type of view" COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL="Type" COM_COMPONENTBUILDER_ADMIN_VIEW_UINT="UINT" COM_COMPONENTBUILDER_ADMIN_VIEW_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)" +COM_COMPONENTBUILDER_ADMIN_VIEW_UNARCHIVE="Unarchive" +COM_COMPONENTBUILDER_ADMIN_VIEW_UNBLOCK="Unblock" COM_COMPONENTBUILDER_ADMIN_VIEW_UNDERNEATH_TABS="Underneath Tabs" +COM_COMPONENTBUILDER_ADMIN_VIEW_UNDO="Undo" +COM_COMPONENTBUILDER_ADMIN_VIEW_UNDO_TWO="Undo 2" +COM_COMPONENTBUILDER_ADMIN_VIEW_UNFEATURED="Unfeatured" COM_COMPONENTBUILDER_ADMIN_VIEW_UNKNOWN="unknown" +COM_COMPONENTBUILDER_ADMIN_VIEW_UNLOCK="Unlock" +COM_COMPONENTBUILDER_ADMIN_VIEW_UNPUBLISH="Unpublish" +COM_COMPONENTBUILDER_ADMIN_VIEW_UPLOAD="Upload" +COM_COMPONENTBUILDER_ADMIN_VIEW_USER="User" COM_COMPONENTBUILDER_ADMIN_VIEW_USERNAME="USERNAME" +COM_COMPONENTBUILDER_ADMIN_VIEW_USERS="Users" COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_DESCRIPTION="Allow only users." COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_LABEL="User Check" COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_DESCRIPTION="Enter Value Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_HINT="Value Name Here" COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_LABEL="Value Name" +COM_COMPONENTBUILDER_ADMIN_VIEW_VCARD="Vcard" COM_COMPONENTBUILDER_ADMIN_VIEW_VERSION_DESC="A count of the number of times this Admin View has been revised." COM_COMPONENTBUILDER_ADMIN_VIEW_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWACCESS="view.access" @@ -436,8 +659,16 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED="view.edit.created" COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED_BY="view.edit.created_by" COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITOWN="view.edit.own" COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITSTATE="view.edit.state" +COM_COMPONENTBUILDER_ADMIN_VIEW_WAND="Wand" +COM_COMPONENTBUILDER_ADMIN_VIEW_WARNING="Warning" +COM_COMPONENTBUILDER_ADMIN_VIEW_WARNING_CIRCLE="Warning Circle" +COM_COMPONENTBUILDER_ADMIN_VIEW_WIFI="Wifi" COM_COMPONENTBUILDER_ADMIN_VIEW_WORD="WORD" +COM_COMPONENTBUILDER_ADMIN_VIEW_WRENCH="Wrench" COM_COMPONENTBUILDER_ADMIN_VIEW_YES="Yes" +COM_COMPONENTBUILDER_ADMIN_VIEW_YOUTUBE="Youtube" +COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_IN="Zoom In" +COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_OUT="Zoom Out" COM_COMPONENTBUILDER_AUTHOR="Author" COM_COMPONENTBUILDER_BACK="Back" COM_COMPONENTBUILDER_COMPONENT="Component" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 786f7cf32..88247e2f3 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage css_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php new file mode 100644 index 000000000..229158a46 --- /dev/null +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -0,0 +1,50 @@ + + @my wife Roline van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'php_controller', + 'php_model' +); + +?> +
+ +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+ +
diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php new file mode 100644 index 000000000..1b140f4bc --- /dev/null +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -0,0 +1,56 @@ + + @my wife Roline van der Merwe + @copyright Copyright (C) 2015. All Rights Reserved + @license GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + + Builds Complex Joomla Components + +/-----------------------------------------------------------------------------------------------------------------------------*/ + +// No direct access to this file + +defined('_JEXEC') or die('Restricted access'); + +$form = $displayData->getForm(); + +$fields = $displayData->get('fields') ?: array( + 'add_custom_button', + 'custom_button' +); + +$hiddenFields = $displayData->get('hidden_fields') ?: array(); + +foreach ($fields as $field) +{ + $field = is_array($field) ? $field : array($field); + foreach ($field as $f) + { + if ($form->getField($f)) + { + if (in_array($f, $hiddenFields)) + { + $form->setFieldAttribute($f, 'type', 'hidden'); + } + + echo $form->renderField($f); + break; + } + } +} diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index 78f14719c..720b715e5 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index 6d38e6c79..0b84c112e 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vxifields; +$items = $displayData->vxkfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 48cbc8e6d..14f87517d 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 486ee637c..53927af3b 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php index 3d0c55ee9..56ea54394 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage mysql_left.php diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php index 681858af4..32950b33e 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index f960c5308..1ea8814d0 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index 3a5726f34..a6afee3ac 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index 7d66ad287..46d5f9a8d 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index a9482526e..96da734a1 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 9aa8b0dda..7f8e6f708 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/component/admin_views_fullwidth.php b/admin/layouts/component/admin_views_fullwidth.php index 58153ad2c..15e679467 100644 --- a/admin/layouts/component/admin_views_fullwidth.php +++ b/admin/layouts/component/admin_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php index 44f42f7b1..118bf2f85 100644 --- a/admin/layouts/component/details_above.php +++ b/admin/layouts/component/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/component/details_left.php b/admin/layouts/component/details_left.php index 12158c12a..ed541b551 100644 --- a/admin/layouts/component/details_left.php +++ b/admin/layouts/component/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/component/details_right.php b/admin/layouts/component/details_right.php index ea7c44d89..262cba203 100644 --- a/admin/layouts/component/details_right.php +++ b/admin/layouts/component/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/component/details_under.php b/admin/layouts/component/details_under.php index fb01be66c..7d4fe5f8d 100644 --- a/admin/layouts/component/details_under.php +++ b/admin/layouts/component/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/component/ftp_servers_fullwidth.php b/admin/layouts/component/ftp_servers_fullwidth.php index 5b3dd31ac..65bab6e6e 100644 --- a/admin/layouts/component/ftp_servers_fullwidth.php +++ b/admin/layouts/component/ftp_servers_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage ftp_servers_fullwidth.php diff --git a/admin/layouts/component/publishing.php b/admin/layouts/component/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/component/publishing.php +++ b/admin/layouts/component/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/component/publlshing.php b/admin/layouts/component/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/component/publlshing.php +++ b/admin/layouts/component/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/component/readme_left.php b/admin/layouts/component/readme_left.php index ad858e19f..33bf95b31 100644 --- a/admin/layouts/component/readme_left.php +++ b/admin/layouts/component/readme_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/component/readme_right.php b/admin/layouts/component/readme_right.php index f171ba0d3..14d460337 100644 --- a/admin/layouts/component/readme_right.php +++ b/admin/layouts/component/readme_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/component/scripts_fullwidth.php b/admin/layouts/component/scripts_fullwidth.php index 07fc991ae..5c374d106 100644 --- a/admin/layouts/component/scripts_fullwidth.php +++ b/admin/layouts/component/scripts_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_fullwidth.php diff --git a/admin/layouts/component/settings_left.php b/admin/layouts/component/settings_left.php index 0252cc23e..73011daf6 100644 --- a/admin/layouts/component/settings_left.php +++ b/admin/layouts/component/settings_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php index c5e10c026..f50c43197 100644 --- a/admin/layouts/component/settings_right.php +++ b/admin/layouts/component/settings_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php index 9cb264378..6d5cdbde4 100644 --- a/admin/layouts/component/site_views_fullwidth.php +++ b/admin/layouts/component/site_views_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 83e6a1c5f..229158a46 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php index 866e5919d..1b140f4bc 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php index 155d4bd7f..2e9c4189e 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php index 44f42f7b1..118bf2f85 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php index d943c0f7c..7ed7b4040 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php index c12b749a1..27144420d 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php index 52517b5c9..f9c29cb59 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php index a7a796bc1..1963587c3 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php index fb01be66c..7d4fe5f8d 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php index ec1a924c2..33c9c2511 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage abacus_fullwidth.php diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php index dcb8be8c0..5c9a9d87e 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage abacus_left.php diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php index c78d6f33a..98a5a9e2e 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index 1df18cd85..758bccba9 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index ae88420c2..a2a4b8c42 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index a0594a505..b9eff633b 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index e4e45281f..f5e1cf834 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index 07a5d3793..4f83ee5b1 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php index b28cf6d30..43249048d 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php index 620e017ed..bbd8321e0 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php index dd0ec13bf..6886b04fd 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php index fb01be66c..7d4fe5f8d 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php index e87fb091d..561282419 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_left.php diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php index 547e7731a..936699449 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 526768f24..468260d9e 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php index feb1fd6d2..af4023bb4 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php index 31533618f..3d954e5b1 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php @@ -29,7 +29,7 @@ defined('_JEXEC') or die('Restricted access'); // set the defaults -$items = $displayData->vzefields; +$items = $displayData->vzgfields; $user = JFactory::getUser(); $id = $displayData->item->id; $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit"; diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php index fddb26263..6c520e083 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php index fd56a5ce9..82d8688e9 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php index 8121a85a2..ddc9f098e 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php index d6da82e12..f61e9ae57 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php index fb01be66c..7d4fe5f8d 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php index 372231deb..85b30d3fa 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 271ea7d53..32accdd0a 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php index 75999ea95..ff22057d5 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php index c12b749a1..27144420d 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php index 19ccea73e..2610cc559 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php index 555771167..aef856404 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php index fb01be66c..7d4fe5f8d 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php index ef260e8a6..a070704c3 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index 44f42f7b1..118bf2f85 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php index d943c0f7c..7ed7b4040 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php index c12b749a1..27144420d 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php index 19ccea73e..2610cc559 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php index a7a796bc1..1963587c3 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php index fb01be66c..7d4fe5f8d 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php index d5e7d821a..5e01fadb2 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 973801ad3..366491606 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php index 8d96c856c..822b5dd7e 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php index 80802f425..53d47622c 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php index 7ad74e969..728f9bea2 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php index 271ea7d53..32accdd0a 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php index 030fe4e33..39ca5b950 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php index c12b749a1..27144420d 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php index 19ccea73e..2610cc559 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php index 555771167..aef856404 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_rightside.php diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php index fb01be66c..7d4fe5f8d 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php index 908c70327..e6ac6b091 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php index d07806fff..fb2077af3 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 9c7677339..467b2f5d0 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -96,6 +96,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } + if (!empty($item->php_after_delete)) + { + // base64 Decode php_after_delete. + $item->php_after_delete = base64_decode($item->php_after_delete); + } + if (!empty($item->php_save)) { // base64 Decode php_save. @@ -108,12 +114,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_batchmove = base64_decode($item->php_batchmove); } - if (!empty($item->php_after_delete)) - { - // base64 Decode php_after_delete. - $item->php_after_delete = base64_decode($item->php_after_delete); - } - if (!empty($item->php_getitems_after_all)) { // base64 Decode php_getitems_after_all. @@ -138,6 +138,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_setdata = base64_decode($item->php_import_setdata); } + if (!empty($item->php_getitems)) + { + // base64 Decode php_getitems. + $item->php_getitems = base64_decode($item->php_getitems); + } + if (!empty($item->php_getlistquery)) { // base64 Decode php_getlistquery. @@ -228,18 +234,24 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->javascript_views_footer = base64_decode($item->javascript_views_footer); } + if (!empty($item->php_controller)) + { + // base64 Decode php_controller. + $item->php_controller = base64_decode($item->php_controller); + } + + if (!empty($item->php_model)) + { + // base64 Decode php_model. + $item->php_model = base64_decode($item->php_model); + } + if (!empty($item->php_ajaxmethod)) { // base64 Decode php_ajaxmethod. $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); } - if (!empty($item->php_getitem)) - { - // base64 Decode php_getitem. - $item->php_getitem = base64_decode($item->php_getitem); - } - if (!empty($item->html_import_view)) { // base64 Decode html_import_view. @@ -252,10 +264,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_save = base64_decode($item->php_import_save); } - if (!empty($item->php_getitems)) + if (!empty($item->php_getitem)) { - // base64 Decode php_getitems. - $item->php_getitems = base64_decode($item->php_getitems); + // base64 Decode php_getitem. + $item->php_getitem = base64_decode($item->php_getitem); } if (!empty($item->id)) @@ -274,7 +286,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxifields() + public function getVxkfields() { // Get the user object. $user = JFactory::getUser(); @@ -343,13 +355,13 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVxifields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVxkfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVxifields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVxkfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVxifields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVxkfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVxifields($item->store, 'store'); + $item->store = $this->selectionTranslationVxkfields($item->store, 'store'); } } @@ -384,7 +396,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVxifields($value,$name) + public function selectionTranslationVxkfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') @@ -1167,6 +1179,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['metadata'] = (string) $metadata; } + // Set the php_after_delete string to base64 string. + if (isset($data['php_after_delete'])) + { + $data['php_after_delete'] = base64_encode($data['php_after_delete']); + } + // Set the php_save string to base64 string. if (isset($data['php_save'])) { @@ -1179,12 +1197,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_batchmove'] = base64_encode($data['php_batchmove']); } - // Set the php_after_delete string to base64 string. - if (isset($data['php_after_delete'])) - { - $data['php_after_delete'] = base64_encode($data['php_after_delete']); - } - // Set the php_getitems_after_all string to base64 string. if (isset($data['php_getitems_after_all'])) { @@ -1209,6 +1221,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import_setdata'] = base64_encode($data['php_import_setdata']); } + // Set the php_getitems string to base64 string. + if (isset($data['php_getitems'])) + { + $data['php_getitems'] = base64_encode($data['php_getitems']); + } + // Set the php_getlistquery string to base64 string. if (isset($data['php_getlistquery'])) { @@ -1299,18 +1317,24 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); } + // Set the php_controller string to base64 string. + if (isset($data['php_controller'])) + { + $data['php_controller'] = base64_encode($data['php_controller']); + } + + // Set the php_model string to base64 string. + if (isset($data['php_model'])) + { + $data['php_model'] = base64_encode($data['php_model']); + } + // Set the php_ajaxmethod string to base64 string. if (isset($data['php_ajaxmethod'])) { $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); } - // Set the php_getitem string to base64 string. - if (isset($data['php_getitem'])) - { - $data['php_getitem'] = base64_encode($data['php_getitem']); - } - // Set the html_import_view string to base64 string. if (isset($data['html_import_view'])) { @@ -1323,10 +1347,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import_save'] = base64_encode($data['php_import_save']); } - // Set the php_getitems string to base64 string. - if (isset($data['php_getitems'])) + // Set the php_getitem string to base64 string. + if (isset($data['php_getitem'])) { - $data['php_getitems'] = base64_encode($data['php_getitems']); + $data['php_getitem'] = base64_encode($data['php_getitem']); } // Set the Params Items to data diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 7d1a9a587..71f53e523 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -263,12 +263,12 @@ class ComponentbuilderModelAdmin_views extends JModelList continue; } + // decode php_after_delete + $item->php_after_delete = base64_decode($item->php_after_delete); // decode php_save $item->php_save = base64_decode($item->php_save); // decode php_batchmove $item->php_batchmove = base64_decode($item->php_batchmove); - // decode php_after_delete - $item->php_after_delete = base64_decode($item->php_after_delete); // decode php_getitems_after_all $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); // decode php_allowedit @@ -277,6 +277,8 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_after_publish = base64_decode($item->php_after_publish); // decode php_import_setdata $item->php_import_setdata = base64_decode($item->php_import_setdata); + // decode php_getitems + $item->php_getitems = base64_decode($item->php_getitems); // decode php_getlistquery $item->php_getlistquery = base64_decode($item->php_getlistquery); // decode php_postsavehook @@ -307,16 +309,18 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->javascript_views_file = base64_decode($item->javascript_views_file); // decode javascript_views_footer $item->javascript_views_footer = base64_decode($item->javascript_views_footer); + // decode php_controller + $item->php_controller = base64_decode($item->php_controller); + // decode php_model + $item->php_model = base64_decode($item->php_model); // decode php_ajaxmethod $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); - // decode php_getitem - $item->php_getitem = base64_decode($item->php_getitem); // decode html_import_view $item->html_import_view = base64_decode($item->html_import_view); // decode php_import_save $item->php_import_save = base64_decode($item->php_import_save); - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); + // decode php_getitem + $item->php_getitem = base64_decode($item->php_getitem); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/models/ajax.php b/admin/models/ajax.php index e72f2e93b..1b78da473 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/compiler.php b/admin/models/compiler.php index aa211b997..5000519b0 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage compiler.php diff --git a/admin/models/component.php b/admin/models/component.php index 70a6d3af5..86c12a975 100644 --- a/admin/models/component.php +++ b/admin/models/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index cad5c345a..53937beeb 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/components.php b/admin/models/components.php index aff9d351c..d08285b57 100644 --- a/admin/models/components.php +++ b/admin/models/components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php index 66ffccdf4..df7a5bf9f 100644 --- a/admin/models/custom_admin_view.php +++ b/admin/models/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php index 0783ea477..63e2663db 100644 --- a/admin/models/custom_admin_views.php +++ b/admin/models/custom_admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views.php diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php index 1a128263a..926ee657d 100644 --- a/admin/models/dynamic_get.php +++ b/admin/models/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php index 6d7569983..95aabebb3 100644 --- a/admin/models/dynamic_gets.php +++ b/admin/models/dynamic_gets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_gets.php diff --git a/admin/models/field.php b/admin/models/field.php index e19ff918e..eb523b2f8 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/models/fields.php b/admin/models/fields.php index a382972a0..8a0a45634 100644 --- a/admin/models/fields.php +++ b/admin/models/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index e3bccc665..6d90f3408 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index c7ab8a3be..120d14f8d 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index cbfd4358c..e7e79ded7 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage customadminviews.php diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php index 83fe1d3c4..d6139cb67 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage customfilelist.php diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php index 035dbe3a9..afdb7306a 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage customfolderlist.php diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php index 7558b1375..c64904952 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage customgets.php diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php index 4402c1eb2..956fca441 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 562526783..7aab3e250 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamicgets.php diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php index 99da2eed3..7ad504689 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fields.php diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php index ecbd4b632..57c3e34c5 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldsmulti.php diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php index e21eefa6b..02c93e3a8 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index e6e1ecb89..70453c9bc 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index e1772bc92..42cad16fd 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage siteviews.php diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php index 13cb18049..fa234d20f 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php index 316f2acfa..bf8a1d386 100644 --- a/admin/models/fieldtype.php +++ b/admin/models/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php @@ -112,7 +112,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVzefields() + public function getVzgfields() { // Get the user object. $user = JFactory::getUser(); @@ -196,13 +196,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin foreach ($items as $nr => &$item) { // convert datatype - $item->datatype = $this->selectionTranslationVzefields($item->datatype, 'datatype'); + $item->datatype = $this->selectionTranslationVzgfields($item->datatype, 'datatype'); // convert indexes - $item->indexes = $this->selectionTranslationVzefields($item->indexes, 'indexes'); + $item->indexes = $this->selectionTranslationVzgfields($item->indexes, 'indexes'); // convert null_switch - $item->null_switch = $this->selectionTranslationVzefields($item->null_switch, 'null_switch'); + $item->null_switch = $this->selectionTranslationVzgfields($item->null_switch, 'null_switch'); // convert store - $item->store = $this->selectionTranslationVzefields($item->store, 'store'); + $item->store = $this->selectionTranslationVzgfields($item->store, 'store'); } } @@ -216,7 +216,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin * * @return translatable string */ - public function selectionTranslationVzefields($value,$name) + public function selectionTranslationVzgfields($value,$name) { // Array of datatype language strings if ($name == 'datatype') diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php index f33d54ca6..293d50ea1 100644 --- a/admin/models/fieldtypes.php +++ b/admin/models/fieldtypes.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 202e03cc8..c57bfab94 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -52,6 +52,8 @@ jform_vvvvvxivxe_required = false; jform_vvvvvxivxf_required = false; jform_vvvvvxivxg_required = false; jform_vvvvvxivxh_required = false; +jform_vvvvvxkvxi_required = false; +jform_vvvvvxkvxj_required = false; // Initial Script jQuery(document).ready(function() @@ -135,6 +137,9 @@ jQuery(document).ready(function() var add_custom_import_vvvvvxj = jQuery("#jform_add_custom_import input[type='radio']:checked").val(); vvvvvxj(add_custom_import_vvvvvxj); + + var add_custom_button_vvvvvxk = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxk(add_custom_button_vvvvvxk); }); // the vvvvvwi function @@ -989,6 +994,58 @@ function vvvvvxj(add_custom_import_vvvvvxj) } } +// the vvvvvxk function +function vvvvvxk(add_custom_button_vvvvvxk) +{ + // set the function logic + if (add_custom_button_vvvvvxk == 1) + { + jQuery('#jform_custom_button').closest('.control-group').show(); + jQuery('#jform_php_controller').closest('.control-group').show(); + if (jform_vvvvvxkvxi_required) + { + updateFieldRequired('php_controller',0); + jQuery('#jform_php_controller').prop('required','required'); + jQuery('#jform_php_controller').attr('aria-required',true); + jQuery('#jform_php_controller').addClass('required'); + jform_vvvvvxkvxi_required = false; + } + + jQuery('#jform_php_model').closest('.control-group').show(); + if (jform_vvvvvxkvxj_required) + { + updateFieldRequired('php_model',0); + jQuery('#jform_php_model').prop('required','required'); + jQuery('#jform_php_model').attr('aria-required',true); + jQuery('#jform_php_model').addClass('required'); + jform_vvvvvxkvxj_required = false; + } + + } + else + { + jQuery('#jform_custom_button').closest('.control-group').hide(); + jQuery('#jform_php_controller').closest('.control-group').hide(); + if (!jform_vvvvvxkvxi_required) + { + updateFieldRequired('php_controller',1); + jQuery('#jform_php_controller').removeAttr('required'); + jQuery('#jform_php_controller').removeAttr('aria-required'); + jQuery('#jform_php_controller').removeClass('required'); + jform_vvvvvxkvxi_required = true; + } + jQuery('#jform_php_model').closest('.control-group').hide(); + if (!jform_vvvvvxkvxj_required) + { + updateFieldRequired('php_model',1); + jQuery('#jform_php_model').removeAttr('required'); + jQuery('#jform_php_model').removeAttr('aria-required'); + jQuery('#jform_php_model').removeClass('required'); + jform_vvvvvxkvxj_required = true; + } + } +} + // update required fields function updateFieldRequired(name,status) { diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index e8b6a3a58..ee53deb19 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -149,6 +149,19 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> + + - - - - - + @@ -257,6 +244,27 @@ + + + + - + @@ -291,12 +299,12 @@ - + @@ -312,27 +320,19 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT" required="true" /> - - - + @@ -409,6 +409,21 @@ + + + + - - - - + + + + - - - - + + + + - - - - - + @@ -979,17 +979,17 @@ - + @@ -1006,20 +1006,19 @@ - + - - - - + type="textarea" + name="php_import" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT" + required="true" + /> - + @@ -1061,11 +1060,11 @@ - + @@ -1088,11 +1087,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_HINT" required="true" /> - + @@ -1116,11 +1115,11 @@ - + @@ -1143,11 +1142,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FILE_HINT" required="true" /> - + @@ -1171,11 +1170,11 @@ - + @@ -1198,11 +1197,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_HINT" required="true" /> - + @@ -1226,11 +1225,11 @@ - + @@ -1253,11 +1252,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FILE_HINT" required="true" /> - + @@ -1281,11 +1280,11 @@ - + @@ -1308,6 +1307,542 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEWS_FOOTER_HINT" required="true" /> + + + + + + + + + + + + + + + + + + + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + - - - - + type="textarea" + name="php_controller" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + @@ -1624,17 +2158,17 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT" required="true" /> - + diff --git a/admin/models/forms/component.js b/admin/models/forms/component.js index 44f9ca586..09b5d1592 100644 --- a/admin/models/forms/component.js +++ b/admin/models/forms/component.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.js diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js index 43309ac65..dedb68910 100644 --- a/admin/models/forms/custom_admin_view.js +++ b/admin/models/forms/custom_admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.js @@ -24,255 +24,255 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxkvxj_required = false; -jform_vvvvvxlvxk_required = false; -jform_vvvvvxmvxl_required = false; -jform_vvvvvxnvxm_required = false; -jform_vvvvvxovxn_required = false; -jform_vvvvvxpvxo_required = false; -jform_vvvvvxqvxp_required = false; +jform_vvvvvxlvxl_required = false; +jform_vvvvvxmvxm_required = false; +jform_vvvvvxnvxn_required = false; +jform_vvvvvxovxo_required = false; +jform_vvvvvxpvxp_required = false; jform_vvvvvxqvxq_required = false; jform_vvvvvxrvxr_required = false; +jform_vvvvvxrvxs_required = false; +jform_vvvvvxsvxt_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvxk = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvxk(add_php_view_vvvvvxk); + var add_php_view_vvvvvxl = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvxl(add_php_view_vvvvvxl); - var add_php_jview_display_vvvvvxl = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); - vvvvvxl(add_php_jview_display_vvvvvxl); + var add_php_jview_display_vvvvvxm = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); + vvvvvxm(add_php_jview_display_vvvvvxm); - var add_php_jview_vvvvvxm = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); - vvvvvxm(add_php_jview_vvvvvxm); + var add_php_jview_vvvvvxn = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); + vvvvvxn(add_php_jview_vvvvvxn); - var add_php_document_vvvvvxn = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxn(add_php_document_vvvvvxn); + var add_php_document_vvvvvxo = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxo(add_php_document_vvvvvxo); - var add_css_document_vvvvvxo = jQuery("#jform_add_css_document input[type='radio']:checked").val(); - vvvvvxo(add_css_document_vvvvvxo); + var add_css_document_vvvvvxp = jQuery("#jform_add_css_document input[type='radio']:checked").val(); + vvvvvxp(add_css_document_vvvvvxp); - var add_js_document_vvvvvxp = jQuery("#jform_add_js_document input[type='radio']:checked").val(); - vvvvvxp(add_js_document_vvvvvxp); + var add_js_document_vvvvvxq = jQuery("#jform_add_js_document input[type='radio']:checked").val(); + vvvvvxq(add_js_document_vvvvvxq); - var add_custom_button_vvvvvxq = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvxq(add_custom_button_vvvvvxq); + var add_custom_button_vvvvvxr = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxr(add_custom_button_vvvvvxr); - var add_css_vvvvvxr = jQuery("#jform_add_css input[type='radio']:checked").val(); - vvvvvxr(add_css_vvvvvxr); + var add_css_vvvvvxs = jQuery("#jform_add_css input[type='radio']:checked").val(); + vvvvvxs(add_css_vvvvvxs); }); -// the vvvvvxk function -function vvvvvxk(add_php_view_vvvvvxk) +// the vvvvvxl function +function vvvvvxl(add_php_view_vvvvvxl) { // set the function logic - if (add_php_view_vvvvvxk == 1) + if (add_php_view_vvvvvxl == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvxkvxj_required) + if (jform_vvvvvxlvxl_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvxkvxj_required = false; + jform_vvvvvxlvxl_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvxkvxj_required) + if (!jform_vvvvvxlvxl_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvxkvxj_required = true; + jform_vvvvvxlvxl_required = true; } } } -// the vvvvvxl function -function vvvvvxl(add_php_jview_display_vvvvvxl) +// the vvvvvxm function +function vvvvvxm(add_php_jview_display_vvvvvxm) { // set the function logic - if (add_php_jview_display_vvvvvxl == 1) + if (add_php_jview_display_vvvvvxm == 1) { jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvxlvxk_required) + if (jform_vvvvvxmvxm_required) { updateFieldRequired('php_jview_display',0); jQuery('#jform_php_jview_display').prop('required','required'); jQuery('#jform_php_jview_display').attr('aria-required',true); jQuery('#jform_php_jview_display').addClass('required'); - jform_vvvvvxlvxk_required = false; + jform_vvvvvxmvxm_required = false; } } else { jQuery('#jform_php_jview_display').closest('.control-group').hide(); - if (!jform_vvvvvxlvxk_required) + if (!jform_vvvvvxmvxm_required) { updateFieldRequired('php_jview_display',1); jQuery('#jform_php_jview_display').removeAttr('required'); jQuery('#jform_php_jview_display').removeAttr('aria-required'); jQuery('#jform_php_jview_display').removeClass('required'); - jform_vvvvvxlvxk_required = true; + jform_vvvvvxmvxm_required = true; } } } -// the vvvvvxm function -function vvvvvxm(add_php_jview_vvvvvxm) +// the vvvvvxn function +function vvvvvxn(add_php_jview_vvvvvxn) { // set the function logic - if (add_php_jview_vvvvvxm == 1) + if (add_php_jview_vvvvvxn == 1) { jQuery('#jform_php_jview').closest('.control-group').show(); - if (jform_vvvvvxmvxl_required) + if (jform_vvvvvxnvxn_required) { updateFieldRequired('php_jview',0); jQuery('#jform_php_jview').prop('required','required'); jQuery('#jform_php_jview').attr('aria-required',true); jQuery('#jform_php_jview').addClass('required'); - jform_vvvvvxmvxl_required = false; + jform_vvvvvxnvxn_required = false; } } else { jQuery('#jform_php_jview').closest('.control-group').hide(); - if (!jform_vvvvvxmvxl_required) + if (!jform_vvvvvxnvxn_required) { updateFieldRequired('php_jview',1); jQuery('#jform_php_jview').removeAttr('required'); jQuery('#jform_php_jview').removeAttr('aria-required'); jQuery('#jform_php_jview').removeClass('required'); - jform_vvvvvxmvxl_required = true; + jform_vvvvvxnvxn_required = true; } } } -// the vvvvvxn function -function vvvvvxn(add_php_document_vvvvvxn) +// the vvvvvxo function +function vvvvvxo(add_php_document_vvvvvxo) { // set the function logic - if (add_php_document_vvvvvxn == 1) + if (add_php_document_vvvvvxo == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvxnvxm_required) + if (jform_vvvvvxovxo_required) { updateFieldRequired('php_document',0); jQuery('#jform_php_document').prop('required','required'); jQuery('#jform_php_document').attr('aria-required',true); jQuery('#jform_php_document').addClass('required'); - jform_vvvvvxnvxm_required = false; + jform_vvvvvxovxo_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvxnvxm_required) + if (!jform_vvvvvxovxo_required) { updateFieldRequired('php_document',1); jQuery('#jform_php_document').removeAttr('required'); jQuery('#jform_php_document').removeAttr('aria-required'); jQuery('#jform_php_document').removeClass('required'); - jform_vvvvvxnvxm_required = true; + jform_vvvvvxovxo_required = true; } } } -// the vvvvvxo function -function vvvvvxo(add_css_document_vvvvvxo) +// the vvvvvxp function +function vvvvvxp(add_css_document_vvvvvxp) { // set the function logic - if (add_css_document_vvvvvxo == 1) + if (add_css_document_vvvvvxp == 1) { jQuery('#jform_css_document').closest('.control-group').show(); - if (jform_vvvvvxovxn_required) + if (jform_vvvvvxpvxp_required) { updateFieldRequired('css_document',0); jQuery('#jform_css_document').prop('required','required'); jQuery('#jform_css_document').attr('aria-required',true); jQuery('#jform_css_document').addClass('required'); - jform_vvvvvxovxn_required = false; + jform_vvvvvxpvxp_required = false; } } else { jQuery('#jform_css_document').closest('.control-group').hide(); - if (!jform_vvvvvxovxn_required) + if (!jform_vvvvvxpvxp_required) { updateFieldRequired('css_document',1); jQuery('#jform_css_document').removeAttr('required'); jQuery('#jform_css_document').removeAttr('aria-required'); jQuery('#jform_css_document').removeClass('required'); - jform_vvvvvxovxn_required = true; + jform_vvvvvxpvxp_required = true; } } } -// the vvvvvxp function -function vvvvvxp(add_js_document_vvvvvxp) +// the vvvvvxq function +function vvvvvxq(add_js_document_vvvvvxq) { // set the function logic - if (add_js_document_vvvvvxp == 1) + if (add_js_document_vvvvvxq == 1) { jQuery('#jform_js_document').closest('.control-group').show(); - if (jform_vvvvvxpvxo_required) + if (jform_vvvvvxqvxq_required) { updateFieldRequired('js_document',0); jQuery('#jform_js_document').prop('required','required'); jQuery('#jform_js_document').attr('aria-required',true); jQuery('#jform_js_document').addClass('required'); - jform_vvvvvxpvxo_required = false; + jform_vvvvvxqvxq_required = false; } } else { jQuery('#jform_js_document').closest('.control-group').hide(); - if (!jform_vvvvvxpvxo_required) + if (!jform_vvvvvxqvxq_required) { updateFieldRequired('js_document',1); jQuery('#jform_js_document').removeAttr('required'); jQuery('#jform_js_document').removeAttr('aria-required'); jQuery('#jform_js_document').removeClass('required'); - jform_vvvvvxpvxo_required = true; + jform_vvvvvxqvxq_required = true; } } } -// the vvvvvxq function -function vvvvvxq(add_custom_button_vvvvvxq) +// the vvvvvxr function +function vvvvvxr(add_custom_button_vvvvvxr) { // set the function logic - if (add_custom_button_vvvvvxq == 1) + if (add_custom_button_vvvvvxr == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvxqvxp_required) + if (jform_vvvvvxrvxr_required) { updateFieldRequired('php_controller',0); jQuery('#jform_php_controller').prop('required','required'); jQuery('#jform_php_controller').attr('aria-required',true); jQuery('#jform_php_controller').addClass('required'); - jform_vvvvvxqvxp_required = false; + jform_vvvvvxrvxr_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvxqvxq_required) + if (jform_vvvvvxrvxs_required) { updateFieldRequired('php_model',0); jQuery('#jform_php_model').prop('required','required'); jQuery('#jform_php_model').attr('aria-required',true); jQuery('#jform_php_model').addClass('required'); - jform_vvvvvxqvxq_required = false; + jform_vvvvvxrvxs_required = false; } } @@ -280,53 +280,53 @@ function vvvvvxq(add_custom_button_vvvvvxq) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvxqvxp_required) + if (!jform_vvvvvxrvxr_required) { updateFieldRequired('php_controller',1); jQuery('#jform_php_controller').removeAttr('required'); jQuery('#jform_php_controller').removeAttr('aria-required'); jQuery('#jform_php_controller').removeClass('required'); - jform_vvvvvxqvxp_required = true; + jform_vvvvvxrvxr_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvxqvxq_required) + if (!jform_vvvvvxrvxs_required) { updateFieldRequired('php_model',1); jQuery('#jform_php_model').removeAttr('required'); jQuery('#jform_php_model').removeAttr('aria-required'); jQuery('#jform_php_model').removeClass('required'); - jform_vvvvvxqvxq_required = true; + jform_vvvvvxrvxs_required = true; } } } -// the vvvvvxr function -function vvvvvxr(add_css_vvvvvxr) +// the vvvvvxs function +function vvvvvxs(add_css_vvvvvxs) { // set the function logic - if (add_css_vvvvvxr == 1) + if (add_css_vvvvvxs == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvxrvxr_required) + if (jform_vvvvvxsvxt_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvxrvxr_required = false; + jform_vvvvvxsvxt_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvxrvxr_required) + if (!jform_vvvvvxsvxt_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvxrvxr_required = true; + jform_vvvvvxsvxt_required = true; } } } diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js index 9e75f25c5..7ea22e1c3 100644 --- a/admin/models/forms/dynamic_get.js +++ b/admin/models/forms/dynamic_get.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.js @@ -24,33 +24,30 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvydvye_required = false; -jform_vvvvvyevyf_required = false; -jform_vvvvvyfvyg_required = false; -jform_vvvvvygvyh_required = false; -jform_vvvvvyhvyi_required = false; -jform_vvvvvyivyj_required = false; -jform_vvvvvynvyk_required = false; -jform_vvvvvypvyl_required = false; -jform_vvvvvyqvym_required = false; -jform_vvvvvysvyn_required = false; -jform_vvvvvysvyo_required = false; +jform_vvvvvyevyg_required = false; +jform_vvvvvyfvyh_required = false; +jform_vvvvvygvyi_required = false; +jform_vvvvvyhvyj_required = false; +jform_vvvvvyivyk_required = false; +jform_vvvvvyjvyl_required = false; +jform_vvvvvyovym_required = false; +jform_vvvvvyqvyn_required = false; +jform_vvvvvyrvyo_required = false; jform_vvvvvytvyp_required = false; -jform_vvvvvyuvyq_required = false; -jform_vvvvvyvvyr_required = false; -jform_vvvvvyxvys_required = false; -jform_vvvvvyxvyt_required = false; -jform_vvvvvyxvyu_required = false; +jform_vvvvvytvyq_required = false; +jform_vvvvvyuvyr_required = false; +jform_vvvvvyvvys_required = false; +jform_vvvvvywvyt_required = false; +jform_vvvvvyyvyu_required = false; jform_vvvvvyyvyv_required = false; +jform_vvvvvyyvyw_required = false; +jform_vvvvvyzvyx_required = false; // Initial Script jQuery(document).ready(function() { - var gettype_vvvvvyd = jQuery("#jform_gettype").val(); - vvvvvyd(gettype_vvvvvyd); - - var main_source_vvvvvye = jQuery("#jform_main_source").val(); - vvvvvye(main_source_vvvvvye); + var gettype_vvvvvye = jQuery("#jform_gettype").val(); + vvvvvye(gettype_vvvvvye); var main_source_vvvvvyf = jQuery("#jform_main_source").val(); vvvvvyf(main_source_vvvvvyf); @@ -61,157 +58,105 @@ jQuery(document).ready(function() var main_source_vvvvvyh = jQuery("#jform_main_source").val(); vvvvvyh(main_source_vvvvvyh); - var addcalculation_vvvvvyi = jQuery("#jform_addcalculation input[type='radio']:checked").val(); - vvvvvyi(addcalculation_vvvvvyi); + var main_source_vvvvvyi = jQuery("#jform_main_source").val(); + vvvvvyi(main_source_vvvvvyi); var addcalculation_vvvvvyj = jQuery("#jform_addcalculation input[type='radio']:checked").val(); - var gettype_vvvvvyj = jQuery("#jform_gettype").val(); - vvvvvyj(addcalculation_vvvvvyj,gettype_vvvvvyj); + vvvvvyj(addcalculation_vvvvvyj); var addcalculation_vvvvvyk = jQuery("#jform_addcalculation input[type='radio']:checked").val(); var gettype_vvvvvyk = jQuery("#jform_gettype").val(); vvvvvyk(addcalculation_vvvvvyk,gettype_vvvvvyk); - var main_source_vvvvvyn = jQuery("#jform_main_source").val(); - vvvvvyn(main_source_vvvvvyn); + var addcalculation_vvvvvyl = jQuery("#jform_addcalculation input[type='radio']:checked").val(); + var gettype_vvvvvyl = jQuery("#jform_gettype").val(); + vvvvvyl(addcalculation_vvvvvyl,gettype_vvvvvyl); var main_source_vvvvvyo = jQuery("#jform_main_source").val(); vvvvvyo(main_source_vvvvvyo); - var add_php_before_getitem_vvvvvyp = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val(); - var gettype_vvvvvyp = jQuery("#jform_gettype").val(); - vvvvvyp(add_php_before_getitem_vvvvvyp,gettype_vvvvvyp); + var main_source_vvvvvyp = jQuery("#jform_main_source").val(); + vvvvvyp(main_source_vvvvvyp); - var add_php_after_getitem_vvvvvyq = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val(); + var add_php_before_getitem_vvvvvyq = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val(); var gettype_vvvvvyq = jQuery("#jform_gettype").val(); - vvvvvyq(add_php_after_getitem_vvvvvyq,gettype_vvvvvyq); + vvvvvyq(add_php_before_getitem_vvvvvyq,gettype_vvvvvyq); - var gettype_vvvvvys = jQuery("#jform_gettype").val(); - vvvvvys(gettype_vvvvvys); + var add_php_after_getitem_vvvvvyr = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val(); + var gettype_vvvvvyr = jQuery("#jform_gettype").val(); + vvvvvyr(add_php_after_getitem_vvvvvyr,gettype_vvvvvyr); - var add_php_getlistquery_vvvvvyt = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); var gettype_vvvvvyt = jQuery("#jform_gettype").val(); - vvvvvyt(add_php_getlistquery_vvvvvyt,gettype_vvvvvyt); + vvvvvyt(gettype_vvvvvyt); - var add_php_before_getitems_vvvvvyu = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val(); + var add_php_getlistquery_vvvvvyu = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val(); var gettype_vvvvvyu = jQuery("#jform_gettype").val(); - vvvvvyu(add_php_before_getitems_vvvvvyu,gettype_vvvvvyu); + vvvvvyu(add_php_getlistquery_vvvvvyu,gettype_vvvvvyu); - var add_php_after_getitems_vvvvvyv = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val(); + var add_php_before_getitems_vvvvvyv = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val(); var gettype_vvvvvyv = jQuery("#jform_gettype").val(); - vvvvvyv(add_php_after_getitems_vvvvvyv,gettype_vvvvvyv); + vvvvvyv(add_php_before_getitems_vvvvvyv,gettype_vvvvvyv); - var gettype_vvvvvyx = jQuery("#jform_gettype").val(); - vvvvvyx(gettype_vvvvvyx); + var add_php_after_getitems_vvvvvyw = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val(); + var gettype_vvvvvyw = jQuery("#jform_gettype").val(); + vvvvvyw(add_php_after_getitems_vvvvvyw,gettype_vvvvvyw); var gettype_vvvvvyy = jQuery("#jform_gettype").val(); vvvvvyy(gettype_vvvvvyy); + + var gettype_vvvvvyz = jQuery("#jform_gettype").val(); + vvvvvyz(gettype_vvvvvyz); }); -// the vvvvvyd function -function vvvvvyd(gettype_vvvvvyd) +// the vvvvvye function +function vvvvvye(gettype_vvvvvye) { - if (isSet(gettype_vvvvvyd) && gettype_vvvvvyd.constructor !== Array) + if (isSet(gettype_vvvvvye) && gettype_vvvvvye.constructor !== Array) { - var temp_vvvvvyd = gettype_vvvvvyd; - var gettype_vvvvvyd = []; - gettype_vvvvvyd.push(temp_vvvvvyd); + var temp_vvvvvye = gettype_vvvvvye; + var gettype_vvvvvye = []; + gettype_vvvvvye.push(temp_vvvvvye); } - else if (!isSet(gettype_vvvvvyd)) + else if (!isSet(gettype_vvvvvye)) { - var gettype_vvvvvyd = []; + var gettype_vvvvvye = []; } - var gettype = gettype_vvvvvyd.some(gettype_vvvvvyd_SomeFunc); + var gettype = gettype_vvvvvye.some(gettype_vvvvvye_SomeFunc); // set this function logic if (gettype) { jQuery('#jform_getcustom').closest('.control-group').show(); - if (jform_vvvvvydvye_required) + if (jform_vvvvvyevyg_required) { updateFieldRequired('getcustom',0); jQuery('#jform_getcustom').prop('required','required'); jQuery('#jform_getcustom').attr('aria-required',true); jQuery('#jform_getcustom').addClass('required'); - jform_vvvvvydvye_required = false; + jform_vvvvvyevyg_required = false; } } else { jQuery('#jform_getcustom').closest('.control-group').hide(); - if (!jform_vvvvvydvye_required) + if (!jform_vvvvvyevyg_required) { updateFieldRequired('getcustom',1); jQuery('#jform_getcustom').removeAttr('required'); jQuery('#jform_getcustom').removeAttr('aria-required'); jQuery('#jform_getcustom').removeClass('required'); - jform_vvvvvydvye_required = true; - } - } -} - -// the vvvvvyd Some function -function gettype_vvvvvyd_SomeFunc(gettype_vvvvvyd) -{ - // set the function logic - if (gettype_vvvvvyd == 3 || gettype_vvvvvyd == 4) - { - return true; - } - return false; -} - -// the vvvvvye function -function vvvvvye(main_source_vvvvvye) -{ - if (isSet(main_source_vvvvvye) && main_source_vvvvvye.constructor !== Array) - { - var temp_vvvvvye = main_source_vvvvvye; - var main_source_vvvvvye = []; - main_source_vvvvvye.push(temp_vvvvvye); - } - else if (!isSet(main_source_vvvvvye)) - { - var main_source_vvvvvye = []; - } - var main_source = main_source_vvvvvye.some(main_source_vvvvvye_SomeFunc); - - - // set this function logic - if (main_source) - { - jQuery('#jform_view_table_main').closest('.control-group').show(); - if (jform_vvvvvyevyf_required) - { - updateFieldRequired('view_table_main',0); - jQuery('#jform_view_table_main').prop('required','required'); - jQuery('#jform_view_table_main').attr('aria-required',true); - jQuery('#jform_view_table_main').addClass('required'); - jform_vvvvvyevyf_required = false; - } - - } - else - { - jQuery('#jform_view_table_main').closest('.control-group').hide(); - if (!jform_vvvvvyevyf_required) - { - updateFieldRequired('view_table_main',1); - jQuery('#jform_view_table_main').removeAttr('required'); - jQuery('#jform_view_table_main').removeAttr('aria-required'); - jQuery('#jform_view_table_main').removeClass('required'); - jform_vvvvvyevyf_required = true; + jform_vvvvvyevyg_required = true; } } } // the vvvvvye Some function -function main_source_vvvvvye_SomeFunc(main_source_vvvvvye) +function gettype_vvvvvye_SomeFunc(gettype_vvvvvye) { // set the function logic - if (main_source_vvvvvye == 1) + if (gettype_vvvvvye == 3 || gettype_vvvvvye == 4) { return true; } @@ -237,27 +182,27 @@ function vvvvvyf(main_source_vvvvvyf) // set this function logic if (main_source) { - jQuery('#jform_view_selection').closest('.control-group').show(); - if (jform_vvvvvyfvyg_required) + jQuery('#jform_view_table_main').closest('.control-group').show(); + if (jform_vvvvvyfvyh_required) { - updateFieldRequired('view_selection',0); - jQuery('#jform_view_selection').prop('required','required'); - jQuery('#jform_view_selection').attr('aria-required',true); - jQuery('#jform_view_selection').addClass('required'); - jform_vvvvvyfvyg_required = false; + updateFieldRequired('view_table_main',0); + jQuery('#jform_view_table_main').prop('required','required'); + jQuery('#jform_view_table_main').attr('aria-required',true); + jQuery('#jform_view_table_main').addClass('required'); + jform_vvvvvyfvyh_required = false; } } else { - jQuery('#jform_view_selection').closest('.control-group').hide(); - if (!jform_vvvvvyfvyg_required) + jQuery('#jform_view_table_main').closest('.control-group').hide(); + if (!jform_vvvvvyfvyh_required) { - updateFieldRequired('view_selection',1); - jQuery('#jform_view_selection').removeAttr('required'); - jQuery('#jform_view_selection').removeAttr('aria-required'); - jQuery('#jform_view_selection').removeClass('required'); - jform_vvvvvyfvyg_required = true; + updateFieldRequired('view_table_main',1); + jQuery('#jform_view_table_main').removeAttr('required'); + jQuery('#jform_view_table_main').removeAttr('aria-required'); + jQuery('#jform_view_table_main').removeClass('required'); + jform_vvvvvyfvyh_required = true; } } } @@ -292,27 +237,27 @@ function vvvvvyg(main_source_vvvvvyg) // set this function logic if (main_source) { - jQuery('#jform_db_table_main').closest('.control-group').show(); - if (jform_vvvvvygvyh_required) + jQuery('#jform_view_selection').closest('.control-group').show(); + if (jform_vvvvvygvyi_required) { - updateFieldRequired('db_table_main',0); - jQuery('#jform_db_table_main').prop('required','required'); - jQuery('#jform_db_table_main').attr('aria-required',true); - jQuery('#jform_db_table_main').addClass('required'); - jform_vvvvvygvyh_required = false; + updateFieldRequired('view_selection',0); + jQuery('#jform_view_selection').prop('required','required'); + jQuery('#jform_view_selection').attr('aria-required',true); + jQuery('#jform_view_selection').addClass('required'); + jform_vvvvvygvyi_required = false; } } else { - jQuery('#jform_db_table_main').closest('.control-group').hide(); - if (!jform_vvvvvygvyh_required) + jQuery('#jform_view_selection').closest('.control-group').hide(); + if (!jform_vvvvvygvyi_required) { - updateFieldRequired('db_table_main',1); - jQuery('#jform_db_table_main').removeAttr('required'); - jQuery('#jform_db_table_main').removeAttr('aria-required'); - jQuery('#jform_db_table_main').removeClass('required'); - jform_vvvvvygvyh_required = true; + updateFieldRequired('view_selection',1); + jQuery('#jform_view_selection').removeAttr('required'); + jQuery('#jform_view_selection').removeAttr('aria-required'); + jQuery('#jform_view_selection').removeClass('required'); + jform_vvvvvygvyi_required = true; } } } @@ -321,7 +266,7 @@ function vvvvvyg(main_source_vvvvvyg) function main_source_vvvvvyg_SomeFunc(main_source_vvvvvyg) { // set the function logic - if (main_source_vvvvvyg == 2) + if (main_source_vvvvvyg == 1) { return true; } @@ -347,27 +292,27 @@ function vvvvvyh(main_source_vvvvvyh) // set this function logic if (main_source) { - jQuery('#jform_db_selection').closest('.control-group').show(); - if (jform_vvvvvyhvyi_required) + jQuery('#jform_db_table_main').closest('.control-group').show(); + if (jform_vvvvvyhvyj_required) { - updateFieldRequired('db_selection',0); - jQuery('#jform_db_selection').prop('required','required'); - jQuery('#jform_db_selection').attr('aria-required',true); - jQuery('#jform_db_selection').addClass('required'); - jform_vvvvvyhvyi_required = false; + updateFieldRequired('db_table_main',0); + jQuery('#jform_db_table_main').prop('required','required'); + jQuery('#jform_db_table_main').attr('aria-required',true); + jQuery('#jform_db_table_main').addClass('required'); + jform_vvvvvyhvyj_required = false; } } else { - jQuery('#jform_db_selection').closest('.control-group').hide(); - if (!jform_vvvvvyhvyi_required) + jQuery('#jform_db_table_main').closest('.control-group').hide(); + if (!jform_vvvvvyhvyj_required) { - updateFieldRequired('db_selection',1); - jQuery('#jform_db_selection').removeAttr('required'); - jQuery('#jform_db_selection').removeAttr('aria-required'); - jQuery('#jform_db_selection').removeClass('required'); - jform_vvvvvyhvyi_required = true; + updateFieldRequired('db_table_main',1); + jQuery('#jform_db_table_main').removeAttr('required'); + jQuery('#jform_db_table_main').removeAttr('aria-required'); + jQuery('#jform_db_table_main').removeClass('required'); + jform_vvvvvyhvyj_required = true; } } } @@ -384,97 +329,91 @@ function main_source_vvvvvyh_SomeFunc(main_source_vvvvvyh) } // the vvvvvyi function -function vvvvvyi(addcalculation_vvvvvyi) +function vvvvvyi(main_source_vvvvvyi) +{ + if (isSet(main_source_vvvvvyi) && main_source_vvvvvyi.constructor !== Array) + { + var temp_vvvvvyi = main_source_vvvvvyi; + var main_source_vvvvvyi = []; + main_source_vvvvvyi.push(temp_vvvvvyi); + } + else if (!isSet(main_source_vvvvvyi)) + { + var main_source_vvvvvyi = []; + } + var main_source = main_source_vvvvvyi.some(main_source_vvvvvyi_SomeFunc); + + + // set this function logic + if (main_source) + { + jQuery('#jform_db_selection').closest('.control-group').show(); + if (jform_vvvvvyivyk_required) + { + updateFieldRequired('db_selection',0); + jQuery('#jform_db_selection').prop('required','required'); + jQuery('#jform_db_selection').attr('aria-required',true); + jQuery('#jform_db_selection').addClass('required'); + jform_vvvvvyivyk_required = false; + } + + } + else + { + jQuery('#jform_db_selection').closest('.control-group').hide(); + if (!jform_vvvvvyivyk_required) + { + updateFieldRequired('db_selection',1); + jQuery('#jform_db_selection').removeAttr('required'); + jQuery('#jform_db_selection').removeAttr('aria-required'); + jQuery('#jform_db_selection').removeClass('required'); + jform_vvvvvyivyk_required = true; + } + } +} + +// the vvvvvyi Some function +function main_source_vvvvvyi_SomeFunc(main_source_vvvvvyi) { // set the function logic - if (addcalculation_vvvvvyi == 1) + if (main_source_vvvvvyi == 2) + { + return true; + } + return false; +} + +// the vvvvvyj function +function vvvvvyj(addcalculation_vvvvvyj) +{ + // set the function logic + if (addcalculation_vvvvvyj == 1) { jQuery('#jform_php_calculation').closest('.control-group').show(); - if (jform_vvvvvyivyj_required) + if (jform_vvvvvyjvyl_required) { updateFieldRequired('php_calculation',0); jQuery('#jform_php_calculation').prop('required','required'); jQuery('#jform_php_calculation').attr('aria-required',true); jQuery('#jform_php_calculation').addClass('required'); - jform_vvvvvyivyj_required = false; + jform_vvvvvyjvyl_required = false; } } else { jQuery('#jform_php_calculation').closest('.control-group').hide(); - if (!jform_vvvvvyivyj_required) + if (!jform_vvvvvyjvyl_required) { updateFieldRequired('php_calculation',1); jQuery('#jform_php_calculation').removeAttr('required'); jQuery('#jform_php_calculation').removeAttr('aria-required'); jQuery('#jform_php_calculation').removeClass('required'); - jform_vvvvvyivyj_required = true; + jform_vvvvvyjvyl_required = true; } } } -// the vvvvvyj function -function vvvvvyj(addcalculation_vvvvvyj,gettype_vvvvvyj) -{ - if (isSet(addcalculation_vvvvvyj) && addcalculation_vvvvvyj.constructor !== Array) - { - var temp_vvvvvyj = addcalculation_vvvvvyj; - var addcalculation_vvvvvyj = []; - addcalculation_vvvvvyj.push(temp_vvvvvyj); - } - else if (!isSet(addcalculation_vvvvvyj)) - { - var addcalculation_vvvvvyj = []; - } - var addcalculation = addcalculation_vvvvvyj.some(addcalculation_vvvvvyj_SomeFunc); - - if (isSet(gettype_vvvvvyj) && gettype_vvvvvyj.constructor !== Array) - { - var temp_vvvvvyj = gettype_vvvvvyj; - var gettype_vvvvvyj = []; - gettype_vvvvvyj.push(temp_vvvvvyj); - } - else if (!isSet(gettype_vvvvvyj)) - { - var gettype_vvvvvyj = []; - } - var gettype = gettype_vvvvvyj.some(gettype_vvvvvyj_SomeFunc); - - - // set this function logic - if (addcalculation && gettype) - { - jQuery('.note_calculation_item').closest('.control-group').show(); - } - else - { - jQuery('.note_calculation_item').closest('.control-group').hide(); - } -} - -// the vvvvvyj Some function -function addcalculation_vvvvvyj_SomeFunc(addcalculation_vvvvvyj) -{ - // set the function logic - if (addcalculation_vvvvvyj == 1) - { - return true; - } - return false; -} - -// the vvvvvyj Some function -function gettype_vvvvvyj_SomeFunc(gettype_vvvvvyj) -{ - // set the function logic - if (gettype_vvvvvyj == 1 || gettype_vvvvvyj == 3) - { - return true; - } - return false; -} - // the vvvvvyk function function vvvvvyk(addcalculation_vvvvvyk,gettype_vvvvvyk) { @@ -506,11 +445,11 @@ function vvvvvyk(addcalculation_vvvvvyk,gettype_vvvvvyk) // set this function logic if (addcalculation && gettype) { - jQuery('.note_calculation_items').closest('.control-group').show(); + jQuery('.note_calculation_item').closest('.control-group').show(); } else { - jQuery('.note_calculation_items').closest('.control-group').hide(); + jQuery('.note_calculation_item').closest('.control-group').hide(); } } @@ -529,62 +468,68 @@ function addcalculation_vvvvvyk_SomeFunc(addcalculation_vvvvvyk) function gettype_vvvvvyk_SomeFunc(gettype_vvvvvyk) { // set the function logic - if (gettype_vvvvvyk == 2 || gettype_vvvvvyk == 4) + if (gettype_vvvvvyk == 1 || gettype_vvvvvyk == 3) { return true; } return false; } -// the vvvvvyn function -function vvvvvyn(main_source_vvvvvyn) +// the vvvvvyl function +function vvvvvyl(addcalculation_vvvvvyl,gettype_vvvvvyl) { - if (isSet(main_source_vvvvvyn) && main_source_vvvvvyn.constructor !== Array) + if (isSet(addcalculation_vvvvvyl) && addcalculation_vvvvvyl.constructor !== Array) { - var temp_vvvvvyn = main_source_vvvvvyn; - var main_source_vvvvvyn = []; - main_source_vvvvvyn.push(temp_vvvvvyn); + var temp_vvvvvyl = addcalculation_vvvvvyl; + var addcalculation_vvvvvyl = []; + addcalculation_vvvvvyl.push(temp_vvvvvyl); } - else if (!isSet(main_source_vvvvvyn)) + else if (!isSet(addcalculation_vvvvvyl)) { - var main_source_vvvvvyn = []; + var addcalculation_vvvvvyl = []; } - var main_source = main_source_vvvvvyn.some(main_source_vvvvvyn_SomeFunc); + var addcalculation = addcalculation_vvvvvyl.some(addcalculation_vvvvvyl_SomeFunc); + + if (isSet(gettype_vvvvvyl) && gettype_vvvvvyl.constructor !== Array) + { + var temp_vvvvvyl = gettype_vvvvvyl; + var gettype_vvvvvyl = []; + gettype_vvvvvyl.push(temp_vvvvvyl); + } + else if (!isSet(gettype_vvvvvyl)) + { + var gettype_vvvvvyl = []; + } + var gettype = gettype_vvvvvyl.some(gettype_vvvvvyl_SomeFunc); // set this function logic - if (main_source) + if (addcalculation && gettype) { - jQuery('#jform_php_custom_get').closest('.control-group').show(); - if (jform_vvvvvynvyk_required) - { - updateFieldRequired('php_custom_get',0); - jQuery('#jform_php_custom_get').prop('required','required'); - jQuery('#jform_php_custom_get').attr('aria-required',true); - jQuery('#jform_php_custom_get').addClass('required'); - jform_vvvvvynvyk_required = false; - } - + jQuery('.note_calculation_items').closest('.control-group').show(); } else { - jQuery('#jform_php_custom_get').closest('.control-group').hide(); - if (!jform_vvvvvynvyk_required) - { - updateFieldRequired('php_custom_get',1); - jQuery('#jform_php_custom_get').removeAttr('required'); - jQuery('#jform_php_custom_get').removeAttr('aria-required'); - jQuery('#jform_php_custom_get').removeClass('required'); - jform_vvvvvynvyk_required = true; - } + jQuery('.note_calculation_items').closest('.control-group').hide(); } } -// the vvvvvyn Some function -function main_source_vvvvvyn_SomeFunc(main_source_vvvvvyn) +// the vvvvvyl Some function +function addcalculation_vvvvvyl_SomeFunc(addcalculation_vvvvvyl) { // set the function logic - if (main_source_vvvvvyn == 3) + if (addcalculation_vvvvvyl == 1) + { + return true; + } + return false; +} + +// the vvvvvyl Some function +function gettype_vvvvvyl_SomeFunc(gettype_vvvvvyl) +{ + // set the function logic + if (gettype_vvvvvyl == 2 || gettype_vvvvvyl == 4) { return true; } @@ -607,6 +552,61 @@ function vvvvvyo(main_source_vvvvvyo) var main_source = main_source_vvvvvyo.some(main_source_vvvvvyo_SomeFunc); + // set this function logic + if (main_source) + { + jQuery('#jform_php_custom_get').closest('.control-group').show(); + if (jform_vvvvvyovym_required) + { + updateFieldRequired('php_custom_get',0); + jQuery('#jform_php_custom_get').prop('required','required'); + jQuery('#jform_php_custom_get').attr('aria-required',true); + jQuery('#jform_php_custom_get').addClass('required'); + jform_vvvvvyovym_required = false; + } + + } + else + { + jQuery('#jform_php_custom_get').closest('.control-group').hide(); + if (!jform_vvvvvyovym_required) + { + updateFieldRequired('php_custom_get',1); + jQuery('#jform_php_custom_get').removeAttr('required'); + jQuery('#jform_php_custom_get').removeAttr('aria-required'); + jQuery('#jform_php_custom_get').removeClass('required'); + jform_vvvvvyovym_required = true; + } + } +} + +// the vvvvvyo Some function +function main_source_vvvvvyo_SomeFunc(main_source_vvvvvyo) +{ + // set the function logic + if (main_source_vvvvvyo == 3) + { + return true; + } + return false; +} + +// the vvvvvyp function +function vvvvvyp(main_source_vvvvvyp) +{ + if (isSet(main_source_vvvvvyp) && main_source_vvvvvyp.constructor !== Array) + { + var temp_vvvvvyp = main_source_vvvvvyp; + var main_source_vvvvvyp = []; + main_source_vvvvvyp.push(temp_vvvvvyp); + } + else if (!isSet(main_source_vvvvvyp)) + { + var main_source_vvvvvyp = []; + } + var main_source = main_source_vvvvvyp.some(main_source_vvvvvyp_SomeFunc); + + // set this function logic if (main_source) { @@ -626,89 +626,11 @@ function vvvvvyo(main_source_vvvvvyo) } } -// the vvvvvyo Some function -function main_source_vvvvvyo_SomeFunc(main_source_vvvvvyo) -{ - // set the function logic - if (main_source_vvvvvyo == 1 || main_source_vvvvvyo == 2) - { - return true; - } - return false; -} - -// the vvvvvyp function -function vvvvvyp(add_php_before_getitem_vvvvvyp,gettype_vvvvvyp) -{ - if (isSet(add_php_before_getitem_vvvvvyp) && add_php_before_getitem_vvvvvyp.constructor !== Array) - { - var temp_vvvvvyp = add_php_before_getitem_vvvvvyp; - var add_php_before_getitem_vvvvvyp = []; - add_php_before_getitem_vvvvvyp.push(temp_vvvvvyp); - } - else if (!isSet(add_php_before_getitem_vvvvvyp)) - { - var add_php_before_getitem_vvvvvyp = []; - } - var add_php_before_getitem = add_php_before_getitem_vvvvvyp.some(add_php_before_getitem_vvvvvyp_SomeFunc); - - if (isSet(gettype_vvvvvyp) && gettype_vvvvvyp.constructor !== Array) - { - var temp_vvvvvyp = gettype_vvvvvyp; - var gettype_vvvvvyp = []; - gettype_vvvvvyp.push(temp_vvvvvyp); - } - else if (!isSet(gettype_vvvvvyp)) - { - var gettype_vvvvvyp = []; - } - var gettype = gettype_vvvvvyp.some(gettype_vvvvvyp_SomeFunc); - - - // set this function logic - if (add_php_before_getitem && gettype) - { - jQuery('#jform_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvypvyl_required) - { - updateFieldRequired('php_before_getitem',0); - jQuery('#jform_php_before_getitem').prop('required','required'); - jQuery('#jform_php_before_getitem').attr('aria-required',true); - jQuery('#jform_php_before_getitem').addClass('required'); - jform_vvvvvypvyl_required = false; - } - - } - else - { - jQuery('#jform_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvypvyl_required) - { - updateFieldRequired('php_before_getitem',1); - jQuery('#jform_php_before_getitem').removeAttr('required'); - jQuery('#jform_php_before_getitem').removeAttr('aria-required'); - jQuery('#jform_php_before_getitem').removeClass('required'); - jform_vvvvvypvyl_required = true; - } - } -} - // the vvvvvyp Some function -function add_php_before_getitem_vvvvvyp_SomeFunc(add_php_before_getitem_vvvvvyp) +function main_source_vvvvvyp_SomeFunc(main_source_vvvvvyp) { // set the function logic - if (add_php_before_getitem_vvvvvyp == 1) - { - return true; - } - return false; -} - -// the vvvvvyp Some function -function gettype_vvvvvyp_SomeFunc(gettype_vvvvvyp) -{ - // set the function logic - if (gettype_vvvvvyp == 1 || gettype_vvvvvyp == 3) + if (main_source_vvvvvyp == 1 || main_source_vvvvvyp == 2) { return true; } @@ -716,19 +638,19 @@ function gettype_vvvvvyp_SomeFunc(gettype_vvvvvyp) } // the vvvvvyq function -function vvvvvyq(add_php_after_getitem_vvvvvyq,gettype_vvvvvyq) +function vvvvvyq(add_php_before_getitem_vvvvvyq,gettype_vvvvvyq) { - if (isSet(add_php_after_getitem_vvvvvyq) && add_php_after_getitem_vvvvvyq.constructor !== Array) + if (isSet(add_php_before_getitem_vvvvvyq) && add_php_before_getitem_vvvvvyq.constructor !== Array) { - var temp_vvvvvyq = add_php_after_getitem_vvvvvyq; - var add_php_after_getitem_vvvvvyq = []; - add_php_after_getitem_vvvvvyq.push(temp_vvvvvyq); + var temp_vvvvvyq = add_php_before_getitem_vvvvvyq; + var add_php_before_getitem_vvvvvyq = []; + add_php_before_getitem_vvvvvyq.push(temp_vvvvvyq); } - else if (!isSet(add_php_after_getitem_vvvvvyq)) + else if (!isSet(add_php_before_getitem_vvvvvyq)) { - var add_php_after_getitem_vvvvvyq = []; + var add_php_before_getitem_vvvvvyq = []; } - var add_php_after_getitem = add_php_after_getitem_vvvvvyq.some(add_php_after_getitem_vvvvvyq_SomeFunc); + var add_php_before_getitem = add_php_before_getitem_vvvvvyq.some(add_php_before_getitem_vvvvvyq_SomeFunc); if (isSet(gettype_vvvvvyq) && gettype_vvvvvyq.constructor !== Array) { @@ -744,38 +666,38 @@ function vvvvvyq(add_php_after_getitem_vvvvvyq,gettype_vvvvvyq) // set this function logic - if (add_php_after_getitem && gettype) + if (add_php_before_getitem && gettype) { - jQuery('#jform_php_after_getitem').closest('.control-group').show(); - if (jform_vvvvvyqvym_required) + jQuery('#jform_php_before_getitem').closest('.control-group').show(); + if (jform_vvvvvyqvyn_required) { - updateFieldRequired('php_after_getitem',0); - jQuery('#jform_php_after_getitem').prop('required','required'); - jQuery('#jform_php_after_getitem').attr('aria-required',true); - jQuery('#jform_php_after_getitem').addClass('required'); - jform_vvvvvyqvym_required = false; + updateFieldRequired('php_before_getitem',0); + jQuery('#jform_php_before_getitem').prop('required','required'); + jQuery('#jform_php_before_getitem').attr('aria-required',true); + jQuery('#jform_php_before_getitem').addClass('required'); + jform_vvvvvyqvyn_required = false; } } else { - jQuery('#jform_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvyqvym_required) + jQuery('#jform_php_before_getitem').closest('.control-group').hide(); + if (!jform_vvvvvyqvyn_required) { - updateFieldRequired('php_after_getitem',1); - jQuery('#jform_php_after_getitem').removeAttr('required'); - jQuery('#jform_php_after_getitem').removeAttr('aria-required'); - jQuery('#jform_php_after_getitem').removeClass('required'); - jform_vvvvvyqvym_required = true; + updateFieldRequired('php_before_getitem',1); + jQuery('#jform_php_before_getitem').removeAttr('required'); + jQuery('#jform_php_before_getitem').removeAttr('aria-required'); + jQuery('#jform_php_before_getitem').removeClass('required'); + jform_vvvvvyqvyn_required = true; } } } // the vvvvvyq Some function -function add_php_after_getitem_vvvvvyq_SomeFunc(add_php_after_getitem_vvvvvyq) +function add_php_before_getitem_vvvvvyq_SomeFunc(add_php_before_getitem_vvvvvyq) { // set the function logic - if (add_php_after_getitem_vvvvvyq == 1) + if (add_php_before_getitem_vvvvvyq == 1) { return true; } @@ -793,74 +715,78 @@ function gettype_vvvvvyq_SomeFunc(gettype_vvvvvyq) return false; } -// the vvvvvys function -function vvvvvys(gettype_vvvvvys) +// the vvvvvyr function +function vvvvvyr(add_php_after_getitem_vvvvvyr,gettype_vvvvvyr) { - if (isSet(gettype_vvvvvys) && gettype_vvvvvys.constructor !== Array) + if (isSet(add_php_after_getitem_vvvvvyr) && add_php_after_getitem_vvvvvyr.constructor !== Array) { - var temp_vvvvvys = gettype_vvvvvys; - var gettype_vvvvvys = []; - gettype_vvvvvys.push(temp_vvvvvys); + var temp_vvvvvyr = add_php_after_getitem_vvvvvyr; + var add_php_after_getitem_vvvvvyr = []; + add_php_after_getitem_vvvvvyr.push(temp_vvvvvyr); } - else if (!isSet(gettype_vvvvvys)) + else if (!isSet(add_php_after_getitem_vvvvvyr)) { - var gettype_vvvvvys = []; + var add_php_after_getitem_vvvvvyr = []; } - var gettype = gettype_vvvvvys.some(gettype_vvvvvys_SomeFunc); + var add_php_after_getitem = add_php_after_getitem_vvvvvyr.some(add_php_after_getitem_vvvvvyr_SomeFunc); + + if (isSet(gettype_vvvvvyr) && gettype_vvvvvyr.constructor !== Array) + { + var temp_vvvvvyr = gettype_vvvvvyr; + var gettype_vvvvvyr = []; + gettype_vvvvvyr.push(temp_vvvvvyr); + } + else if (!isSet(gettype_vvvvvyr)) + { + var gettype_vvvvvyr = []; + } + var gettype = gettype_vvvvvyr.some(gettype_vvvvvyr_SomeFunc); // set this function logic - if (gettype) + if (add_php_after_getitem && gettype) { - jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); - if (jform_vvvvvysvyn_required) + jQuery('#jform_php_after_getitem').closest('.control-group').show(); + if (jform_vvvvvyrvyo_required) { - updateFieldRequired('add_php_after_getitem',0); - jQuery('#jform_add_php_after_getitem').prop('required','required'); - jQuery('#jform_add_php_after_getitem').attr('aria-required',true); - jQuery('#jform_add_php_after_getitem').addClass('required'); - jform_vvvvvysvyn_required = false; - } - - jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); - if (jform_vvvvvysvyo_required) - { - updateFieldRequired('add_php_before_getitem',0); - jQuery('#jform_add_php_before_getitem').prop('required','required'); - jQuery('#jform_add_php_before_getitem').attr('aria-required',true); - jQuery('#jform_add_php_before_getitem').addClass('required'); - jform_vvvvvysvyo_required = false; + updateFieldRequired('php_after_getitem',0); + jQuery('#jform_php_after_getitem').prop('required','required'); + jQuery('#jform_php_after_getitem').attr('aria-required',true); + jQuery('#jform_php_after_getitem').addClass('required'); + jform_vvvvvyrvyo_required = false; } } else { - jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); - if (!jform_vvvvvysvyn_required) + jQuery('#jform_php_after_getitem').closest('.control-group').hide(); + if (!jform_vvvvvyrvyo_required) { - updateFieldRequired('add_php_after_getitem',1); - jQuery('#jform_add_php_after_getitem').removeAttr('required'); - jQuery('#jform_add_php_after_getitem').removeAttr('aria-required'); - jQuery('#jform_add_php_after_getitem').removeClass('required'); - jform_vvvvvysvyn_required = true; - } - jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); - if (!jform_vvvvvysvyo_required) - { - updateFieldRequired('add_php_before_getitem',1); - jQuery('#jform_add_php_before_getitem').removeAttr('required'); - jQuery('#jform_add_php_before_getitem').removeAttr('aria-required'); - jQuery('#jform_add_php_before_getitem').removeClass('required'); - jform_vvvvvysvyo_required = true; + updateFieldRequired('php_after_getitem',1); + jQuery('#jform_php_after_getitem').removeAttr('required'); + jQuery('#jform_php_after_getitem').removeAttr('aria-required'); + jQuery('#jform_php_after_getitem').removeClass('required'); + jform_vvvvvyrvyo_required = true; } } } -// the vvvvvys Some function -function gettype_vvvvvys_SomeFunc(gettype_vvvvvys) +// the vvvvvyr Some function +function add_php_after_getitem_vvvvvyr_SomeFunc(add_php_after_getitem_vvvvvyr) { // set the function logic - if (gettype_vvvvvys == 1 || gettype_vvvvvys == 3) + if (add_php_after_getitem_vvvvvyr == 1) + { + return true; + } + return false; +} + +// the vvvvvyr Some function +function gettype_vvvvvyr_SomeFunc(gettype_vvvvvyr) +{ + // set the function logic + if (gettype_vvvvvyr == 1 || gettype_vvvvvyr == 3) { return true; } @@ -868,20 +794,8 @@ function gettype_vvvvvys_SomeFunc(gettype_vvvvvys) } // the vvvvvyt function -function vvvvvyt(add_php_getlistquery_vvvvvyt,gettype_vvvvvyt) +function vvvvvyt(gettype_vvvvvyt) { - if (isSet(add_php_getlistquery_vvvvvyt) && add_php_getlistquery_vvvvvyt.constructor !== Array) - { - var temp_vvvvvyt = add_php_getlistquery_vvvvvyt; - var add_php_getlistquery_vvvvvyt = []; - add_php_getlistquery_vvvvvyt.push(temp_vvvvvyt); - } - else if (!isSet(add_php_getlistquery_vvvvvyt)) - { - var add_php_getlistquery_vvvvvyt = []; - } - var add_php_getlistquery = add_php_getlistquery_vvvvvyt.some(add_php_getlistquery_vvvvvyt_SomeFunc); - if (isSet(gettype_vvvvvyt) && gettype_vvvvvyt.constructor !== Array) { var temp_vvvvvyt = gettype_vvvvvyt; @@ -896,49 +810,57 @@ function vvvvvyt(add_php_getlistquery_vvvvvyt,gettype_vvvvvyt) // set this function logic - if (add_php_getlistquery && gettype) + if (gettype) { - jQuery('#jform_php_getlistquery').closest('.control-group').show(); + jQuery('#jform_add_php_after_getitem').closest('.control-group').show(); if (jform_vvvvvytvyp_required) { - updateFieldRequired('php_getlistquery',0); - jQuery('#jform_php_getlistquery').prop('required','required'); - jQuery('#jform_php_getlistquery').attr('aria-required',true); - jQuery('#jform_php_getlistquery').addClass('required'); + updateFieldRequired('add_php_after_getitem',0); + jQuery('#jform_add_php_after_getitem').prop('required','required'); + jQuery('#jform_add_php_after_getitem').attr('aria-required',true); + jQuery('#jform_add_php_after_getitem').addClass('required'); jform_vvvvvytvyp_required = false; } + jQuery('#jform_add_php_before_getitem').closest('.control-group').show(); + if (jform_vvvvvytvyq_required) + { + updateFieldRequired('add_php_before_getitem',0); + jQuery('#jform_add_php_before_getitem').prop('required','required'); + jQuery('#jform_add_php_before_getitem').attr('aria-required',true); + jQuery('#jform_add_php_before_getitem').addClass('required'); + jform_vvvvvytvyq_required = false; + } + } else { - jQuery('#jform_php_getlistquery').closest('.control-group').hide(); + jQuery('#jform_add_php_after_getitem').closest('.control-group').hide(); if (!jform_vvvvvytvyp_required) { - updateFieldRequired('php_getlistquery',1); - jQuery('#jform_php_getlistquery').removeAttr('required'); - jQuery('#jform_php_getlistquery').removeAttr('aria-required'); - jQuery('#jform_php_getlistquery').removeClass('required'); + updateFieldRequired('add_php_after_getitem',1); + jQuery('#jform_add_php_after_getitem').removeAttr('required'); + jQuery('#jform_add_php_after_getitem').removeAttr('aria-required'); + jQuery('#jform_add_php_after_getitem').removeClass('required'); jform_vvvvvytvyp_required = true; } + jQuery('#jform_add_php_before_getitem').closest('.control-group').hide(); + if (!jform_vvvvvytvyq_required) + { + updateFieldRequired('add_php_before_getitem',1); + jQuery('#jform_add_php_before_getitem').removeAttr('required'); + jQuery('#jform_add_php_before_getitem').removeAttr('aria-required'); + jQuery('#jform_add_php_before_getitem').removeClass('required'); + jform_vvvvvytvyq_required = true; + } } } -// the vvvvvyt Some function -function add_php_getlistquery_vvvvvyt_SomeFunc(add_php_getlistquery_vvvvvyt) -{ - // set the function logic - if (add_php_getlistquery_vvvvvyt == 1) - { - return true; - } - return false; -} - // the vvvvvyt Some function function gettype_vvvvvyt_SomeFunc(gettype_vvvvvyt) { // set the function logic - if (gettype_vvvvvyt == 2 || gettype_vvvvvyt == 4) + if (gettype_vvvvvyt == 1 || gettype_vvvvvyt == 3) { return true; } @@ -946,19 +868,19 @@ function gettype_vvvvvyt_SomeFunc(gettype_vvvvvyt) } // the vvvvvyu function -function vvvvvyu(add_php_before_getitems_vvvvvyu,gettype_vvvvvyu) +function vvvvvyu(add_php_getlistquery_vvvvvyu,gettype_vvvvvyu) { - if (isSet(add_php_before_getitems_vvvvvyu) && add_php_before_getitems_vvvvvyu.constructor !== Array) + if (isSet(add_php_getlistquery_vvvvvyu) && add_php_getlistquery_vvvvvyu.constructor !== Array) { - var temp_vvvvvyu = add_php_before_getitems_vvvvvyu; - var add_php_before_getitems_vvvvvyu = []; - add_php_before_getitems_vvvvvyu.push(temp_vvvvvyu); + var temp_vvvvvyu = add_php_getlistquery_vvvvvyu; + var add_php_getlistquery_vvvvvyu = []; + add_php_getlistquery_vvvvvyu.push(temp_vvvvvyu); } - else if (!isSet(add_php_before_getitems_vvvvvyu)) + else if (!isSet(add_php_getlistquery_vvvvvyu)) { - var add_php_before_getitems_vvvvvyu = []; + var add_php_getlistquery_vvvvvyu = []; } - var add_php_before_getitems = add_php_before_getitems_vvvvvyu.some(add_php_before_getitems_vvvvvyu_SomeFunc); + var add_php_getlistquery = add_php_getlistquery_vvvvvyu.some(add_php_getlistquery_vvvvvyu_SomeFunc); if (isSet(gettype_vvvvvyu) && gettype_vvvvvyu.constructor !== Array) { @@ -974,38 +896,38 @@ function vvvvvyu(add_php_before_getitems_vvvvvyu,gettype_vvvvvyu) // set this function logic - if (add_php_before_getitems && gettype) + if (add_php_getlistquery && gettype) { - jQuery('#jform_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvyuvyq_required) + jQuery('#jform_php_getlistquery').closest('.control-group').show(); + if (jform_vvvvvyuvyr_required) { - updateFieldRequired('php_before_getitems',0); - jQuery('#jform_php_before_getitems').prop('required','required'); - jQuery('#jform_php_before_getitems').attr('aria-required',true); - jQuery('#jform_php_before_getitems').addClass('required'); - jform_vvvvvyuvyq_required = false; + updateFieldRequired('php_getlistquery',0); + jQuery('#jform_php_getlistquery').prop('required','required'); + jQuery('#jform_php_getlistquery').attr('aria-required',true); + jQuery('#jform_php_getlistquery').addClass('required'); + jform_vvvvvyuvyr_required = false; } } else { - jQuery('#jform_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvyuvyq_required) + jQuery('#jform_php_getlistquery').closest('.control-group').hide(); + if (!jform_vvvvvyuvyr_required) { - updateFieldRequired('php_before_getitems',1); - jQuery('#jform_php_before_getitems').removeAttr('required'); - jQuery('#jform_php_before_getitems').removeAttr('aria-required'); - jQuery('#jform_php_before_getitems').removeClass('required'); - jform_vvvvvyuvyq_required = true; + updateFieldRequired('php_getlistquery',1); + jQuery('#jform_php_getlistquery').removeAttr('required'); + jQuery('#jform_php_getlistquery').removeAttr('aria-required'); + jQuery('#jform_php_getlistquery').removeClass('required'); + jform_vvvvvyuvyr_required = true; } } } // the vvvvvyu Some function -function add_php_before_getitems_vvvvvyu_SomeFunc(add_php_before_getitems_vvvvvyu) +function add_php_getlistquery_vvvvvyu_SomeFunc(add_php_getlistquery_vvvvvyu) { // set the function logic - if (add_php_before_getitems_vvvvvyu == 1) + if (add_php_getlistquery_vvvvvyu == 1) { return true; } @@ -1024,19 +946,19 @@ function gettype_vvvvvyu_SomeFunc(gettype_vvvvvyu) } // the vvvvvyv function -function vvvvvyv(add_php_after_getitems_vvvvvyv,gettype_vvvvvyv) +function vvvvvyv(add_php_before_getitems_vvvvvyv,gettype_vvvvvyv) { - if (isSet(add_php_after_getitems_vvvvvyv) && add_php_after_getitems_vvvvvyv.constructor !== Array) + if (isSet(add_php_before_getitems_vvvvvyv) && add_php_before_getitems_vvvvvyv.constructor !== Array) { - var temp_vvvvvyv = add_php_after_getitems_vvvvvyv; - var add_php_after_getitems_vvvvvyv = []; - add_php_after_getitems_vvvvvyv.push(temp_vvvvvyv); + var temp_vvvvvyv = add_php_before_getitems_vvvvvyv; + var add_php_before_getitems_vvvvvyv = []; + add_php_before_getitems_vvvvvyv.push(temp_vvvvvyv); } - else if (!isSet(add_php_after_getitems_vvvvvyv)) + else if (!isSet(add_php_before_getitems_vvvvvyv)) { - var add_php_after_getitems_vvvvvyv = []; + var add_php_before_getitems_vvvvvyv = []; } - var add_php_after_getitems = add_php_after_getitems_vvvvvyv.some(add_php_after_getitems_vvvvvyv_SomeFunc); + var add_php_before_getitems = add_php_before_getitems_vvvvvyv.some(add_php_before_getitems_vvvvvyv_SomeFunc); if (isSet(gettype_vvvvvyv) && gettype_vvvvvyv.constructor !== Array) { @@ -1052,38 +974,38 @@ function vvvvvyv(add_php_after_getitems_vvvvvyv,gettype_vvvvvyv) // set this function logic - if (add_php_after_getitems && gettype) + if (add_php_before_getitems && gettype) { - jQuery('#jform_php_after_getitems').closest('.control-group').show(); - if (jform_vvvvvyvvyr_required) + jQuery('#jform_php_before_getitems').closest('.control-group').show(); + if (jform_vvvvvyvvys_required) { - updateFieldRequired('php_after_getitems',0); - jQuery('#jform_php_after_getitems').prop('required','required'); - jQuery('#jform_php_after_getitems').attr('aria-required',true); - jQuery('#jform_php_after_getitems').addClass('required'); - jform_vvvvvyvvyr_required = false; + updateFieldRequired('php_before_getitems',0); + jQuery('#jform_php_before_getitems').prop('required','required'); + jQuery('#jform_php_before_getitems').attr('aria-required',true); + jQuery('#jform_php_before_getitems').addClass('required'); + jform_vvvvvyvvys_required = false; } } else { - jQuery('#jform_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvyvvyr_required) + jQuery('#jform_php_before_getitems').closest('.control-group').hide(); + if (!jform_vvvvvyvvys_required) { - updateFieldRequired('php_after_getitems',1); - jQuery('#jform_php_after_getitems').removeAttr('required'); - jQuery('#jform_php_after_getitems').removeAttr('aria-required'); - jQuery('#jform_php_after_getitems').removeClass('required'); - jform_vvvvvyvvyr_required = true; + updateFieldRequired('php_before_getitems',1); + jQuery('#jform_php_before_getitems').removeAttr('required'); + jQuery('#jform_php_before_getitems').removeAttr('aria-required'); + jQuery('#jform_php_before_getitems').removeClass('required'); + jform_vvvvvyvvys_required = true; } } } // the vvvvvyv Some function -function add_php_after_getitems_vvvvvyv_SomeFunc(add_php_after_getitems_vvvvvyv) +function add_php_before_getitems_vvvvvyv_SomeFunc(add_php_before_getitems_vvvvvyv) { // set the function logic - if (add_php_after_getitems_vvvvvyv == 1) + if (add_php_before_getitems_vvvvvyv == 1) { return true; } @@ -1101,93 +1023,78 @@ function gettype_vvvvvyv_SomeFunc(gettype_vvvvvyv) return false; } -// the vvvvvyx function -function vvvvvyx(gettype_vvvvvyx) +// the vvvvvyw function +function vvvvvyw(add_php_after_getitems_vvvvvyw,gettype_vvvvvyw) { - if (isSet(gettype_vvvvvyx) && gettype_vvvvvyx.constructor !== Array) + if (isSet(add_php_after_getitems_vvvvvyw) && add_php_after_getitems_vvvvvyw.constructor !== Array) { - var temp_vvvvvyx = gettype_vvvvvyx; - var gettype_vvvvvyx = []; - gettype_vvvvvyx.push(temp_vvvvvyx); + var temp_vvvvvyw = add_php_after_getitems_vvvvvyw; + var add_php_after_getitems_vvvvvyw = []; + add_php_after_getitems_vvvvvyw.push(temp_vvvvvyw); } - else if (!isSet(gettype_vvvvvyx)) + else if (!isSet(add_php_after_getitems_vvvvvyw)) { - var gettype_vvvvvyx = []; + var add_php_after_getitems_vvvvvyw = []; } - var gettype = gettype_vvvvvyx.some(gettype_vvvvvyx_SomeFunc); + var add_php_after_getitems = add_php_after_getitems_vvvvvyw.some(add_php_after_getitems_vvvvvyw_SomeFunc); + + if (isSet(gettype_vvvvvyw) && gettype_vvvvvyw.constructor !== Array) + { + var temp_vvvvvyw = gettype_vvvvvyw; + var gettype_vvvvvyw = []; + gettype_vvvvvyw.push(temp_vvvvvyw); + } + else if (!isSet(gettype_vvvvvyw)) + { + var gettype_vvvvvyw = []; + } + var gettype = gettype_vvvvvyw.some(gettype_vvvvvyw_SomeFunc); // set this function logic - if (gettype) + if (add_php_after_getitems && gettype) { - jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); - if (jform_vvvvvyxvys_required) + jQuery('#jform_php_after_getitems').closest('.control-group').show(); + if (jform_vvvvvywvyt_required) { - updateFieldRequired('add_php_after_getitems',0); - jQuery('#jform_add_php_after_getitems').prop('required','required'); - jQuery('#jform_add_php_after_getitems').attr('aria-required',true); - jQuery('#jform_add_php_after_getitems').addClass('required'); - jform_vvvvvyxvys_required = false; - } - - jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); - if (jform_vvvvvyxvyt_required) - { - updateFieldRequired('add_php_before_getitems',0); - jQuery('#jform_add_php_before_getitems').prop('required','required'); - jQuery('#jform_add_php_before_getitems').attr('aria-required',true); - jQuery('#jform_add_php_before_getitems').addClass('required'); - jform_vvvvvyxvyt_required = false; - } - - jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); - if (jform_vvvvvyxvyu_required) - { - updateFieldRequired('add_php_getlistquery',0); - jQuery('#jform_add_php_getlistquery').prop('required','required'); - jQuery('#jform_add_php_getlistquery').attr('aria-required',true); - jQuery('#jform_add_php_getlistquery').addClass('required'); - jform_vvvvvyxvyu_required = false; + updateFieldRequired('php_after_getitems',0); + jQuery('#jform_php_after_getitems').prop('required','required'); + jQuery('#jform_php_after_getitems').attr('aria-required',true); + jQuery('#jform_php_after_getitems').addClass('required'); + jform_vvvvvywvyt_required = false; } } else { - jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); - if (!jform_vvvvvyxvys_required) + jQuery('#jform_php_after_getitems').closest('.control-group').hide(); + if (!jform_vvvvvywvyt_required) { - updateFieldRequired('add_php_after_getitems',1); - jQuery('#jform_add_php_after_getitems').removeAttr('required'); - jQuery('#jform_add_php_after_getitems').removeAttr('aria-required'); - jQuery('#jform_add_php_after_getitems').removeClass('required'); - jform_vvvvvyxvys_required = true; - } - jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); - if (!jform_vvvvvyxvyt_required) - { - updateFieldRequired('add_php_before_getitems',1); - jQuery('#jform_add_php_before_getitems').removeAttr('required'); - jQuery('#jform_add_php_before_getitems').removeAttr('aria-required'); - jQuery('#jform_add_php_before_getitems').removeClass('required'); - jform_vvvvvyxvyt_required = true; - } - jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); - if (!jform_vvvvvyxvyu_required) - { - updateFieldRequired('add_php_getlistquery',1); - jQuery('#jform_add_php_getlistquery').removeAttr('required'); - jQuery('#jform_add_php_getlistquery').removeAttr('aria-required'); - jQuery('#jform_add_php_getlistquery').removeClass('required'); - jform_vvvvvyxvyu_required = true; + updateFieldRequired('php_after_getitems',1); + jQuery('#jform_php_after_getitems').removeAttr('required'); + jQuery('#jform_php_after_getitems').removeAttr('aria-required'); + jQuery('#jform_php_after_getitems').removeClass('required'); + jform_vvvvvywvyt_required = true; } } } -// the vvvvvyx Some function -function gettype_vvvvvyx_SomeFunc(gettype_vvvvvyx) +// the vvvvvyw Some function +function add_php_after_getitems_vvvvvyw_SomeFunc(add_php_after_getitems_vvvvvyw) { // set the function logic - if (gettype_vvvvvyx == 2 || gettype_vvvvvyx == 4) + if (add_php_after_getitems_vvvvvyw == 1) + { + return true; + } + return false; +} + +// the vvvvvyw Some function +function gettype_vvvvvyw_SomeFunc(gettype_vvvvvyw) +{ + // set the function logic + if (gettype_vvvvvyw == 2 || gettype_vvvvvyw == 4) { return true; } @@ -1213,28 +1120,66 @@ function vvvvvyy(gettype_vvvvvyy) // set this function logic if (gettype) { - jQuery('#jform_pagination').closest('.control-group').show(); + jQuery('#jform_add_php_after_getitems').closest('.control-group').show(); + if (jform_vvvvvyyvyu_required) + { + updateFieldRequired('add_php_after_getitems',0); + jQuery('#jform_add_php_after_getitems').prop('required','required'); + jQuery('#jform_add_php_after_getitems').attr('aria-required',true); + jQuery('#jform_add_php_after_getitems').addClass('required'); + jform_vvvvvyyvyu_required = false; + } + + jQuery('#jform_add_php_before_getitems').closest('.control-group').show(); if (jform_vvvvvyyvyv_required) { - updateFieldRequired('pagination',0); - jQuery('#jform_pagination').prop('required','required'); - jQuery('#jform_pagination').attr('aria-required',true); - jQuery('#jform_pagination').addClass('required'); + updateFieldRequired('add_php_before_getitems',0); + jQuery('#jform_add_php_before_getitems').prop('required','required'); + jQuery('#jform_add_php_before_getitems').attr('aria-required',true); + jQuery('#jform_add_php_before_getitems').addClass('required'); jform_vvvvvyyvyv_required = false; } + jQuery('#jform_add_php_getlistquery').closest('.control-group').show(); + if (jform_vvvvvyyvyw_required) + { + updateFieldRequired('add_php_getlistquery',0); + jQuery('#jform_add_php_getlistquery').prop('required','required'); + jQuery('#jform_add_php_getlistquery').attr('aria-required',true); + jQuery('#jform_add_php_getlistquery').addClass('required'); + jform_vvvvvyyvyw_required = false; + } + } else { - jQuery('#jform_pagination').closest('.control-group').hide(); + jQuery('#jform_add_php_after_getitems').closest('.control-group').hide(); + if (!jform_vvvvvyyvyu_required) + { + updateFieldRequired('add_php_after_getitems',1); + jQuery('#jform_add_php_after_getitems').removeAttr('required'); + jQuery('#jform_add_php_after_getitems').removeAttr('aria-required'); + jQuery('#jform_add_php_after_getitems').removeClass('required'); + jform_vvvvvyyvyu_required = true; + } + jQuery('#jform_add_php_before_getitems').closest('.control-group').hide(); if (!jform_vvvvvyyvyv_required) { - updateFieldRequired('pagination',1); - jQuery('#jform_pagination').removeAttr('required'); - jQuery('#jform_pagination').removeAttr('aria-required'); - jQuery('#jform_pagination').removeClass('required'); + updateFieldRequired('add_php_before_getitems',1); + jQuery('#jform_add_php_before_getitems').removeAttr('required'); + jQuery('#jform_add_php_before_getitems').removeAttr('aria-required'); + jQuery('#jform_add_php_before_getitems').removeClass('required'); jform_vvvvvyyvyv_required = true; } + jQuery('#jform_add_php_getlistquery').closest('.control-group').hide(); + if (!jform_vvvvvyyvyw_required) + { + updateFieldRequired('add_php_getlistquery',1); + jQuery('#jform_add_php_getlistquery').removeAttr('required'); + jQuery('#jform_add_php_getlistquery').removeAttr('aria-required'); + jQuery('#jform_add_php_getlistquery').removeClass('required'); + jform_vvvvvyyvyw_required = true; + } } } @@ -1242,7 +1187,62 @@ function vvvvvyy(gettype_vvvvvyy) function gettype_vvvvvyy_SomeFunc(gettype_vvvvvyy) { // set the function logic - if (gettype_vvvvvyy == 2) + if (gettype_vvvvvyy == 2 || gettype_vvvvvyy == 4) + { + return true; + } + return false; +} + +// the vvvvvyz function +function vvvvvyz(gettype_vvvvvyz) +{ + if (isSet(gettype_vvvvvyz) && gettype_vvvvvyz.constructor !== Array) + { + var temp_vvvvvyz = gettype_vvvvvyz; + var gettype_vvvvvyz = []; + gettype_vvvvvyz.push(temp_vvvvvyz); + } + else if (!isSet(gettype_vvvvvyz)) + { + var gettype_vvvvvyz = []; + } + var gettype = gettype_vvvvvyz.some(gettype_vvvvvyz_SomeFunc); + + + // set this function logic + if (gettype) + { + jQuery('#jform_pagination').closest('.control-group').show(); + if (jform_vvvvvyzvyx_required) + { + updateFieldRequired('pagination',0); + jQuery('#jform_pagination').prop('required','required'); + jQuery('#jform_pagination').attr('aria-required',true); + jQuery('#jform_pagination').addClass('required'); + jform_vvvvvyzvyx_required = false; + } + + } + else + { + jQuery('#jform_pagination').closest('.control-group').hide(); + if (!jform_vvvvvyzvyx_required) + { + updateFieldRequired('pagination',1); + jQuery('#jform_pagination').removeAttr('required'); + jQuery('#jform_pagination').removeAttr('aria-required'); + jQuery('#jform_pagination').removeClass('required'); + jform_vvvvvyzvyx_required = true; + } + } +} + +// the vvvvvyz Some function +function gettype_vvvvvyz_SomeFunc(gettype_vvvvvyz) +{ + // set the function logic + if (gettype_vvvvvyz == 2) { return true; } diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js index 342b0de6b..a0ff7ddea 100644 --- a/admin/models/forms/field.js +++ b/admin/models/forms/field.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.js @@ -24,151 +24,96 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvyzvyw_required = false; -jform_vvvvvzavyx_required = false; -jform_vvvvvzbvyy_required = false; -jform_vvvvvzcvyz_required = false; -jform_vvvvvzfvza_required = false; -jform_vvvvvzgvzb_required = false; -jform_vvvvvzhvzc_required = false; -jform_vvvvvzivzd_required = false; +jform_vvvvvzavyy_required = false; +jform_vvvvvzbvyz_required = false; +jform_vvvvvzcvza_required = false; +jform_vvvvvzdvzb_required = false; +jform_vvvvvzgvzc_required = false; +jform_vvvvvzhvzd_required = false; +jform_vvvvvzivze_required = false; +jform_vvvvvzjvzf_required = false; // Initial Script jQuery(document).ready(function() { - var datalenght_vvvvvyz = jQuery("#jform_datalenght").val(); - vvvvvyz(datalenght_vvvvvyz); + var datalenght_vvvvvza = jQuery("#jform_datalenght").val(); + vvvvvza(datalenght_vvvvvza); - var datadefault_vvvvvza = jQuery("#jform_datadefault").val(); - vvvvvza(datadefault_vvvvvza); - - var datatype_vvvvvzb = jQuery("#jform_datatype").val(); - vvvvvzb(datatype_vvvvvzb); + var datadefault_vvvvvzb = jQuery("#jform_datadefault").val(); + vvvvvzb(datadefault_vvvvvzb); var datatype_vvvvvzc = jQuery("#jform_datatype").val(); vvvvvzc(datatype_vvvvvzc); - var store_vvvvvzd = jQuery("#jform_store").val(); var datatype_vvvvvzd = jQuery("#jform_datatype").val(); - vvvvvzd(store_vvvvvzd,datatype_vvvvvzd); + vvvvvzd(datatype_vvvvvzd); - var add_css_view_vvvvvzf = jQuery("#jform_add_css_view input[type='radio']:checked").val(); - vvvvvzf(add_css_view_vvvvvzf); + var store_vvvvvze = jQuery("#jform_store").val(); + var datatype_vvvvvze = jQuery("#jform_datatype").val(); + vvvvvze(store_vvvvvze,datatype_vvvvvze); - var add_css_views_vvvvvzg = jQuery("#jform_add_css_views input[type='radio']:checked").val(); - vvvvvzg(add_css_views_vvvvvzg); + var add_css_view_vvvvvzg = jQuery("#jform_add_css_view input[type='radio']:checked").val(); + vvvvvzg(add_css_view_vvvvvzg); - var add_javascript_view_footer_vvvvvzh = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); - vvvvvzh(add_javascript_view_footer_vvvvvzh); + var add_css_views_vvvvvzh = jQuery("#jform_add_css_views input[type='radio']:checked").val(); + vvvvvzh(add_css_views_vvvvvzh); - var add_javascript_views_footer_vvvvvzi = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); - vvvvvzi(add_javascript_views_footer_vvvvvzi); + var add_javascript_view_footer_vvvvvzi = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val(); + vvvvvzi(add_javascript_view_footer_vvvvvzi); + + var add_javascript_views_footer_vvvvvzj = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val(); + vvvvvzj(add_javascript_views_footer_vvvvvzj); }); -// the vvvvvyz function -function vvvvvyz(datalenght_vvvvvyz) +// the vvvvvza function +function vvvvvza(datalenght_vvvvvza) { - if (isSet(datalenght_vvvvvyz) && datalenght_vvvvvyz.constructor !== Array) + if (isSet(datalenght_vvvvvza) && datalenght_vvvvvza.constructor !== Array) { - var temp_vvvvvyz = datalenght_vvvvvyz; - var datalenght_vvvvvyz = []; - datalenght_vvvvvyz.push(temp_vvvvvyz); + var temp_vvvvvza = datalenght_vvvvvza; + var datalenght_vvvvvza = []; + datalenght_vvvvvza.push(temp_vvvvvza); } - else if (!isSet(datalenght_vvvvvyz)) + else if (!isSet(datalenght_vvvvvza)) { - var datalenght_vvvvvyz = []; + var datalenght_vvvvvza = []; } - var datalenght = datalenght_vvvvvyz.some(datalenght_vvvvvyz_SomeFunc); + var datalenght = datalenght_vvvvvza.some(datalenght_vvvvvza_SomeFunc); // set this function logic if (datalenght) { jQuery('#jform_datalenght_other').closest('.control-group').show(); - if (jform_vvvvvyzvyw_required) + if (jform_vvvvvzavyy_required) { updateFieldRequired('datalenght_other',0); jQuery('#jform_datalenght_other').prop('required','required'); jQuery('#jform_datalenght_other').attr('aria-required',true); jQuery('#jform_datalenght_other').addClass('required'); - jform_vvvvvyzvyw_required = false; + jform_vvvvvzavyy_required = false; } } else { jQuery('#jform_datalenght_other').closest('.control-group').hide(); - if (!jform_vvvvvyzvyw_required) + if (!jform_vvvvvzavyy_required) { updateFieldRequired('datalenght_other',1); jQuery('#jform_datalenght_other').removeAttr('required'); jQuery('#jform_datalenght_other').removeAttr('aria-required'); jQuery('#jform_datalenght_other').removeClass('required'); - jform_vvvvvyzvyw_required = true; - } - } -} - -// the vvvvvyz Some function -function datalenght_vvvvvyz_SomeFunc(datalenght_vvvvvyz) -{ - // set the function logic - if (datalenght_vvvvvyz == 'Other') - { - return true; - } - return false; -} - -// the vvvvvza function -function vvvvvza(datadefault_vvvvvza) -{ - if (isSet(datadefault_vvvvvza) && datadefault_vvvvvza.constructor !== Array) - { - var temp_vvvvvza = datadefault_vvvvvza; - var datadefault_vvvvvza = []; - datadefault_vvvvvza.push(temp_vvvvvza); - } - else if (!isSet(datadefault_vvvvvza)) - { - var datadefault_vvvvvza = []; - } - var datadefault = datadefault_vvvvvza.some(datadefault_vvvvvza_SomeFunc); - - - // set this function logic - if (datadefault) - { - jQuery('#jform_datadefault_other').closest('.control-group').show(); - if (jform_vvvvvzavyx_required) - { - updateFieldRequired('datadefault_other',0); - jQuery('#jform_datadefault_other').prop('required','required'); - jQuery('#jform_datadefault_other').attr('aria-required',true); - jQuery('#jform_datadefault_other').addClass('required'); - jform_vvvvvzavyx_required = false; - } - - } - else - { - jQuery('#jform_datadefault_other').closest('.control-group').hide(); - if (!jform_vvvvvzavyx_required) - { - updateFieldRequired('datadefault_other',1); - jQuery('#jform_datadefault_other').removeAttr('required'); - jQuery('#jform_datadefault_other').removeAttr('aria-required'); - jQuery('#jform_datadefault_other').removeClass('required'); - jform_vvvvvzavyx_required = true; + jform_vvvvvzavyy_required = true; } } } // the vvvvvza Some function -function datadefault_vvvvvza_SomeFunc(datadefault_vvvvvza) +function datalenght_vvvvvza_SomeFunc(datalenght_vvvvvza) { // set the function logic - if (datadefault_vvvvvza == 'Other') + if (datalenght_vvvvvza == 'Other') { return true; } @@ -176,58 +121,54 @@ function datadefault_vvvvvza_SomeFunc(datadefault_vvvvvza) } // the vvvvvzb function -function vvvvvzb(datatype_vvvvvzb) +function vvvvvzb(datadefault_vvvvvzb) { - if (isSet(datatype_vvvvvzb) && datatype_vvvvvzb.constructor !== Array) + if (isSet(datadefault_vvvvvzb) && datadefault_vvvvvzb.constructor !== Array) { - var temp_vvvvvzb = datatype_vvvvvzb; - var datatype_vvvvvzb = []; - datatype_vvvvvzb.push(temp_vvvvvzb); + var temp_vvvvvzb = datadefault_vvvvvzb; + var datadefault_vvvvvzb = []; + datadefault_vvvvvzb.push(temp_vvvvvzb); } - else if (!isSet(datatype_vvvvvzb)) + else if (!isSet(datadefault_vvvvvzb)) { - var datatype_vvvvvzb = []; + var datadefault_vvvvvzb = []; } - var datatype = datatype_vvvvvzb.some(datatype_vvvvvzb_SomeFunc); + var datadefault = datadefault_vvvvvzb.some(datadefault_vvvvvzb_SomeFunc); // set this function logic - if (datatype) + if (datadefault) { - jQuery('#jform_datadefault').closest('.control-group').show(); - jQuery('#jform_datalenght').closest('.control-group').show(); - jQuery('#jform_indexes').closest('.control-group').show(); - if (jform_vvvvvzbvyy_required) + jQuery('#jform_datadefault_other').closest('.control-group').show(); + if (jform_vvvvvzbvyz_required) { - updateFieldRequired('indexes',0); - jQuery('#jform_indexes').prop('required','required'); - jQuery('#jform_indexes').attr('aria-required',true); - jQuery('#jform_indexes').addClass('required'); - jform_vvvvvzbvyy_required = false; + updateFieldRequired('datadefault_other',0); + jQuery('#jform_datadefault_other').prop('required','required'); + jQuery('#jform_datadefault_other').attr('aria-required',true); + jQuery('#jform_datadefault_other').addClass('required'); + jform_vvvvvzbvyz_required = false; } } else { - jQuery('#jform_datadefault').closest('.control-group').hide(); - jQuery('#jform_datalenght').closest('.control-group').hide(); - jQuery('#jform_indexes').closest('.control-group').hide(); - if (!jform_vvvvvzbvyy_required) + jQuery('#jform_datadefault_other').closest('.control-group').hide(); + if (!jform_vvvvvzbvyz_required) { - updateFieldRequired('indexes',1); - jQuery('#jform_indexes').removeAttr('required'); - jQuery('#jform_indexes').removeAttr('aria-required'); - jQuery('#jform_indexes').removeClass('required'); - jform_vvvvvzbvyy_required = true; + updateFieldRequired('datadefault_other',1); + jQuery('#jform_datadefault_other').removeAttr('required'); + jQuery('#jform_datadefault_other').removeAttr('aria-required'); + jQuery('#jform_datadefault_other').removeClass('required'); + jform_vvvvvzbvyz_required = true; } } } // the vvvvvzb Some function -function datatype_vvvvvzb_SomeFunc(datatype_vvvvvzb) +function datadefault_vvvvvzb_SomeFunc(datadefault_vvvvvzb) { // set the function logic - if (datatype_vvvvvzb == 'CHAR' || datatype_vvvvvzb == 'VARCHAR' || datatype_vvvvvzb == 'DATETIME' || datatype_vvvvvzb == 'DATE' || datatype_vvvvvzb == 'TIME' || datatype_vvvvvzb == 'INT' || datatype_vvvvvzb == 'TINYINT' || datatype_vvvvvzb == 'BIGINT' || datatype_vvvvvzb == 'FLOAT' || datatype_vvvvvzb == 'DECIMAL' || datatype_vvvvvzb == 'DOUBLE') + if (datadefault_vvvvvzb == 'Other') { return true; } @@ -253,27 +194,31 @@ function vvvvvzc(datatype_vvvvvzc) // set this function logic if (datatype) { - jQuery('#jform_store').closest('.control-group').show(); - if (jform_vvvvvzcvyz_required) + jQuery('#jform_datadefault').closest('.control-group').show(); + jQuery('#jform_datalenght').closest('.control-group').show(); + jQuery('#jform_indexes').closest('.control-group').show(); + if (jform_vvvvvzcvza_required) { - updateFieldRequired('store',0); - jQuery('#jform_store').prop('required','required'); - jQuery('#jform_store').attr('aria-required',true); - jQuery('#jform_store').addClass('required'); - jform_vvvvvzcvyz_required = false; + updateFieldRequired('indexes',0); + jQuery('#jform_indexes').prop('required','required'); + jQuery('#jform_indexes').attr('aria-required',true); + jQuery('#jform_indexes').addClass('required'); + jform_vvvvvzcvza_required = false; } } else { - jQuery('#jform_store').closest('.control-group').hide(); - if (!jform_vvvvvzcvyz_required) + jQuery('#jform_datadefault').closest('.control-group').hide(); + jQuery('#jform_datalenght').closest('.control-group').hide(); + jQuery('#jform_indexes').closest('.control-group').hide(); + if (!jform_vvvvvzcvza_required) { - updateFieldRequired('store',1); - jQuery('#jform_store').removeAttr('required'); - jQuery('#jform_store').removeAttr('aria-required'); - jQuery('#jform_store').removeClass('required'); - jform_vvvvvzcvyz_required = true; + updateFieldRequired('indexes',1); + jQuery('#jform_indexes').removeAttr('required'); + jQuery('#jform_indexes').removeAttr('aria-required'); + jQuery('#jform_indexes').removeClass('required'); + jform_vvvvvzcvza_required = true; } } } @@ -282,7 +227,7 @@ function vvvvvzc(datatype_vvvvvzc) function datatype_vvvvvzc_SomeFunc(datatype_vvvvvzc) { // set the function logic - if (datatype_vvvvvzc == 'CHAR' || datatype_vvvvvzc == 'VARCHAR' || datatype_vvvvvzc == 'TEXT' || datatype_vvvvvzc == 'MEDIUMTEXT' || datatype_vvvvvzc == 'LONGTEXT') + if (datatype_vvvvvzc == 'CHAR' || datatype_vvvvvzc == 'VARCHAR' || datatype_vvvvvzc == 'DATETIME' || datatype_vvvvvzc == 'DATE' || datatype_vvvvvzc == 'TIME' || datatype_vvvvvzc == 'INT' || datatype_vvvvvzc == 'TINYINT' || datatype_vvvvvzc == 'BIGINT' || datatype_vvvvvzc == 'FLOAT' || datatype_vvvvvzc == 'DECIMAL' || datatype_vvvvvzc == 'DOUBLE') { return true; } @@ -290,20 +235,8 @@ function datatype_vvvvvzc_SomeFunc(datatype_vvvvvzc) } // the vvvvvzd function -function vvvvvzd(store_vvvvvzd,datatype_vvvvvzd) +function vvvvvzd(datatype_vvvvvzd) { - if (isSet(store_vvvvvzd) && store_vvvvvzd.constructor !== Array) - { - var temp_vvvvvzd = store_vvvvvzd; - var store_vvvvvzd = []; - store_vvvvvzd.push(temp_vvvvvzd); - } - else if (!isSet(store_vvvvvzd)) - { - var store_vvvvvzd = []; - } - var store = store_vvvvvzd.some(store_vvvvvzd_SomeFunc); - if (isSet(datatype_vvvvvzd) && datatype_vvvvvzd.constructor !== Array) { var temp_vvvvvzd = datatype_vvvvvzd; @@ -318,27 +251,33 @@ function vvvvvzd(store_vvvvvzd,datatype_vvvvvzd) // set this function logic - if (store && datatype) + if (datatype) { - jQuery('.note_vdm_encryption').closest('.control-group').show(); + jQuery('#jform_store').closest('.control-group').show(); + if (jform_vvvvvzdvzb_required) + { + updateFieldRequired('store',0); + jQuery('#jform_store').prop('required','required'); + jQuery('#jform_store').attr('aria-required',true); + jQuery('#jform_store').addClass('required'); + jform_vvvvvzdvzb_required = false; + } + } else { - jQuery('.note_vdm_encryption').closest('.control-group').hide(); + jQuery('#jform_store').closest('.control-group').hide(); + if (!jform_vvvvvzdvzb_required) + { + updateFieldRequired('store',1); + jQuery('#jform_store').removeAttr('required'); + jQuery('#jform_store').removeAttr('aria-required'); + jQuery('#jform_store').removeClass('required'); + jform_vvvvvzdvzb_required = true; + } } } -// the vvvvvzd Some function -function store_vvvvvzd_SomeFunc(store_vvvvvzd) -{ - // set the function logic - if (store_vvvvvzd == 4) - { - return true; - } - return false; -} - // the vvvvvzd Some function function datatype_vvvvvzd_SomeFunc(datatype_vvvvvzd) { @@ -350,126 +289,187 @@ function datatype_vvvvvzd_SomeFunc(datatype_vvvvvzd) return false; } -// the vvvvvzf function -function vvvvvzf(add_css_view_vvvvvzf) +// the vvvvvze function +function vvvvvze(store_vvvvvze,datatype_vvvvvze) +{ + if (isSet(store_vvvvvze) && store_vvvvvze.constructor !== Array) + { + var temp_vvvvvze = store_vvvvvze; + var store_vvvvvze = []; + store_vvvvvze.push(temp_vvvvvze); + } + else if (!isSet(store_vvvvvze)) + { + var store_vvvvvze = []; + } + var store = store_vvvvvze.some(store_vvvvvze_SomeFunc); + + if (isSet(datatype_vvvvvze) && datatype_vvvvvze.constructor !== Array) + { + var temp_vvvvvze = datatype_vvvvvze; + var datatype_vvvvvze = []; + datatype_vvvvvze.push(temp_vvvvvze); + } + else if (!isSet(datatype_vvvvvze)) + { + var datatype_vvvvvze = []; + } + var datatype = datatype_vvvvvze.some(datatype_vvvvvze_SomeFunc); + + + // set this function logic + if (store && datatype) + { + jQuery('.note_vdm_encryption').closest('.control-group').show(); + } + else + { + jQuery('.note_vdm_encryption').closest('.control-group').hide(); + } +} + +// the vvvvvze Some function +function store_vvvvvze_SomeFunc(store_vvvvvze) { // set the function logic - if (add_css_view_vvvvvzf == 1) + if (store_vvvvvze == 4) + { + return true; + } + return false; +} + +// the vvvvvze Some function +function datatype_vvvvvze_SomeFunc(datatype_vvvvvze) +{ + // set the function logic + if (datatype_vvvvvze == 'CHAR' || datatype_vvvvvze == 'VARCHAR' || datatype_vvvvvze == 'TEXT' || datatype_vvvvvze == 'MEDIUMTEXT' || datatype_vvvvvze == 'LONGTEXT') + { + return true; + } + return false; +} + +// the vvvvvzg function +function vvvvvzg(add_css_view_vvvvvzg) +{ + // set the function logic + if (add_css_view_vvvvvzg == 1) { jQuery('#jform_css_view').closest('.control-group').show(); - if (jform_vvvvvzfvza_required) + if (jform_vvvvvzgvzc_required) { updateFieldRequired('css_view',0); jQuery('#jform_css_view').prop('required','required'); jQuery('#jform_css_view').attr('aria-required',true); jQuery('#jform_css_view').addClass('required'); - jform_vvvvvzfvza_required = false; + jform_vvvvvzgvzc_required = false; } } else { jQuery('#jform_css_view').closest('.control-group').hide(); - if (!jform_vvvvvzfvza_required) + if (!jform_vvvvvzgvzc_required) { updateFieldRequired('css_view',1); jQuery('#jform_css_view').removeAttr('required'); jQuery('#jform_css_view').removeAttr('aria-required'); jQuery('#jform_css_view').removeClass('required'); - jform_vvvvvzfvza_required = true; + jform_vvvvvzgvzc_required = true; } } } -// the vvvvvzg function -function vvvvvzg(add_css_views_vvvvvzg) +// the vvvvvzh function +function vvvvvzh(add_css_views_vvvvvzh) { // set the function logic - if (add_css_views_vvvvvzg == 1) + if (add_css_views_vvvvvzh == 1) { jQuery('#jform_css_views').closest('.control-group').show(); - if (jform_vvvvvzgvzb_required) + if (jform_vvvvvzhvzd_required) { updateFieldRequired('css_views',0); jQuery('#jform_css_views').prop('required','required'); jQuery('#jform_css_views').attr('aria-required',true); jQuery('#jform_css_views').addClass('required'); - jform_vvvvvzgvzb_required = false; + jform_vvvvvzhvzd_required = false; } } else { jQuery('#jform_css_views').closest('.control-group').hide(); - if (!jform_vvvvvzgvzb_required) + if (!jform_vvvvvzhvzd_required) { updateFieldRequired('css_views',1); jQuery('#jform_css_views').removeAttr('required'); jQuery('#jform_css_views').removeAttr('aria-required'); jQuery('#jform_css_views').removeClass('required'); - jform_vvvvvzgvzb_required = true; + jform_vvvvvzhvzd_required = true; } } } -// the vvvvvzh function -function vvvvvzh(add_javascript_view_footer_vvvvvzh) +// the vvvvvzi function +function vvvvvzi(add_javascript_view_footer_vvvvvzi) { // set the function logic - if (add_javascript_view_footer_vvvvvzh == 1) + if (add_javascript_view_footer_vvvvvzi == 1) { jQuery('#jform_javascript_view_footer').closest('.control-group').show(); - if (jform_vvvvvzhvzc_required) + if (jform_vvvvvzivze_required) { updateFieldRequired('javascript_view_footer',0); jQuery('#jform_javascript_view_footer').prop('required','required'); jQuery('#jform_javascript_view_footer').attr('aria-required',true); jQuery('#jform_javascript_view_footer').addClass('required'); - jform_vvvvvzhvzc_required = false; + jform_vvvvvzivze_required = false; } } else { jQuery('#jform_javascript_view_footer').closest('.control-group').hide(); - if (!jform_vvvvvzhvzc_required) + if (!jform_vvvvvzivze_required) { updateFieldRequired('javascript_view_footer',1); jQuery('#jform_javascript_view_footer').removeAttr('required'); jQuery('#jform_javascript_view_footer').removeAttr('aria-required'); jQuery('#jform_javascript_view_footer').removeClass('required'); - jform_vvvvvzhvzc_required = true; + jform_vvvvvzivze_required = true; } } } -// the vvvvvzi function -function vvvvvzi(add_javascript_views_footer_vvvvvzi) +// the vvvvvzj function +function vvvvvzj(add_javascript_views_footer_vvvvvzj) { // set the function logic - if (add_javascript_views_footer_vvvvvzi == 1) + if (add_javascript_views_footer_vvvvvzj == 1) { jQuery('#jform_javascript_views_footer').closest('.control-group').show(); - if (jform_vvvvvzivzd_required) + if (jform_vvvvvzjvzf_required) { updateFieldRequired('javascript_views_footer',0); jQuery('#jform_javascript_views_footer').prop('required','required'); jQuery('#jform_javascript_views_footer').attr('aria-required',true); jQuery('#jform_javascript_views_footer').addClass('required'); - jform_vvvvvzivzd_required = false; + jform_vvvvvzjvzf_required = false; } } else { jQuery('#jform_javascript_views_footer').closest('.control-group').hide(); - if (!jform_vvvvvzivzd_required) + if (!jform_vvvvvzjvzf_required) { updateFieldRequired('javascript_views_footer',1); jQuery('#jform_javascript_views_footer').removeAttr('required'); jQuery('#jform_javascript_views_footer').removeAttr('aria-required'); jQuery('#jform_javascript_views_footer').removeClass('required'); - jform_vvvvvzivzd_required = true; + jform_vvvvvzjvzf_required = true; } } } diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js index 28a5161a2..902d3f35b 100644 --- a/admin/models/forms/fieldtype.js +++ b/admin/models/forms/fieldtype.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.js diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js index 4aa32db09..c9d4d3194 100644 --- a/admin/models/forms/help_document.js +++ b/admin/models/forms/help_document.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.js @@ -24,22 +24,19 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvzlvzf_required = false; -jform_vvvvvzmvzg_required = false; -jform_vvvvvznvzh_required = false; -jform_vvvvvzovzi_required = false; +jform_vvvvvzmvzh_required = false; +jform_vvvvvznvzi_required = false; +jform_vvvvvzovzj_required = false; +jform_vvvvvzpvzk_required = false; // Initial Script jQuery(document).ready(function() { - var location_vvvvvzj = jQuery("#jform_location input[type='radio']:checked").val(); - vvvvvzj(location_vvvvvzj); - var location_vvvvvzk = jQuery("#jform_location input[type='radio']:checked").val(); vvvvvzk(location_vvvvvzk); - var type_vvvvvzl = jQuery("#jform_type").val(); - vvvvvzl(type_vvvvvzl); + var location_vvvvvzl = jQuery("#jform_location input[type='radio']:checked").val(); + vvvvvzl(location_vvvvvzl); var type_vvvvvzm = jQuery("#jform_type").val(); vvvvvzm(type_vvvvvzm); @@ -47,15 +44,18 @@ jQuery(document).ready(function() var type_vvvvvzn = jQuery("#jform_type").val(); vvvvvzn(type_vvvvvzn); - var target_vvvvvzo = jQuery("#jform_target input[type='radio']:checked").val(); - vvvvvzo(target_vvvvvzo); + var type_vvvvvzo = jQuery("#jform_type").val(); + vvvvvzo(type_vvvvvzo); + + var target_vvvvvzp = jQuery("#jform_target input[type='radio']:checked").val(); + vvvvvzp(target_vvvvvzp); }); -// the vvvvvzj function -function vvvvvzj(location_vvvvvzj) +// the vvvvvzk function +function vvvvvzk(location_vvvvvzk) { // set the function logic - if (location_vvvvvzj == 1) + if (location_vvvvvzk == 1) { jQuery('#jform_admin_view').closest('.control-group').show(); } @@ -65,11 +65,11 @@ function vvvvvzj(location_vvvvvzj) } } -// the vvvvvzk function -function vvvvvzk(location_vvvvvzk) +// the vvvvvzl function +function vvvvvzl(location_vvvvvzl) { // set the function logic - if (location_vvvvvzk == 2) + if (location_vvvvvzl == 2) { jQuery('#jform_site_view').closest('.control-group').show(); } @@ -79,61 +79,6 @@ function vvvvvzk(location_vvvvvzk) } } -// the vvvvvzl function -function vvvvvzl(type_vvvvvzl) -{ - if (isSet(type_vvvvvzl) && type_vvvvvzl.constructor !== Array) - { - var temp_vvvvvzl = type_vvvvvzl; - var type_vvvvvzl = []; - type_vvvvvzl.push(temp_vvvvvzl); - } - else if (!isSet(type_vvvvvzl)) - { - var type_vvvvvzl = []; - } - var type = type_vvvvvzl.some(type_vvvvvzl_SomeFunc); - - - // set this function logic - if (type) - { - jQuery('#jform_url').closest('.control-group').show(); - if (jform_vvvvvzlvzf_required) - { - updateFieldRequired('url',0); - jQuery('#jform_url').prop('required','required'); - jQuery('#jform_url').attr('aria-required',true); - jQuery('#jform_url').addClass('required'); - jform_vvvvvzlvzf_required = false; - } - - } - else - { - jQuery('#jform_url').closest('.control-group').hide(); - if (!jform_vvvvvzlvzf_required) - { - updateFieldRequired('url',1); - jQuery('#jform_url').removeAttr('required'); - jQuery('#jform_url').removeAttr('aria-required'); - jQuery('#jform_url').removeClass('required'); - jform_vvvvvzlvzf_required = true; - } - } -} - -// the vvvvvzl Some function -function type_vvvvvzl_SomeFunc(type_vvvvvzl) -{ - // set the function logic - if (type_vvvvvzl == 3) - { - return true; - } - return false; -} - // the vvvvvzm function function vvvvvzm(type_vvvvvzm) { @@ -153,27 +98,27 @@ function vvvvvzm(type_vvvvvzm) // set this function logic if (type) { - jQuery('#jform_article').closest('.control-group').show(); - if (jform_vvvvvzmvzg_required) + jQuery('#jform_url').closest('.control-group').show(); + if (jform_vvvvvzmvzh_required) { - updateFieldRequired('article',0); - jQuery('#jform_article').prop('required','required'); - jQuery('#jform_article').attr('aria-required',true); - jQuery('#jform_article').addClass('required'); - jform_vvvvvzmvzg_required = false; + updateFieldRequired('url',0); + jQuery('#jform_url').prop('required','required'); + jQuery('#jform_url').attr('aria-required',true); + jQuery('#jform_url').addClass('required'); + jform_vvvvvzmvzh_required = false; } } else { - jQuery('#jform_article').closest('.control-group').hide(); - if (!jform_vvvvvzmvzg_required) + jQuery('#jform_url').closest('.control-group').hide(); + if (!jform_vvvvvzmvzh_required) { - updateFieldRequired('article',1); - jQuery('#jform_article').removeAttr('required'); - jQuery('#jform_article').removeAttr('aria-required'); - jQuery('#jform_article').removeClass('required'); - jform_vvvvvzmvzg_required = true; + updateFieldRequired('url',1); + jQuery('#jform_url').removeAttr('required'); + jQuery('#jform_url').removeAttr('aria-required'); + jQuery('#jform_url').removeClass('required'); + jform_vvvvvzmvzh_required = true; } } } @@ -182,7 +127,7 @@ function vvvvvzm(type_vvvvvzm) function type_vvvvvzm_SomeFunc(type_vvvvvzm) { // set the function logic - if (type_vvvvvzm == 1) + if (type_vvvvvzm == 3) { return true; } @@ -208,27 +153,27 @@ function vvvvvzn(type_vvvvvzn) // set this function logic if (type) { - jQuery('#jform_content-lbl').closest('.control-group').show(); - if (jform_vvvvvznvzh_required) + jQuery('#jform_article').closest('.control-group').show(); + if (jform_vvvvvznvzi_required) { - updateFieldRequired('content',0); - jQuery('#jform_content').prop('required','required'); - jQuery('#jform_content').attr('aria-required',true); - jQuery('#jform_content').addClass('required'); - jform_vvvvvznvzh_required = false; + updateFieldRequired('article',0); + jQuery('#jform_article').prop('required','required'); + jQuery('#jform_article').attr('aria-required',true); + jQuery('#jform_article').addClass('required'); + jform_vvvvvznvzi_required = false; } } else { - jQuery('#jform_content-lbl').closest('.control-group').hide(); - if (!jform_vvvvvznvzh_required) + jQuery('#jform_article').closest('.control-group').hide(); + if (!jform_vvvvvznvzi_required) { - updateFieldRequired('content',1); - jQuery('#jform_content').removeAttr('required'); - jQuery('#jform_content').removeAttr('aria-required'); - jQuery('#jform_content').removeClass('required'); - jform_vvvvvznvzh_required = true; + updateFieldRequired('article',1); + jQuery('#jform_article').removeAttr('required'); + jQuery('#jform_article').removeAttr('aria-required'); + jQuery('#jform_article').removeClass('required'); + jform_vvvvvznvzi_required = true; } } } @@ -237,7 +182,7 @@ function vvvvvzn(type_vvvvvzn) function type_vvvvvzn_SomeFunc(type_vvvvvzn) { // set the function logic - if (type_vvvvvzn == 2) + if (type_vvvvvzn == 1) { return true; } @@ -245,32 +190,87 @@ function type_vvvvvzn_SomeFunc(type_vvvvvzn) } // the vvvvvzo function -function vvvvvzo(target_vvvvvzo) +function vvvvvzo(type_vvvvvzo) +{ + if (isSet(type_vvvvvzo) && type_vvvvvzo.constructor !== Array) + { + var temp_vvvvvzo = type_vvvvvzo; + var type_vvvvvzo = []; + type_vvvvvzo.push(temp_vvvvvzo); + } + else if (!isSet(type_vvvvvzo)) + { + var type_vvvvvzo = []; + } + var type = type_vvvvvzo.some(type_vvvvvzo_SomeFunc); + + + // set this function logic + if (type) + { + jQuery('#jform_content-lbl').closest('.control-group').show(); + if (jform_vvvvvzovzj_required) + { + updateFieldRequired('content',0); + jQuery('#jform_content').prop('required','required'); + jQuery('#jform_content').attr('aria-required',true); + jQuery('#jform_content').addClass('required'); + jform_vvvvvzovzj_required = false; + } + + } + else + { + jQuery('#jform_content-lbl').closest('.control-group').hide(); + if (!jform_vvvvvzovzj_required) + { + updateFieldRequired('content',1); + jQuery('#jform_content').removeAttr('required'); + jQuery('#jform_content').removeAttr('aria-required'); + jQuery('#jform_content').removeClass('required'); + jform_vvvvvzovzj_required = true; + } + } +} + +// the vvvvvzo Some function +function type_vvvvvzo_SomeFunc(type_vvvvvzo) { // set the function logic - if (target_vvvvvzo == 1) + if (type_vvvvvzo == 2) + { + return true; + } + return false; +} + +// the vvvvvzp function +function vvvvvzp(target_vvvvvzp) +{ + // set the function logic + if (target_vvvvvzp == 1) { jQuery('#jform_groups').closest('.control-group').show(); - if (jform_vvvvvzovzi_required) + if (jform_vvvvvzpvzk_required) { updateFieldRequired('groups',0); jQuery('#jform_groups').prop('required','required'); jQuery('#jform_groups').attr('aria-required',true); jQuery('#jform_groups').addClass('required'); - jform_vvvvvzovzi_required = false; + jform_vvvvvzpvzk_required = false; } } else { jQuery('#jform_groups').closest('.control-group').hide(); - if (!jform_vvvvvzovzi_required) + if (!jform_vvvvvzpvzk_required) { updateFieldRequired('groups',1); jQuery('#jform_groups').removeAttr('required'); jQuery('#jform_groups').removeAttr('aria-required'); jQuery('#jform_groups').removeClass('required'); - jform_vvvvvzovzi_required = true; + jform_vvvvvzpvzk_required = true; } } } diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js index 0b0be1239..0295cbc89 100644 --- a/admin/models/forms/layout.js +++ b/admin/models/forms/layout.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.js @@ -24,42 +24,42 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvycvyd_required = false; +jform_vvvvvydvyf_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvyc = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvyc(add_php_view_vvvvvyc); + var add_php_view_vvvvvyd = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvyd(add_php_view_vvvvvyd); }); -// the vvvvvyc function -function vvvvvyc(add_php_view_vvvvvyc) +// the vvvvvyd function +function vvvvvyd(add_php_view_vvvvvyd) { // set the function logic - if (add_php_view_vvvvvyc == 1) + if (add_php_view_vvvvvyd == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvycvyd_required) + if (jform_vvvvvydvyf_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvycvyd_required = false; + jform_vvvvvydvyf_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvycvyd_required) + if (!jform_vvvvvydvyf_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvycvyd_required = true; + jform_vvvvvydvyf_required = true; } } } diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js index 564ade9ad..f0a5032f0 100644 --- a/admin/models/forms/site_view.js +++ b/admin/models/forms/site_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.js @@ -24,280 +24,280 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvxsvxs_required = false; -jform_vvvvvxtvxt_required = false; -jform_vvvvvxuvxu_required = false; -jform_vvvvvxvvxv_required = false; -jform_vvvvvxwvxw_required = false; -jform_vvvvvxxvxx_required = false; -jform_vvvvvxyvxy_required = false; -jform_vvvvvxzvxz_required = false; -jform_vvvvvyavya_required = false; +jform_vvvvvxtvxu_required = false; +jform_vvvvvxuvxv_required = false; +jform_vvvvvxvvxw_required = false; +jform_vvvvvxwvxx_required = false; +jform_vvvvvxxvxy_required = false; +jform_vvvvvxyvxz_required = false; +jform_vvvvvxzvya_required = false; jform_vvvvvyavyb_required = false; +jform_vvvvvybvyc_required = false; +jform_vvvvvybvyd_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvxs = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvxs(add_php_view_vvvvvxs); + var add_php_view_vvvvvxt = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvxt(add_php_view_vvvvvxt); - var add_php_jview_display_vvvvvxt = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); - vvvvvxt(add_php_jview_display_vvvvvxt); + var add_php_jview_display_vvvvvxu = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val(); + vvvvvxu(add_php_jview_display_vvvvvxu); - var add_php_jview_vvvvvxu = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); - vvvvvxu(add_php_jview_vvvvvxu); + var add_php_jview_vvvvvxv = jQuery("#jform_add_php_jview input[type='radio']:checked").val(); + vvvvvxv(add_php_jview_vvvvvxv); - var add_php_document_vvvvvxv = jQuery("#jform_add_php_document input[type='radio']:checked").val(); - vvvvvxv(add_php_document_vvvvvxv); + var add_php_document_vvvvvxw = jQuery("#jform_add_php_document input[type='radio']:checked").val(); + vvvvvxw(add_php_document_vvvvvxw); - var add_css_document_vvvvvxw = jQuery("#jform_add_css_document input[type='radio']:checked").val(); - vvvvvxw(add_css_document_vvvvvxw); + var add_css_document_vvvvvxx = jQuery("#jform_add_css_document input[type='radio']:checked").val(); + vvvvvxx(add_css_document_vvvvvxx); - var add_js_document_vvvvvxx = jQuery("#jform_add_js_document input[type='radio']:checked").val(); - vvvvvxx(add_js_document_vvvvvxx); + var add_js_document_vvvvvxy = jQuery("#jform_add_js_document input[type='radio']:checked").val(); + vvvvvxy(add_js_document_vvvvvxy); - var add_css_vvvvvxy = jQuery("#jform_add_css input[type='radio']:checked").val(); - vvvvvxy(add_css_vvvvvxy); + var add_css_vvvvvxz = jQuery("#jform_add_css input[type='radio']:checked").val(); + vvvvvxz(add_css_vvvvvxz); - var add_php_ajax_vvvvvxz = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); - vvvvvxz(add_php_ajax_vvvvvxz); + var add_php_ajax_vvvvvya = jQuery("#jform_add_php_ajax input[type='radio']:checked").val(); + vvvvvya(add_php_ajax_vvvvvya); - var add_custom_button_vvvvvya = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); - vvvvvya(add_custom_button_vvvvvya); + var add_custom_button_vvvvvyb = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvyb(add_custom_button_vvvvvyb); }); -// the vvvvvxs function -function vvvvvxs(add_php_view_vvvvvxs) +// the vvvvvxt function +function vvvvvxt(add_php_view_vvvvvxt) { // set the function logic - if (add_php_view_vvvvvxs == 1) + if (add_php_view_vvvvvxt == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvxsvxs_required) + if (jform_vvvvvxtvxu_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvxsvxs_required = false; + jform_vvvvvxtvxu_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvxsvxs_required) + if (!jform_vvvvvxtvxu_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvxsvxs_required = true; + jform_vvvvvxtvxu_required = true; } } } -// the vvvvvxt function -function vvvvvxt(add_php_jview_display_vvvvvxt) +// the vvvvvxu function +function vvvvvxu(add_php_jview_display_vvvvvxu) { // set the function logic - if (add_php_jview_display_vvvvvxt == 1) + if (add_php_jview_display_vvvvvxu == 1) { jQuery('#jform_php_jview_display').closest('.control-group').show(); - if (jform_vvvvvxtvxt_required) + if (jform_vvvvvxuvxv_required) { updateFieldRequired('php_jview_display',0); jQuery('#jform_php_jview_display').prop('required','required'); jQuery('#jform_php_jview_display').attr('aria-required',true); jQuery('#jform_php_jview_display').addClass('required'); - jform_vvvvvxtvxt_required = false; + jform_vvvvvxuvxv_required = false; } } else { jQuery('#jform_php_jview_display').closest('.control-group').hide(); - if (!jform_vvvvvxtvxt_required) + if (!jform_vvvvvxuvxv_required) { updateFieldRequired('php_jview_display',1); jQuery('#jform_php_jview_display').removeAttr('required'); jQuery('#jform_php_jview_display').removeAttr('aria-required'); jQuery('#jform_php_jview_display').removeClass('required'); - jform_vvvvvxtvxt_required = true; + jform_vvvvvxuvxv_required = true; } } } -// the vvvvvxu function -function vvvvvxu(add_php_jview_vvvvvxu) +// the vvvvvxv function +function vvvvvxv(add_php_jview_vvvvvxv) { // set the function logic - if (add_php_jview_vvvvvxu == 1) + if (add_php_jview_vvvvvxv == 1) { jQuery('#jform_php_jview').closest('.control-group').show(); - if (jform_vvvvvxuvxu_required) + if (jform_vvvvvxvvxw_required) { updateFieldRequired('php_jview',0); jQuery('#jform_php_jview').prop('required','required'); jQuery('#jform_php_jview').attr('aria-required',true); jQuery('#jform_php_jview').addClass('required'); - jform_vvvvvxuvxu_required = false; + jform_vvvvvxvvxw_required = false; } } else { jQuery('#jform_php_jview').closest('.control-group').hide(); - if (!jform_vvvvvxuvxu_required) + if (!jform_vvvvvxvvxw_required) { updateFieldRequired('php_jview',1); jQuery('#jform_php_jview').removeAttr('required'); jQuery('#jform_php_jview').removeAttr('aria-required'); jQuery('#jform_php_jview').removeClass('required'); - jform_vvvvvxuvxu_required = true; + jform_vvvvvxvvxw_required = true; } } } -// the vvvvvxv function -function vvvvvxv(add_php_document_vvvvvxv) +// the vvvvvxw function +function vvvvvxw(add_php_document_vvvvvxw) { // set the function logic - if (add_php_document_vvvvvxv == 1) + if (add_php_document_vvvvvxw == 1) { jQuery('#jform_php_document').closest('.control-group').show(); - if (jform_vvvvvxvvxv_required) + if (jform_vvvvvxwvxx_required) { updateFieldRequired('php_document',0); jQuery('#jform_php_document').prop('required','required'); jQuery('#jform_php_document').attr('aria-required',true); jQuery('#jform_php_document').addClass('required'); - jform_vvvvvxvvxv_required = false; + jform_vvvvvxwvxx_required = false; } } else { jQuery('#jform_php_document').closest('.control-group').hide(); - if (!jform_vvvvvxvvxv_required) + if (!jform_vvvvvxwvxx_required) { updateFieldRequired('php_document',1); jQuery('#jform_php_document').removeAttr('required'); jQuery('#jform_php_document').removeAttr('aria-required'); jQuery('#jform_php_document').removeClass('required'); - jform_vvvvvxvvxv_required = true; + jform_vvvvvxwvxx_required = true; } } } -// the vvvvvxw function -function vvvvvxw(add_css_document_vvvvvxw) +// the vvvvvxx function +function vvvvvxx(add_css_document_vvvvvxx) { // set the function logic - if (add_css_document_vvvvvxw == 1) + if (add_css_document_vvvvvxx == 1) { jQuery('#jform_css_document').closest('.control-group').show(); - if (jform_vvvvvxwvxw_required) + if (jform_vvvvvxxvxy_required) { updateFieldRequired('css_document',0); jQuery('#jform_css_document').prop('required','required'); jQuery('#jform_css_document').attr('aria-required',true); jQuery('#jform_css_document').addClass('required'); - jform_vvvvvxwvxw_required = false; + jform_vvvvvxxvxy_required = false; } } else { jQuery('#jform_css_document').closest('.control-group').hide(); - if (!jform_vvvvvxwvxw_required) + if (!jform_vvvvvxxvxy_required) { updateFieldRequired('css_document',1); jQuery('#jform_css_document').removeAttr('required'); jQuery('#jform_css_document').removeAttr('aria-required'); jQuery('#jform_css_document').removeClass('required'); - jform_vvvvvxwvxw_required = true; + jform_vvvvvxxvxy_required = true; } } } -// the vvvvvxx function -function vvvvvxx(add_js_document_vvvvvxx) +// the vvvvvxy function +function vvvvvxy(add_js_document_vvvvvxy) { // set the function logic - if (add_js_document_vvvvvxx == 1) + if (add_js_document_vvvvvxy == 1) { jQuery('#jform_js_document').closest('.control-group').show(); - if (jform_vvvvvxxvxx_required) + if (jform_vvvvvxyvxz_required) { updateFieldRequired('js_document',0); jQuery('#jform_js_document').prop('required','required'); jQuery('#jform_js_document').attr('aria-required',true); jQuery('#jform_js_document').addClass('required'); - jform_vvvvvxxvxx_required = false; + jform_vvvvvxyvxz_required = false; } } else { jQuery('#jform_js_document').closest('.control-group').hide(); - if (!jform_vvvvvxxvxx_required) + if (!jform_vvvvvxyvxz_required) { updateFieldRequired('js_document',1); jQuery('#jform_js_document').removeAttr('required'); jQuery('#jform_js_document').removeAttr('aria-required'); jQuery('#jform_js_document').removeClass('required'); - jform_vvvvvxxvxx_required = true; + jform_vvvvvxyvxz_required = true; } } } -// the vvvvvxy function -function vvvvvxy(add_css_vvvvvxy) +// the vvvvvxz function +function vvvvvxz(add_css_vvvvvxz) { // set the function logic - if (add_css_vvvvvxy == 1) + if (add_css_vvvvvxz == 1) { jQuery('#jform_css').closest('.control-group').show(); - if (jform_vvvvvxyvxy_required) + if (jform_vvvvvxzvya_required) { updateFieldRequired('css',0); jQuery('#jform_css').prop('required','required'); jQuery('#jform_css').attr('aria-required',true); jQuery('#jform_css').addClass('required'); - jform_vvvvvxyvxy_required = false; + jform_vvvvvxzvya_required = false; } } else { jQuery('#jform_css').closest('.control-group').hide(); - if (!jform_vvvvvxyvxy_required) + if (!jform_vvvvvxzvya_required) { updateFieldRequired('css',1); jQuery('#jform_css').removeAttr('required'); jQuery('#jform_css').removeAttr('aria-required'); jQuery('#jform_css').removeClass('required'); - jform_vvvvvxyvxy_required = true; + jform_vvvvvxzvya_required = true; } } } -// the vvvvvxz function -function vvvvvxz(add_php_ajax_vvvvvxz) +// the vvvvvya function +function vvvvvya(add_php_ajax_vvvvvya) { // set the function logic - if (add_php_ajax_vvvvvxz == 1) + if (add_php_ajax_vvvvvya == 1) { jQuery('#jform_ajax_input').closest('.control-group').show(); jQuery('#jform_php_ajaxmethod').closest('.control-group').show(); - if (jform_vvvvvxzvxz_required) + if (jform_vvvvvyavyb_required) { updateFieldRequired('php_ajaxmethod',0); jQuery('#jform_php_ajaxmethod').prop('required','required'); jQuery('#jform_php_ajaxmethod').attr('aria-required',true); jQuery('#jform_php_ajaxmethod').addClass('required'); - jform_vvvvvxzvxz_required = false; + jform_vvvvvyavyb_required = false; } } @@ -305,42 +305,42 @@ function vvvvvxz(add_php_ajax_vvvvvxz) { jQuery('#jform_ajax_input').closest('.control-group').hide(); jQuery('#jform_php_ajaxmethod').closest('.control-group').hide(); - if (!jform_vvvvvxzvxz_required) + if (!jform_vvvvvyavyb_required) { updateFieldRequired('php_ajaxmethod',1); jQuery('#jform_php_ajaxmethod').removeAttr('required'); jQuery('#jform_php_ajaxmethod').removeAttr('aria-required'); jQuery('#jform_php_ajaxmethod').removeClass('required'); - jform_vvvvvxzvxz_required = true; + jform_vvvvvyavyb_required = true; } } } -// the vvvvvya function -function vvvvvya(add_custom_button_vvvvvya) +// the vvvvvyb function +function vvvvvyb(add_custom_button_vvvvvyb) { // set the function logic - if (add_custom_button_vvvvvya == 1) + if (add_custom_button_vvvvvyb == 1) { jQuery('#jform_custom_button').closest('.control-group').show(); jQuery('#jform_php_controller').closest('.control-group').show(); - if (jform_vvvvvyavya_required) + if (jform_vvvvvybvyc_required) { updateFieldRequired('php_controller',0); jQuery('#jform_php_controller').prop('required','required'); jQuery('#jform_php_controller').attr('aria-required',true); jQuery('#jform_php_controller').addClass('required'); - jform_vvvvvyavya_required = false; + jform_vvvvvybvyc_required = false; } jQuery('#jform_php_model').closest('.control-group').show(); - if (jform_vvvvvyavyb_required) + if (jform_vvvvvybvyd_required) { updateFieldRequired('php_model',0); jQuery('#jform_php_model').prop('required','required'); jQuery('#jform_php_model').attr('aria-required',true); jQuery('#jform_php_model').addClass('required'); - jform_vvvvvyavyb_required = false; + jform_vvvvvybvyd_required = false; } } @@ -348,22 +348,22 @@ function vvvvvya(add_custom_button_vvvvvya) { jQuery('#jform_custom_button').closest('.control-group').hide(); jQuery('#jform_php_controller').closest('.control-group').hide(); - if (!jform_vvvvvyavya_required) + if (!jform_vvvvvybvyc_required) { updateFieldRequired('php_controller',1); jQuery('#jform_php_controller').removeAttr('required'); jQuery('#jform_php_controller').removeAttr('aria-required'); jQuery('#jform_php_controller').removeClass('required'); - jform_vvvvvyavya_required = true; + jform_vvvvvybvyc_required = true; } jQuery('#jform_php_model').closest('.control-group').hide(); - if (!jform_vvvvvyavyb_required) + if (!jform_vvvvvybvyd_required) { updateFieldRequired('php_model',1); jQuery('#jform_php_model').removeAttr('required'); jQuery('#jform_php_model').removeAttr('aria-required'); jQuery('#jform_php_model').removeClass('required'); - jform_vvvvvyavyb_required = true; + jform_vvvvvybvyd_required = true; } } } diff --git a/admin/models/forms/snippet.js b/admin/models/forms/snippet.js index 1183416b9..81f3f4cd8 100644 --- a/admin/models/forms/snippet.js +++ b/admin/models/forms/snippet.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.js diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js index a38c93439..46d8d63af 100644 --- a/admin/models/forms/template.js +++ b/admin/models/forms/template.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.js @@ -24,42 +24,42 @@ /-----------------------------------------------------------------------------------------------------------------------------*/ // Some Global Values -jform_vvvvvybvyc_required = false; +jform_vvvvvycvye_required = false; // Initial Script jQuery(document).ready(function() { - var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val(); - vvvvvyb(add_php_view_vvvvvyb); + var add_php_view_vvvvvyc = jQuery("#jform_add_php_view input[type='radio']:checked").val(); + vvvvvyc(add_php_view_vvvvvyc); }); -// the vvvvvyb function -function vvvvvyb(add_php_view_vvvvvyb) +// the vvvvvyc function +function vvvvvyc(add_php_view_vvvvvyc) { // set the function logic - if (add_php_view_vvvvvyb == 1) + if (add_php_view_vvvvvyc == 1) { jQuery('#jform_php_view').closest('.control-group').show(); - if (jform_vvvvvybvyc_required) + if (jform_vvvvvycvye_required) { updateFieldRequired('php_view',0); jQuery('#jform_php_view').prop('required','required'); jQuery('#jform_php_view').attr('aria-required',true); jQuery('#jform_php_view').addClass('required'); - jform_vvvvvybvyc_required = false; + jform_vvvvvycvye_required = false; } } else { jQuery('#jform_php_view').closest('.control-group').hide(); - if (!jform_vvvvvybvyc_required) + if (!jform_vvvvvycvye_required) { updateFieldRequired('php_view',1); jQuery('#jform_php_view').removeAttr('required'); jQuery('#jform_php_view').removeAttr('aria-required'); jQuery('#jform_php_view').removeClass('required'); - jform_vvvvvybvyc_required = true; + jform_vvvvvycvye_required = true; } } } diff --git a/admin/models/help_document.php b/admin/models/help_document.php index f9dcccbb0..260cdf3bf 100644 --- a/admin/models/help_document.php +++ b/admin/models/help_document.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php index 95c81db02..ae7740918 100644 --- a/admin/models/help_documents.php +++ b/admin/models/help_documents.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_documents.php diff --git a/admin/models/import.php b/admin/models/import.php index 1e3c4ca28..94b5cf80d 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/layout.php b/admin/models/layout.php index 4cc479233..d86d5e8e6 100644 --- a/admin/models/layout.php +++ b/admin/models/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/models/layouts.php b/admin/models/layouts.php index 12584105a..2cb4920b7 100644 --- a/admin/models/layouts.php +++ b/admin/models/layouts.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layouts.php diff --git a/admin/models/site_view.php b/admin/models/site_view.php index a18a64c70..1c4d194ab 100644 --- a/admin/models/site_view.php +++ b/admin/models/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/models/site_views.php b/admin/models/site_views.php index c81003e94..ef52d4ff9 100644 --- a/admin/models/site_views.php +++ b/admin/models/site_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_views.php diff --git a/admin/models/snippet.php b/admin/models/snippet.php index 931238890..109ea2549 100644 --- a/admin/models/snippet.php +++ b/admin/models/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/models/snippets.php b/admin/models/snippets.php index 023e7f187..c1e1ad0b0 100644 --- a/admin/models/snippets.php +++ b/admin/models/snippets.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/template.php b/admin/models/template.php index 4a349df35..96207f1e8 100644 --- a/admin/models/template.php +++ b/admin/models/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/models/templates.php b/admin/models/templates.php index 7e1c28277..b9e3ae620 100644 --- a/admin/models/templates.php +++ b/admin/models/templates.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage templates.php diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index fae47413b..4dc9b2dff 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -104,6 +104,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0', `add_css_view` TINYINT(1) NOT NULL DEFAULT '0', `add_css_views` TINYINT(1) NOT NULL DEFAULT '0', + `add_custom_button` INT(1) NOT NULL DEFAULT '0', `add_custom_import` TINYINT(1) NOT NULL DEFAULT '0', `add_fadein` TINYINT(1) NOT NULL DEFAULT '0', `add_javascript_view_file` TINYINT(1) NOT NULL DEFAULT '0', @@ -135,6 +136,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `ajax_input` TEXT NOT NULL, `css_view` TEXT NOT NULL, `css_views` TEXT NOT NULL, + `custom_button` TEXT NOT NULL, `description` TEXT NOT NULL, `html_import_view` MEDIUMTEXT NOT NULL, `icon` CHAR(64) NOT NULL DEFAULT '', @@ -155,6 +157,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `php_batchmove` MEDIUMTEXT NOT NULL, `php_before_delete` MEDIUMTEXT NOT NULL, `php_before_publish` MEDIUMTEXT NOT NULL, + `php_controller` MEDIUMTEXT NOT NULL, `php_document` MEDIUMTEXT NOT NULL, `php_getitem` MEDIUMTEXT NOT NULL, `php_getitems` MEDIUMTEXT NOT NULL, @@ -164,6 +167,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( `php_import_display` MEDIUMTEXT NOT NULL, `php_import_save` MEDIUMTEXT NOT NULL, `php_import_setdata` MEDIUMTEXT NOT NULL, + `php_model` MEDIUMTEXT NOT NULL, `php_postsavehook` MEDIUMTEXT NOT NULL, `php_save` MEDIUMTEXT NOT NULL, `short_description` VARCHAR(255) NOT NULL DEFAULT '', @@ -195,28 +199,29 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( KEY `idx_add_fadein` (`add_fadein`), KEY `idx_source` (`source`), KEY `idx_add_css_view` (`add_css_view`), + KEY `idx_add_php_getitems` (`add_php_getitems`), + KEY `idx_add_css_views` (`add_css_views`), KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`), KEY `idx_add_php_getlistquery` (`add_php_getlistquery`), - KEY `idx_add_css_views` (`add_css_views`), + KEY `idx_add_javascript_view_file` (`add_javascript_view_file`), KEY `idx_add_php_save` (`add_php_save`), KEY `idx_add_php_postsavehook` (`add_php_postsavehook`), - KEY `idx_add_javascript_view_file` (`add_javascript_view_file`), + KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`), KEY `idx_add_php_allowedit` (`add_php_allowedit`), KEY `idx_add_php_batchcopy` (`add_php_batchcopy`), - KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`), + KEY `idx_add_javascript_views_file` (`add_javascript_views_file`), KEY `idx_add_php_batchmove` (`add_php_batchmove`), KEY `idx_add_php_before_publish` (`add_php_before_publish`), - KEY `idx_add_javascript_views_file` (`add_javascript_views_file`), + KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`), KEY `idx_add_php_after_publish` (`add_php_after_publish`), KEY `idx_add_php_before_delete` (`add_php_before_delete`), - KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`), + KEY `idx_add_custom_button` (`add_custom_button`), KEY `idx_add_php_after_delete` (`add_php_after_delete`), KEY `idx_add_php_document` (`add_php_document`), - KEY `idx_add_php_ajax` (`add_php_ajax`), KEY `idx_add_sql` (`add_sql`), - KEY `idx_add_php_getitem` (`add_php_getitem`), + KEY `idx_add_php_ajax` (`add_php_ajax`), KEY `idx_add_custom_import` (`add_custom_import`), - KEY `idx_add_php_getitems` (`add_php_getitems`) + KEY `idx_add_php_getitem` (`add_php_getitem`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( diff --git a/admin/sql/updates/mysql/2.1.20.sql b/admin/sql/updates/mysql/2.1.20.sql new file mode 100644 index 000000000..725f0b461 --- /dev/null +++ b/admin/sql/updates/mysql/2.1.20.sql @@ -0,0 +1,4 @@ +ALTER TABLE `#__componentbuilder_admin_view` ADD `add_custom_button` INT(1) NOT NULL DEFAULT '0' AFTER `add_css_views`, +ADD `custom_button` TEXT NOT NULL AFTER `css_views`, +ADD `php_controller` MEDIUMTEXT NOT NULL AFTER `php_before_publish`, +ADD `php_model` MEDIUMTEXT NOT NULL AFTER `php_import_setdata`; diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index ec40405f2..04e3464ca 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/tables/component.php b/admin/tables/component.php index cc29971f9..51c53900d 100644 --- a/admin/tables/component.php +++ b/admin/tables/component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php index f8239be00..2b5653927 100644 --- a/admin/tables/custom_admin_view.php +++ b/admin/tables/custom_admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_view.php diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php index 048889c96..846a4b3fc 100644 --- a/admin/tables/dynamic_get.php +++ b/admin/tables/dynamic_get.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage dynamic_get.php diff --git a/admin/tables/field.php b/admin/tables/field.php index 1af8615f0..84e7db5ae 100644 --- a/admin/tables/field.php +++ b/admin/tables/field.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage field.php diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php index 837e44223..13d7bfbb2 100644 --- a/admin/tables/fieldtype.php +++ b/admin/tables/fieldtype.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage fieldtype.php diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php index 4ba7ab5ad..6a1f65c22 100644 --- a/admin/tables/help_document.php +++ b/admin/tables/help_document.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage help_document.php diff --git a/admin/tables/layout.php b/admin/tables/layout.php index dd61870bf..6c5bace68 100644 --- a/admin/tables/layout.php +++ b/admin/tables/layout.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage layout.php diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php index 158f26b10..03dafafd6 100644 --- a/admin/tables/site_view.php +++ b/admin/tables/site_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage site_view.php diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php index 3e1dd1a5a..19e3966ca 100644 --- a/admin/tables/snippet.php +++ b/admin/tables/snippet.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage snippet.php diff --git a/admin/tables/template.php b/admin/tables/template.php index d3b4942b2..4d96de479 100644 --- a/admin/tables/template.php +++ b/admin/tables/template.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage template.php diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index 5fa824274..aa4cd903e 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php index 19dfb0ed4..71d3fdf52 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -106,6 +106,19 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder'); + +
+
+ +
+
+
+
+ +
+
+ +
@@ -614,8 +627,48 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e) }); +// #jform_add_custom_button listeners for add_custom_button_vvvvvxk function +jQuery('#jform_add_custom_button').on('keyup',function() +{ + var add_custom_button_vvvvvxk = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxk(add_custom_button_vvvvvxk); - +}); +jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e) +{ + e.preventDefault(); + var add_custom_button_vvvvvxk = jQuery("#jform_add_custom_button input[type='radio']:checked").val(); + vvvvvxk(add_custom_button_vvvvvxk); + +}); + + + + +jQuery('#jform_custom_button_modal').on('change', 'select[name="icomoon-"]',function (e) { + // update the icon if changed + var vala_ = jQuery('select[name="icomoon-"] option:selected').val(); + // build new span + var span = ''; + // remove old one + jQuery('#icon_custom_button_fields_icomoon_').remove(); + // add the new icon + jQuery('#jform_custom_button_fields_icomoon__chzn').closest("td").append(span); +}); + +jQuery(document).ready(function() { +jQuery('input.form-field-repeatable').on('row-add', function (e) { + // show the icon if set + var vala_ = jQuery('#jform_custom_button_fields_icomoon-').val(); + // build new span + var span = ''; + // remove old one + jQuery('#icon_custom_button_fields_icomoon_').remove(); + // add the new icon + jQuery('#jform_custom_button_fields_icomoon__chzn').closest("td").append(span); +}); +}); + jQuery('#jform_addconditions_modal').on('show.bs.modal', function (e) { jQuery('#jform_addconditions_modal').on('change', '#jform_addconditions_fields_match_field-',function (e) { e.preventDefault(); diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 3cc01138b..7c6a0b5b6 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -72,7 +72,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxifields = $this->get('Vxifields'); + $this->vxkfields = $this->get('Vxkfields'); // Set the toolbar $this->addToolBar(); diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 74237d2d0..84d59874f 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php index e05fd9dd3..3315c61aa 100644 --- a/admin/views/admin_views/tmpl/default_batch_body.php +++ b/admin/views/admin_views/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php index 8bdc56614..e37aec3c9 100644 --- a/admin/views/admin_views/tmpl/default_batch_footer.php +++ b/admin/views/admin_views/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php index 50935f2f8..ed127e829 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index ad04f7446..4d4a31b7a 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php index b04ff6228..493535e45 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php index 93df69d4e..f64024ed5 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php index 9e302c3b6..4fd47d7bc 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index 2f2b54bcf..9fa3347f3 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php index d3e7e5852..cfa2fa11e 100644 --- a/admin/views/compiler/view.html.php +++ b/admin/views/compiler/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/component/submitbutton.js b/admin/views/component/submitbutton.js index 466fcc528..80c51a5d3 100644 --- a/admin/views/component/submitbutton.js +++ b/admin/views/component/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/component/tmpl/edit.php b/admin/views/component/tmpl/edit.php index 20e161011..58dae4a5d 100644 --- a/admin/views/component/tmpl/edit.php +++ b/admin/views/component/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/component/view.html.php b/admin/views/component/view.html.php index abef1ac57..c33e1c5ab 100644 --- a/admin/views/component/view.html.php +++ b/admin/views/component/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index 4cc9db501..b8e2410a1 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index 639691717..acd5073c6 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index a6516cf54..d10d31221 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index d7716d51e..7c4632466 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/components/tmpl/default.php b/admin/views/components/tmpl/default.php index 54def9037..4c18093fa 100644 --- a/admin/views/components/tmpl/default.php +++ b/admin/views/components/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/components/tmpl/default_batch_body.php b/admin/views/components/tmpl/default_batch_body.php index 9f5ff9c82..3255c11a9 100644 --- a/admin/views/components/tmpl/default_batch_body.php +++ b/admin/views/components/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/components/tmpl/default_batch_footer.php b/admin/views/components/tmpl/default_batch_footer.php index 1b5542fda..db6a4388a 100644 --- a/admin/views/components/tmpl/default_batch_footer.php +++ b/admin/views/components/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/components/tmpl/default_body.php b/admin/views/components/tmpl/default_body.php index 645bf761c..b1b9808bd 100644 --- a/admin/views/components/tmpl/default_body.php +++ b/admin/views/components/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/components/tmpl/default_foot.php b/admin/views/components/tmpl/default_foot.php index f67b4b1bd..f5c68ea9e 100644 --- a/admin/views/components/tmpl/default_foot.php +++ b/admin/views/components/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/components/tmpl/default_head.php b/admin/views/components/tmpl/default_head.php index 9cde161f5..9c2baa95e 100644 --- a/admin/views/components/tmpl/default_head.php +++ b/admin/views/components/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_head.php diff --git a/admin/views/components/tmpl/default_toolbar.php b/admin/views/components/tmpl/default_toolbar.php index 4e3da53bd..a133611e5 100644 --- a/admin/views/components/tmpl/default_toolbar.php +++ b/admin/views/components/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/components/view.html.php b/admin/views/components/view.html.php index d2ada5c22..17feab827 100644 --- a/admin/views/components/view.html.php +++ b/admin/views/components/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js index 5a723a2b5..0ccd6c92a 100644 --- a/admin/views/custom_admin_view/submitbutton.js +++ b/admin/views/custom_admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php index 3f760085c..b22adfd17 100644 --- a/admin/views/custom_admin_view/tmpl/edit.php +++ b/admin/views/custom_admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version 2.1.20 - @build 7th September, 2016 + @version 2.1.21 + @build 11th September, 2016 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -151,153 +151,128 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');