From dfd98aeacf0b8781d8095842e79072ed46f58ad0 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 13 Oct 2017 05:45:54 +0200 Subject: [PATCH] Cleaned-up some more javascript one the admin_view. Changed the admin_view layout. Improved the converion of data. Added a new tabsName field to the admin_fields view. --- README.md | 6 +- admin/README.txt | 6 +- admin/access.xml | 48 +++ admin/assets/css/admin.css | 2 +- admin/assets/css/admin_fields.css | 4 +- admin/assets/css/admin_fields_conditions.css | 4 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/assets/css/admins_fields.css | 4 +- admin/assets/css/admins_fields_conditions.css | 4 +- admin/assets/css/dashboard.css | 2 +- admin/assets/js/admin.js | 2 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/admin_fields.php | 30 +- admin/controllers/admin_fields_conditions.php | 30 +- admin/controllers/admin_view.php | 30 +- admin/controllers/admin_views.php | 4 +- admin/controllers/admins_fields.php | 4 +- .../controllers/admins_fields_conditions.php | 4 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- .../controllers/import_joomla_components.php | 2 +- admin/helpers/componentbuilder.php | 7 +- admin/helpers/componentbuilderemail.php | 2 +- admin/helpers/headercheck.php | 2 +- admin/helpers/html/batch_.php | 2 +- admin/helpers/indenter.php | 2 +- admin/helpers/js.php | 2 +- admin/helpers/minify.php | 2 +- .../en-GB/en-GB.com_componentbuilder.ini | 52 ++- .../en-GB/en-GB.com_componentbuilder.sys.ini | 48 +++ admin/layouts/admin_fields/fields_above.php | 2 +- .../layouts/admin_fields/fields_fullwidth.php | 2 +- admin/layouts/admin_fields/publishing.php | 2 +- admin/layouts/admin_fields/publlshing.php | 2 +- .../conditions_above.php | 2 +- .../conditions_fullwidth.php | 2 +- .../admin_fields_conditions/publishing.php | 2 +- .../admin_fields_conditions/publlshing.php | 2 +- admin/layouts/admin_view/css_fullwidth.php | 2 +- .../admin_view/custom_buttons_fullwidth.php | 2 +- .../admin_view/custom_buttons_left.php | 2 +- .../admin_view/custom_import_fullwidth.php | 130 ++++++-- .../{settings_above.php => details_above.php} | 4 +- .../{settings_left.php => details_left.php} | 7 +- .../{settings_right.php => details_right.php} | 12 +- .../{settings_under.php => details_under.php} | 4 +- .../fields_conditions_fullwidth.php | 2 +- .../admin_view/fields_conditions_left.php | 2 +- .../admin_view/fields_conditions_right.php | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 138 -------- admin/layouts/admin_view/mysql_fullwidth.php | 2 +- admin/layouts/admin_view/mysql_left.php | 2 +- admin/layouts/admin_view/php_fullwidth.php | 2 +- admin/layouts/admin_view/publishing.php | 2 +- admin/layouts/admin_view/publlshing.php | 2 +- .../layouts/admin_view/settings_fullwidth.php | 52 +++ admin/layouts/batchselection.php | 2 +- .../custom_buttons_fullwidth.php | 2 +- .../custom_admin_view/custom_buttons_left.php | 2 +- .../custom_script_fullwidth.php | 2 +- .../custom_admin_view/details_above.php | 2 +- .../custom_admin_view/details_fullwidth.php | 2 +- .../custom_admin_view/details_left.php | 2 +- .../custom_admin_view/details_right.php | 2 +- .../custom_admin_view/details_rightside.php | 2 +- .../custom_admin_view/details_under.php | 2 +- .../linked_components_fullwidth.php | 2 +- .../layouts/custom_admin_view/publishing.php | 2 +- .../layouts/custom_admin_view/publlshing.php | 2 +- admin/layouts/custom_code/details_above.php | 2 +- .../layouts/custom_code/details_fullwidth.php | 2 +- admin/layouts/custom_code/details_left.php | 2 +- admin/layouts/custom_code/details_right.php | 2 +- admin/layouts/custom_code/details_under.php | 2 +- admin/layouts/custom_code/publishing.php | 2 +- admin/layouts/custom_code/publlshing.php | 2 +- .../layouts/dynamic_get/abacus_fullwidth.php | 2 +- admin/layouts/dynamic_get/abacus_left.php | 2 +- .../dynamic_get/custom_script_fullwidth.php | 2 +- admin/layouts/dynamic_get/joint_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_above.php | 2 +- admin/layouts/dynamic_get/main_fullwidth.php | 2 +- admin/layouts/dynamic_get/main_left.php | 2 +- admin/layouts/dynamic_get/main_right.php | 2 +- admin/layouts/dynamic_get/main_under.php | 2 +- admin/layouts/dynamic_get/publishing.php | 2 +- admin/layouts/dynamic_get/publlshing.php | 2 +- admin/layouts/field/details_fullwidth.php | 2 +- admin/layouts/field/details_left.php | 2 +- admin/layouts/field/details_right.php | 2 +- admin/layouts/field/details_under.php | 2 +- .../field/linked_admin_views_fullwidth.php | 4 +- admin/layouts/field/publishing.php | 2 +- admin/layouts/field/publlshing.php | 2 +- admin/layouts/field/scripts_left.php | 2 +- admin/layouts/field/scripts_right.php | 2 +- admin/layouts/fieldtype/details_fullwidth.php | 2 +- admin/layouts/fieldtype/details_left.php | 2 +- admin/layouts/fieldtype/details_right.php | 2 +- admin/layouts/fieldtype/fields_fullwidth.php | 2 +- admin/layouts/fieldtype/publishing.php | 2 +- admin/layouts/fieldtype/publlshing.php | 2 +- admin/layouts/ftp/details_above.php | 2 +- admin/layouts/ftp/details_fullwidth.php | 2 +- .../ftp/linked_components_fullwidth.php | 2 +- admin/layouts/ftp/publishing.php | 2 +- admin/layouts/ftp/publlshing.php | 2 +- admin/layouts/help_document/details_above.php | 2 +- .../help_document/details_fullwidth.php | 2 +- admin/layouts/help_document/details_left.php | 2 +- admin/layouts/help_document/details_right.php | 2 +- admin/layouts/help_document/details_under.php | 2 +- admin/layouts/help_document/publishing.php | 2 +- admin/layouts/help_document/publlshing.php | 2 +- .../admin_views_fullwidth.php | 6 +- .../custom_admin_views_fullwidth.php | 2 +- .../joomla_component/details_above.php | 2 +- .../layouts/joomla_component/details_left.php | 2 +- .../joomla_component/details_right.php | 2 +- .../joomla_component/details_under.php | 2 +- .../dynamic_build_beta_fullwidth.php | 2 +- .../dynamic_integration_fullwidth.php | 2 +- .../libs_helpers_fullwidth.php | 2 +- admin/layouts/joomla_component/metadata.php | 2 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 2 +- .../joomla_component/settings_right.php | 2 +- .../joomla_component/site_views_fullwidth.php | 2 +- .../translation_fullwidth.php | 2 +- admin/layouts/language/details_left.php | 2 +- admin/layouts/language/details_right.php | 2 +- admin/layouts/language/publishing.php | 2 +- admin/layouts/language/publlshing.php | 2 +- .../language_translation/details_above.php | 2 +- .../details_fullwidth.php | 2 +- .../language_translation/publishing.php | 2 +- .../language_translation/publlshing.php | 2 +- .../layout/custom_script_fullwidth.php | 2 +- admin/layouts/layout/details_fullwidth.php | 2 +- admin/layouts/layout/details_left.php | 2 +- admin/layouts/layout/details_right.php | 2 +- admin/layouts/layout/details_rightside.php | 2 +- admin/layouts/layout/details_under.php | 2 +- admin/layouts/layout/publishing.php | 2 +- admin/layouts/layout/publlshing.php | 2 +- .../site_view/custom_buttons_fullwidth.php | 2 +- .../layouts/site_view/custom_buttons_left.php | 2 +- .../site_view/custom_buttons_right.php | 2 +- admin/layouts/site_view/details_above.php | 2 +- admin/layouts/site_view/details_fullwidth.php | 2 +- admin/layouts/site_view/details_left.php | 2 +- admin/layouts/site_view/details_right.php | 2 +- admin/layouts/site_view/details_rightside.php | 2 +- admin/layouts/site_view/details_under.php | 2 +- .../site_view/javascript_css_fullwidth.php | 2 +- .../site_view/linked_components_fullwidth.php | 2 +- admin/layouts/site_view/php_fullwidth.php | 2 +- admin/layouts/site_view/publishing.php | 2 +- admin/layouts/site_view/publlshing.php | 2 +- admin/layouts/snippet/details_above.php | 2 +- admin/layouts/snippet/details_left.php | 2 +- admin/layouts/snippet/details_right.php | 2 +- admin/layouts/snippet/publishing.php | 2 +- admin/layouts/snippet/publlshing.php | 2 +- .../template/custom_script_fullwidth.php | 2 +- admin/layouts/template/details_fullwidth.php | 2 +- admin/layouts/template/details_left.php | 2 +- admin/layouts/template/details_right.php | 2 +- admin/layouts/template/details_rightside.php | 2 +- admin/layouts/template/details_under.php | 2 +- admin/layouts/template/publishing.php | 2 +- admin/layouts/template/publlshing.php | 2 +- admin/models/admin_fields.php | 55 +++- admin/models/admin_fields_conditions.php | 55 +++- admin/models/admin_view.php | 97 +++--- admin/models/admin_views.php | 44 ++- admin/models/admins_fields.php | 23 +- admin/models/admins_fields_conditions.php | 23 +- admin/models/ajax.php | 2 +- admin/models/componentbuilder.php | 13 +- admin/models/field.php | 17 + admin/models/fields/adminviewfolderlist.php | 2 +- admin/models/fields/adminviews.php | 6 +- admin/models/fields/articles.php | 2 +- admin/models/fields/component.php | 2 +- admin/models/fields/components.php | 2 +- admin/models/fields/customadminviews.php | 2 +- admin/models/fields/customfilelist.php | 2 +- admin/models/fields/customfolderlist.php | 2 +- admin/models/fields/customgets.php | 2 +- admin/models/fields/dbtables.php | 2 +- admin/models/fields/dynamicget.php | 2 +- admin/models/fields/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldsmulti.php | 2 +- admin/models/fields/fieldtypes.php | 2 +- admin/models/fields/ftps.php | 2 +- admin/models/fields/lang.php | 2 +- admin/models/fields/maingets.php | 2 +- admin/models/fields/siteviewfolderlist.php | 2 +- admin/models/fields/siteviews.php | 2 +- admin/models/fields/snippets.php | 2 +- admin/models/fields/viewtabs.php | 183 +++++++++++ admin/models/forms/admin_fields.js | 4 +- admin/models/forms/admin_fields.xml | 17 +- admin/models/forms/admin_fields_conditions.js | 4 +- admin/models/forms/admin_view.js | 34 +- admin/models/forms/admin_view.xml | 310 +++++++++--------- admin/models/forms/joomla_component.xml | 2 +- admin/models/import.php | 2 +- admin/models/import_joomla_components.php | 2 +- admin/models/joomla_component.php | 17 + admin/sql/install.mysql.utf8.sql | 2 +- admin/tables/admin_fields.php | 4 +- admin/tables/admin_fields_conditions.php | 4 +- admin/tables/admin_view.php | 4 +- admin/views/admin_fields/submitbutton.js | 4 +- admin/views/admin_fields/tmpl/edit.php | 6 +- admin/views/admin_fields/view.html.php | 18 +- .../admin_fields_conditions/submitbutton.js | 4 +- .../admin_fields_conditions/tmpl/edit.php | 6 +- .../admin_fields_conditions/view.html.php | 18 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 60 ++-- admin/views/admin_view/view.html.php | 20 +- admin/views/admin_views/tmpl/default.php | 4 +- .../admin_views/tmpl/default_batch_body.php | 4 +- .../admin_views/tmpl/default_batch_footer.php | 4 +- admin/views/admin_views/tmpl/default_body.php | 12 +- admin/views/admin_views/tmpl/default_foot.php | 4 +- admin/views/admin_views/tmpl/default_head.php | 4 +- .../admin_views/tmpl/default_toolbar.php | 4 +- admin/views/admin_views/view.html.php | 12 +- admin/views/admins_fields/tmpl/default.php | 4 +- .../admins_fields/tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../views/admins_fields/tmpl/default_body.php | 12 +- .../views/admins_fields/tmpl/default_foot.php | 4 +- .../views/admins_fields/tmpl/default_head.php | 4 +- .../admins_fields/tmpl/default_toolbar.php | 4 +- admin/views/admins_fields/view.html.php | 12 +- .../admins_fields_conditions/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../tmpl/default_body.php | 12 +- .../tmpl/default_foot.php | 4 +- .../tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- .../admins_fields_conditions/view.html.php | 12 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...ult_issues_the_closed_issues_on_github.php | 2 +- ...fault_issues_the_open_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- .../tmpl/default_readme_information.php | 2 +- .../tmpl/default_releases_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- .../tmpl/default_wiki_tutorials.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/field/tmpl/edit.php | 2 + admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- .../import_joomla_components/tmpl/default.php | 2 +- .../import_joomla_components/view.html.php | 2 +- admin/views/joomla_component/tmpl/edit.php | 2 + componentbuilder.xml | 2 +- script.php | 10 +- site/assets/css/site.css | 2 +- site/assets/js/site.js | 2 +- site/componentbuilder.php | 2 +- site/controller.php | 2 +- site/controllers/api.php | 2 +- site/controllers/help.php | 2 +- site/helpers/category.php | 2 +- site/helpers/categoryfields.php | 2 +- site/helpers/categoryfieldtypes.php | 2 +- site/helpers/componentbuilder.php | 2 +- site/helpers/headercheck.php | 2 +- site/helpers/route.php | 2 +- site/router.php | 2 +- site/views/api/submitbutton.js | 2 +- 290 files changed, 1378 insertions(+), 900 deletions(-) rename admin/layouts/admin_view/{settings_above.php => details_above.php} (95%) rename admin/layouts/admin_view/{settings_left.php => details_left.php} (93%) rename admin/layouts/admin_view/{settings_right.php => details_right.php} (91%) rename admin/layouts/admin_view/{settings_under.php => details_under.php} (95%) delete mode 100644 admin/layouts/admin_view/linked_components_fullwidth.php create mode 100644 admin/layouts/admin_view/settings_fullwidth.php create mode 100644 admin/models/fields/viewtabs.php diff --git a/README.md b/README.md index ae54c6516..b7f6a6663 100644 --- a/README.md +++ b/README.md @@ -110,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 12th October, 2017 ++ *Last Build*: 13th October, 2017 + *Version*: 2.5.8 + *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*: **123433** -+ *File count*: **740** ++ *Line count*: **123911** ++ *File count*: **741** + *Folder count*: **129** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/README.txt b/admin/README.txt index ae54c6516..b7f6a6663 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -110,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io) + *Name*: [Component Builder](http://vdm.bz/component-builder) + *First Build*: 30th April, 2015 -+ *Last Build*: 12th October, 2017 ++ *Last Build*: 13th October, 2017 + *Version*: 2.5.8 + *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*: **123433** -+ *File count*: **740** ++ *Line count*: **123911** ++ *File count*: **741** + *Folder count*: **129** > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder). diff --git a/admin/access.xml b/admin/access.xml index dc989b32a..744012ee6 100644 --- a/admin/access.xml +++ b/admin/access.xml @@ -15,16 +15,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -195,6 +219,14 @@
+ + + + + + + +
@@ -325,9 +357,25 @@
+ + + + + + + +
+ + + + + + + +
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index 596f2fa77..3901e6c14 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_fields.css b/admin/assets/css/admin_fields.css index 9354bd1dd..b279cb665 100644 --- a/admin/assets/css/admin_fields.css +++ b/admin/assets/css/admin_fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.css diff --git a/admin/assets/css/admin_fields_conditions.css b/admin/assets/css/admin_fields_conditions.css index 951a843cb..5dcff7b02 100644 --- a/admin/assets/css/admin_fields_conditions.css +++ b/admin/assets/css/admin_fields_conditions.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 22a346cd8..375ea3ae0 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @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 2332f6397..8549c050c 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/admins_fields.css b/admin/assets/css/admins_fields.css index 78c8dbb36..7e7d9af24 100644 --- a/admin/assets/css/admins_fields.css +++ b/admin/assets/css/admins_fields.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.css diff --git a/admin/assets/css/admins_fields_conditions.css b/admin/assets/css/admins_fields_conditions.css index 7a214503d..da6d2813e 100644 --- a/admin/assets/css/admins_fields_conditions.css +++ b/admin/assets/css/admins_fields_conditions.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index 099381f0d..6d24cef0c 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js index c819c95e9..d8bb05b56 100644 --- a/admin/assets/js/admin.js +++ b/admin/assets/js/admin.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.js diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index ff6f1b438..281718ff5 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index 556773ee3..5bd961228 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php index 507ec74b6..b0b4ba727 100644 --- a/admin/controllers/admin_fields.php +++ b/admin/controllers/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php @@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm * @since 1.6 */ protected function allowAdd($data = array()) - { // In the absense of better information, revert to the component permissions. - return parent::allowAdd($data); + { + // Access check. + $access = JFactory::getUser()->authorise('admin_fields.access', 'com_componentbuilder'); + if (!$access) + { + return false; + } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('admin_fields.create', $this->option); } /** @@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + // Access check. + $access = ($user->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $recordId) && $user->authorise('admin_fields.access', 'com_componentbuilder')); + if (!$access) + { + return false; + } + if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit', 'com_componentbuilder.admin_fields.' . (int) $recordId); + $permission = $user->authorise('admin_fields.edit', 'com_componentbuilder.admin_fields.' . (int) $recordId); if (!$permission) { - if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_fields.' . $recordId)) + if ($user->authorise('admin_fields.edit.own', 'com_componentbuilder.admin_fields.' . $recordId)) { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; @@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm // If the owner matches 'me' then allow. if ($ownerId == $user->id) { - if ($user->authorise('core.edit.own', 'com_componentbuilder')) + if ($user->authorise('admin_fields.edit.own', 'com_componentbuilder')) { return true; } @@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm } } // Since there is no permission, revert to the component permissions. - return parent::allowEdit($data, $key); + return $user->authorise('admin_fields.edit', $this->option); } /** diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php index 9562e9fed..39a9652fa 100644 --- a/admin/controllers/admin_fields_conditions.php +++ b/admin/controllers/admin_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php @@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm * @since 1.6 */ protected function allowAdd($data = array()) - { // In the absense of better information, revert to the component permissions. - return parent::allowAdd($data); + { + // Access check. + $access = JFactory::getUser()->authorise('admin_fields_conditions.access', 'com_componentbuilder'); + if (!$access) + { + return false; + } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('admin_fields_conditions.create', $this->option); } /** @@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + // Access check. + $access = ($user->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId) && $user->authorise('admin_fields_conditions.access', 'com_componentbuilder')); + if (!$access) + { + return false; + } + if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId); + $permission = $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId); if (!$permission) { - if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_fields_conditions.' . $recordId)) + if ($user->authorise('admin_fields_conditions.edit.own', 'com_componentbuilder.admin_fields_conditions.' . $recordId)) { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; @@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm // If the owner matches 'me' then allow. if ($ownerId == $user->id) { - if ($user->authorise('core.edit.own', 'com_componentbuilder')) + if ($user->authorise('admin_fields_conditions.edit.own', 'com_componentbuilder')) { return true; } @@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm } } // Since there is no permission, revert to the component permissions. - return parent::allowEdit($data, $key); + return $user->authorise('admin_fields_conditions.edit', $this->option); } /** diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 0bc2fcd16..90838ccd3 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm * @since 1.6 */ protected function allowAdd($data = array()) - { // In the absense of better information, revert to the component permissions. - return parent::allowAdd($data); + { + // Access check. + $access = JFactory::getUser()->authorise('admin_view.access', 'com_componentbuilder'); + if (!$access) + { + return false; + } + // In the absense of better information, revert to the component permissions. + return JFactory::getUser()->authorise('admin_view.create', $this->option); } /** @@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm $recordId = (int) isset($data[$key]) ? $data[$key] : 0; + // Access check. + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $recordId) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + return false; + } + if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit', 'com_componentbuilder.admin_view.' . (int) $recordId); + $permission = $user->authorise('admin_view.edit', 'com_componentbuilder.admin_view.' . (int) $recordId); if (!$permission) { - if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_view.' . $recordId)) + if ($user->authorise('admin_view.edit.own', 'com_componentbuilder.admin_view.' . $recordId)) { // Now test the owner is the user. $ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0; @@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm // If the owner matches 'me' then allow. if ($ownerId == $user->id) { - if ($user->authorise('core.edit.own', 'com_componentbuilder')) + if ($user->authorise('admin_view.edit.own', 'com_componentbuilder')) { return true; } @@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm } } // Since there is no permission, revert to the component permissions. - return parent::allowEdit($data, $key); + return $user->authorise('admin_view.edit', $this->option); } /** diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index c7023b6e8..7ecf068f2 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/admins_fields.php b/admin/controllers/admins_fields.php index f8fea80dc..573620637 100644 --- a/admin/controllers/admins_fields.php +++ b/admin/controllers/admins_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.php diff --git a/admin/controllers/admins_fields_conditions.php b/admin/controllers/admins_fields_conditions.php index ec1b57bc4..f363dd8cf 100644 --- a/admin/controllers/admins_fields_conditions.php +++ b/admin/controllers/admins_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 935127758..d72a54fda 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 598fe4fdb..815c6acf9 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index 14d1f9c80..84c9e7b93 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 1ccc6a0ed..223a62e3a 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php index a4699f9fb..40b50cd48 100644 --- a/admin/controllers/import_joomla_components.php +++ b/admin/controllers/import_joomla_components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage import_joomla_components.php diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 43cc1752d..dd6d2c6bc 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -1393,7 +1393,10 @@ abstract class ComponentbuilderHelper { JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS'), 'index.php?option=com_componentbuilder&view=joomla_components', $submenu === 'joomla_components'); } - JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_ADMIN_VIEWS'), 'index.php?option=com_componentbuilder&view=admin_views', $submenu === 'admin_views'); + if ($user->authorise('admin_view.access', 'com_componentbuilder') && $user->authorise('admin_view.submenu', 'com_componentbuilder')) + { + JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_ADMIN_VIEWS'), 'index.php?option=com_componentbuilder&view=admin_views', $submenu === 'admin_views'); + } if ($user->authorise('custom_admin_view.access', 'com_componentbuilder') && $user->authorise('custom_admin_view.submenu', 'com_componentbuilder')) { JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_CUSTOM_ADMIN_VIEWS'), 'index.php?option=com_componentbuilder&view=custom_admin_views', $submenu === 'custom_admin_views'); diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php index 7a9aaf45f..12d4dc5d0 100644 --- a/admin/helpers/componentbuilderemail.php +++ b/admin/helpers/componentbuilderemail.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilderemail.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 1bcdda490..76e526aec 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php index abac1fa9c..c4ea6db0f 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 139d76958..6da9b7576 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index c5f9cc013..3e6c7f909 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 2d03fed9f..ce4a6004d 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 457eb0750..1fc25c5b8 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -4,15 +4,33 @@ COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders" COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT="Add to Backup Folder & Sales Server <small>(if set)</small>" COM_COMPONENTBUILDER_ADD_TO_REPOSITORY_FOLDER="Add to Repository Folder" COM_COMPONENTBUILDER_ADMINS_FIELDS="Admins Fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS="Admins Fields Access" +COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC="Allows the users in this group to access access admins fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_OPTIONS="Batch process the selected Admins Fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_TIP="All changes will be applied to all selected Admins Fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE="Admins Fields Batch Use" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS="Admins Fields Conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS="Admins Fields Conditions Access" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC="Allows the users in this group to access access admins fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_OPTIONS="Batch process the selected Admins Fields Conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_TIP="All changes will be applied to all selected Admins Fields Conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE="Admins Fields Conditions Batch Use" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE="Admins Fields Conditions Create" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC="Allows the users in this group to create create admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE="Admins Fields Conditions Delete" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC="Allows the users in this group to delete delete admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT="Admins Fields Conditions Edit" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY="Admins Fields Conditions Edit Created By" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE="Admins Fields Conditions Edit Created Date" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC="Allows the users in this group to edit the admin fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN="Admins Fields Conditions Edit Own" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields conditions created by them" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE="Admins Fields Conditions Edit State" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION="Admins Fields Conditions Edit Version" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_ARCHIVED="%s Admins Fields Conditions archived." @@ -32,6 +50,20 @@ COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNFEATURED="%s Admins Fiel COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNFEATURED_1="%s Admin Fields Conditions unfeatured." COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNPUBLISHED="%s Admins Fields Conditions unpublished." COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNPUBLISHED_1="%s Admin Fields Conditions unpublished." +COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE="Admins Fields Create" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC="Allows the users in this group to create create admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE="Admins Fields Delete" +COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC="Allows the users in this group to delete delete admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT="Admins Fields Edit" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY="Admins Fields Edit Created By" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE="Admins Fields Edit Created Date" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC="Allows the users in this group to edit the admin fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN="Admins Fields Edit Own" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields created by them" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE="Admins Fields Edit State" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION="Admins Fields Edit Version" COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_N_ITEMS_ARCHIVED="%s Admins Fields archived." @@ -168,6 +200,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL="Searchable" COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION="Select if the field should be sortable in list view, if shown." COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL="Sortable" COM_COMPONENTBUILDER_ADMIN_FIELDS_STATUS="Status" +COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB="Tab" COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_DESCRIPTION="Select the tab this field belongs to." COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_LABEL="Tab" COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_DESCRIPTION="Select if the field is the title field." @@ -177,14 +210,30 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_DESC="A count of the number of times t COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL="Revision" COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View" COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access" +COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_OPTIONS="Batch process the selected Admin Views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_TIP="All changes will be applied to all selected Admin Views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create" +COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete" +COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY="Admin Views Edit Created By" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE="Admin Views Edit Created Date" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export" @@ -380,6 +429,7 @@ 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_DETAILS="Details" COM_COMPONENTBUILDER_ADMIN_VIEW_DOWNLOAD="Download" COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP="Dump" COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT="Editing the Admin View" @@ -482,7 +532,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key" COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp" COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last" COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link" -COM_COMPONENTBUILDER_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List" COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2" COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location" @@ -1762,6 +1811,7 @@ COM_COMPONENTBUILDER_DASHBOARD_TEMPLATES="Templates

" COM_COMPONENTBUILDER_DASHBOARD_TEMPLATE_ADD="Add Template

" COM_COMPONENTBUILDER_DATE="Date" COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)" +COM_COMPONENTBUILDER_DETAILS="Details" COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install" COM_COMPONENTBUILDER_DOWNLOAD="download" COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get" diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini index 9da821953..f3c9677cb 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini @@ -1,18 +1,66 @@ COM_COMPONENTBUILDER="Component Builder" +COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS="Admins Fields Access" +COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC="Allows the users in this group to access access admins fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE="Admins Fields Batch Use" COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS="Admins Fields Conditions Access" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC="Allows the users in this group to access access admins fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE="Admins Fields Conditions Batch Use" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE="Admins Fields Conditions Create" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC="Allows the users in this group to create create admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE="Admins Fields Conditions Delete" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC="Allows the users in this group to delete delete admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT="Admins Fields Conditions Edit" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY="Admins Fields Conditions Edit Created By" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE="Admins Fields Conditions Edit Created Date" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC="Allows the users in this group to edit the admin fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN="Admins Fields Conditions Edit Own" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields conditions created by them" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE="Admins Fields Conditions Edit State" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields conditions" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION="Admins Fields Conditions Edit Version" COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields conditions" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE="Admins Fields Create" +COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC="Allows the users in this group to create create admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE="Admins Fields Delete" +COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC="Allows the users in this group to delete delete admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT="Admins Fields Edit" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY="Admins Fields Edit Created By" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE="Admins Fields Edit Created Date" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC="Allows the users in this group to edit the admin fields" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN="Admins Fields Edit Own" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields created by them" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE="Admins Fields Edit State" +COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields" COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION="Admins Fields Edit Version" COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields" +COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access" +COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use" COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create" +COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List" COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete" +COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY="Admin Views Edit Created By" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE="Admin Views Edit Created Date" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admin views" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State" +COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version" COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views" COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export" diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php index 23ec9f312..0c596d8d3 100644 --- a/admin/layouts/admin_fields/fields_above.php +++ b/admin/layouts/admin_fields/fields_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_above.php diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php index 69aeab513..550fba1c1 100644 --- a/admin/layouts/admin_fields/fields_fullwidth.php +++ b/admin/layouts/admin_fields/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/admin_fields/publishing.php +++ b/admin/layouts/admin_fields/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/admin_fields/publlshing.php +++ b/admin/layouts/admin_fields/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php index 0b6ff91d1..7171f3638 100644 --- a/admin/layouts/admin_fields_conditions/conditions_above.php +++ b/admin/layouts/admin_fields_conditions/conditions_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_above.php diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php index 282485ce4..a6043c13f 100644 --- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php +++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage conditions_fullwidth.php diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/admin_fields_conditions/publishing.php +++ b/admin/layouts/admin_fields_conditions/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/admin_fields_conditions/publlshing.php +++ b/admin/layouts/admin_fields_conditions/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 723bff5bc..e0820f63b 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 index dcfd33f63..682d05925 100644 --- a/admin/layouts/admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php index 2725c535c..2fae75522 100644 --- a/admin/layouts/admin_view/custom_buttons_left.php +++ b/admin/layouts/admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php index c60c1a6d6..197d3d232 100644 --- a/admin/layouts/admin_view/custom_import_fullwidth.php +++ b/admin/layouts/admin_view/custom_import_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php @@ -27,30 +27,112 @@ defined('_JEXEC') or die('Restricted access'); -$form = $displayData->getForm(); - -$fields = $displayData->get('fields') ?: array( - 'note_beginner_import', - 'note_advanced_import', - 'add_custom_import', - 'php_import_display', - 'html_import_view', - 'php_import', - 'php_import_setdata', - 'php_import_save', - 'php_import_ext' -); +// set the defaults +$items = $displayData->vxzcustom_import; +$user = JFactory::getUser(); +$id = $displayData->item->id; +$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; ?>
- -
-
- getLabel($field); ?> -
-
- getInput($field); ?> -
-
- + + + + + + + + + + + + + + + + $item): ?> + authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; + $userChkOut = JFactory::getUser($item->checked_out); + $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); + ?> + + + + + + + + published == 1):?> + + published == 0):?> + + published == 2):?> + + published == -2):?> + + + + + + +
+ + + + + + + + + + + + + + + +
+ get('core.edit')): ?> + escape($item->system_name); ?> + checked_out): ?> + name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> + + +
escape($item->system_name); ?>
+ + 		+ escape($item->name_code); ?> + + escape($item->component_version); ?> + + escape($item->short_description); ?> + + escape($item->companyname); ?> + + escape($item->author); ?> + + + + + + + + + + + + + + + + + + id; ?> +
+ +
+ +
+
diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/details_above.php similarity index 95% rename from admin/layouts/admin_view/settings_above.php rename to admin/layouts/admin_view/details_above.php index fb478bd95..f05c54994 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/details_above.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage settings_above.php + @subpackage details_above.php @author Llewellyn 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 diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/details_left.php similarity index 93% rename from admin/layouts/admin_view/settings_left.php rename to admin/layouts/admin_view/details_left.php index d097ef3c7..7d814163f 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/details_left.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage settings_left.php + @subpackage details_left.php @author Llewellyn 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 @@ -33,9 +33,6 @@ $fields = $displayData->get('fields') ?: array( 'name_single', 'name_list', 'type', - 'short_description', - 'description', - 'add_fadein', 'icon', 'icon_add', 'icon_category' diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/details_right.php similarity index 91% rename from admin/layouts/admin_view/settings_right.php rename to admin/layouts/admin_view/details_right.php index c1fe36818..e3e792a3a 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/details_right.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage settings_right.php + @subpackage details_right.php @author Llewellyn 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 @@ -30,11 +30,9 @@ defined('_JEXEC') or die('Restricted access'); $form = $displayData->getForm(); $fields = $displayData->get('fields') ?: array( - 'note_on_permissions', - 'addpermissions', - 'note_on_tabs', - 'addtabs', - 'addlinked_views' + 'short_description', + 'description', + 'add_fadein' ); $hiddenFields = $displayData->get('hidden_fields') ?: array(); diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/details_under.php similarity index 95% rename from admin/layouts/admin_view/settings_under.php rename to admin/layouts/admin_view/details_under.php index 162833565..1d11bc093 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/details_under.php @@ -11,10 +11,10 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder - @subpackage settings_under.php + @subpackage details_under.php @author Llewellyn 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 diff --git a/admin/layouts/admin_view/fields_conditions_fullwidth.php b/admin/layouts/admin_view/fields_conditions_fullwidth.php index 17a6aca8c..76ef39b14 100644 --- a/admin/layouts/admin_view/fields_conditions_fullwidth.php +++ b/admin/layouts/admin_view/fields_conditions_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_fullwidth.php diff --git a/admin/layouts/admin_view/fields_conditions_left.php b/admin/layouts/admin_view/fields_conditions_left.php index 8c9af1fe7..0623ce25c 100644 --- a/admin/layouts/admin_view/fields_conditions_left.php +++ b/admin/layouts/admin_view/fields_conditions_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_left.php diff --git a/admin/layouts/admin_view/fields_conditions_right.php b/admin/layouts/admin_view/fields_conditions_right.php index 69071374c..f757aa767 100644 --- a/admin/layouts/admin_view/fields_conditions_right.php +++ b/admin/layouts/admin_view/fields_conditions_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_conditions_right.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 524350d58..baad275f9 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_fullwidth.php diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php deleted file mode 100644 index 955fc207a..000000000 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ /dev/null @@ -1,138 +0,0 @@ - - @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'); - -// set the defaults -$items = $displayData->vxzlinked_components; -$user = JFactory::getUser(); -$id = $displayData->item->id; -$edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit"; - -?> -
- - - - - - - - - - - - - - - - $item): ?> - authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0; - $userChkOut = JFactory::getUser($item->checked_out); - $canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components'); - ?> - - - - - - - - published == 1):?> - - published == 0):?> - - published == 2):?> - - published == -2):?> - - - - - - -
- - - - - - - - - - - - - - - -
- get('core.edit')): ?> - escape($item->system_name); ?> - checked_out): ?> - name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?> - - -
escape($item->system_name); ?>
- - 		- escape($item->name_code); ?> - - escape($item->component_version); ?> - - escape($item->short_description); ?> - - escape($item->companyname); ?> - - escape($item->author); ?> - - - - - - - - - - - - - - - - - - id; ?> -
- -
- -
- -
diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index b0d3bdc94..f4fd388fe 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 bc7bf48a6..8e577d2e0 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 63fefe8fc..829fbc5fa 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 fb681cf40..3d87e360d 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php new file mode 100644 index 000000000..ede1fbae3 --- /dev/null +++ b/admin/layouts/admin_view/settings_fullwidth.php @@ -0,0 +1,52 @@ + + @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( + 'note_on_permissions', + 'addpermissions', + 'note_on_tabs', + 'addtabs', + 'addlinked_views' +); + +?> +
+ +
+
+ getLabel($field); ?> +
+
+ getInput($field); ?> +
+
+ +
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 83fcedc36..5bb9604fc 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage batchselection.php diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php index 3c75a77c4..e88926942 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 2725c535c..2fae75522 100644 --- a/admin/layouts/custom_admin_view/custom_buttons_left.php +++ b/admin/layouts/custom_admin_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 c5e7bc878..b9ccfada6 100644 --- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php +++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 f23dac70d..f05c54994 100644 --- a/admin/layouts/custom_admin_view/details_above.php +++ b/admin/layouts/custom_admin_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 cf0e1f4c9..6b7444ac5 100644 --- a/admin/layouts/custom_admin_view/details_fullwidth.php +++ b/admin/layouts/custom_admin_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 e97d5302c..3bdbc32ad 100644 --- a/admin/layouts/custom_admin_view/details_left.php +++ b/admin/layouts/custom_admin_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 30ff71078..6749a9fa8 100644 --- a/admin/layouts/custom_admin_view/details_right.php +++ b/admin/layouts/custom_admin_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 199ef5937..a7487da57 100644 --- a/admin/layouts/custom_admin_view/details_rightside.php +++ b/admin/layouts/custom_admin_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 21469c10a..1d11bc093 100644 --- a/admin/layouts/custom_admin_view/details_under.php +++ b/admin/layouts/custom_admin_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php index 44cbfd749..c14d1301d 100644 --- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php +++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php index ebcb00eb4..fcf66fd67 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php index fb2c9dd47..f332ac07c 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php index 11332d983..e1a4bee7f 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php index 44a1536e1..c6a616685 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 9a3d8998a..e3bbeb30e 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 b7e511227..8277f6571 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 480bce0cf..d23e216f8 100644 --- a/admin/layouts/dynamic_get/custom_script_fullwidth.php +++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php index 60e46f647..d59fd3b93 100644 --- a/admin/layouts/dynamic_get/joint_fullwidth.php +++ b/admin/layouts/dynamic_get/joint_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage joint_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php index 5a9ac9720..981debe49 100644 --- a/admin/layouts/dynamic_get/main_above.php +++ b/admin/layouts/dynamic_get/main_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_above.php diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php index b69ad2324..423e52c05 100644 --- a/admin/layouts/dynamic_get/main_fullwidth.php +++ b/admin/layouts/dynamic_get/main_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_fullwidth.php diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php index 4887d7ac9..fa8ffeca0 100644 --- a/admin/layouts/dynamic_get/main_left.php +++ b/admin/layouts/dynamic_get/main_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_left.php diff --git a/admin/layouts/dynamic_get/main_right.php b/admin/layouts/dynamic_get/main_right.php index 6dc1fe383..8d3351c6d 100644 --- a/admin/layouts/dynamic_get/main_right.php +++ b/admin/layouts/dynamic_get/main_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_right.php diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php index e714dcb1f..4cafe4bff 100644 --- a/admin/layouts/dynamic_get/main_under.php +++ b/admin/layouts/dynamic_get/main_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage main_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 efe14f575..c7d2d67b6 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 e4bfa611e..f96100401 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 78805a53f..ae5271306 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 21469c10a..1d11bc093 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php index 1740a412a..603b5ce38 100644 --- a/admin/layouts/field/linked_admin_views_fullwidth.php +++ b/admin/layouts/field/linked_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php @@ -68,7 +68,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. ?> - get('core.edit')): ?> + get('admin_view.edit')): ?> escape($item->system_name); ?> checked_out): ?> name, $item->checked_out_time, 'admin_views.', $canCheckin); ?> diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 29cca0a17..5279e2a2c 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 8454b21ae..b3f145e2d 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php index 8fe616fc4..f3215fdce 100644 --- a/admin/layouts/fieldtype/details_fullwidth.php +++ b/admin/layouts/fieldtype/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index 49a1c01e7..67bb31889 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 f2dd1ef0e..f2b1a1189 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 1a7278104..bbd9a31d0 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/ftp/details_above.php b/admin/layouts/ftp/details_above.php index ddf73b2ea..04e15b13c 100644 --- a/admin/layouts/ftp/details_above.php +++ b/admin/layouts/ftp/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/ftp/details_fullwidth.php b/admin/layouts/ftp/details_fullwidth.php index 74c89401a..1a8d925ce 100644 --- a/admin/layouts/ftp/details_fullwidth.php +++ b/admin/layouts/ftp/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/ftp/linked_components_fullwidth.php b/admin/layouts/ftp/linked_components_fullwidth.php index 81441858e..209e61fb6 100644 --- a/admin/layouts/ftp/linked_components_fullwidth.php +++ b/admin/layouts/ftp/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/ftp/publishing.php b/admin/layouts/ftp/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/ftp/publishing.php +++ b/admin/layouts/ftp/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/ftp/publlshing.php b/admin/layouts/ftp/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/ftp/publlshing.php +++ b/admin/layouts/ftp/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 a43418bfa..29dd1599a 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 b815e1f5d..3c71d469f 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 bf20ea1b8..8b4538841 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 a4b6056f6..3746e8497 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 21469c10a..1d11bc093 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 fb681cf40..3d87e360d 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php index 44b541fc7..b9f5657a6 100644 --- a/admin/layouts/joomla_component/admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php @@ -38,7 +38,7 @@ $can = ComponentbuilderHelper::getActions('admin_view'); ?>
-get('core.create')): ?> +get('admin_view.create')): ?>

@@ -74,7 +74,7 @@ $can = ComponentbuilderHelper::getActions('admin_view'); ?> - get('core.edit')): ?> + get('admin_view.edit')): ?> escape($item->system_name); ?> checked_out): ?> name, $item->checked_out_time, 'admin_views.', $canCheckin); ?> diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 22a7f2d94..a72ba8cbd 100644 --- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php +++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php index f23dac70d..f05c54994 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php index cc99d2903..2a8282eea 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php index 29575f88c..ebd7d7f84 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php index 21469c10a..1d11bc093 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_under.php diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php index 59b12684e..f79f0247d 100644 --- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_build_beta_fullwidth.php diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php index c0c76492c..9cf159784 100644 --- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php +++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamic_integration_fullwidth.php diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php index fdf3c095a..25db77e86 100644 --- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php +++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/metadata.php b/admin/layouts/joomla_component/metadata.php index 1ce02c258..feacbbe9e 100644 --- a/admin/layouts/joomla_component/metadata.php +++ b/admin/layouts/joomla_component/metadata.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage metadata.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index 33e3b0c57..30ad472d0 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage mysql_fullwidth.php diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php index 50884943e..acb709273 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage php_fullwidth.php diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php index d5c295540..b48e51357 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index a4bed1ca4..5272dfcae 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_left.php diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php index 7c5b9c3bc..636e40a43 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage readme_right.php diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php index 0e1305dab..04b6946c0 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index b97449d7c..93a2558e2 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index ae8b3114b..650dca686 100644 --- a/admin/layouts/joomla_component/site_views_fullwidth.php +++ b/admin/layouts/joomla_component/site_views_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php index 96a982f3f..fb613ac6d 100644 --- a/admin/layouts/joomla_component/translation_fullwidth.php +++ b/admin/layouts/joomla_component/translation_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage translation_fullwidth.php diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php index 9401a56e4..4c09bab1a 100644 --- a/admin/layouts/language/details_left.php +++ b/admin/layouts/language/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_left.php diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php index 62441e6d3..ec59fd56f 100644 --- a/admin/layouts/language/details_right.php +++ b/admin/layouts/language/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_right.php diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/language/publishing.php +++ b/admin/layouts/language/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/language/publlshing.php +++ b/admin/layouts/language/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php index b5b4aef34..b25a2cc83 100644 --- a/admin/layouts/language_translation/details_above.php +++ b/admin/layouts/language_translation/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_above.php diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php index eb1d0117a..64acb9121 100644 --- a/admin/layouts/language_translation/details_fullwidth.php +++ b/admin/layouts/language_translation/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage details_fullwidth.php diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php index fb681cf40..3d87e360d 100644 --- a/admin/layouts/language_translation/publishing.php +++ b/admin/layouts/language_translation/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php index ad942d2f1..727b044ff 100644 --- a/admin/layouts/language_translation/publlshing.php +++ b/admin/layouts/language_translation/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 32ecee070..4fb14add5 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 54b2f1ee2..16a2d5dca 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 6df1fb844..d761d08cf 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 9b2e232c3..f5696cacd 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 d462afb5f..9cfff0555 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 21469c10a..1d11bc093 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 fb681cf40..3d87e360d 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 969ef17a5..8fb1b677f 100644 --- a/admin/layouts/site_view/custom_buttons_fullwidth.php +++ b/admin/layouts/site_view/custom_buttons_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php index 04b569c28..5e761dd58 100644 --- a/admin/layouts/site_view/custom_buttons_left.php +++ b/admin/layouts/site_view/custom_buttons_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_left.php diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php index 208628d3f..60f066d6a 100644 --- a/admin/layouts/site_view/custom_buttons_right.php +++ b/admin/layouts/site_view/custom_buttons_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_right.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index f23dac70d..f05c54994 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 cf0e1f4c9..6b7444ac5 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 e97d5302c..3bdbc32ad 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 9b2e232c3..f5696cacd 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 199ef5937..a7487da57 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 21469c10a..1d11bc093 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 055a6e300..e2879e9ad 100644 --- a/admin/layouts/site_view/javascript_css_fullwidth.php +++ b/admin/layouts/site_view/javascript_css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage javascript_css_fullwidth.php diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php index cfb7fcb47..836b25b8b 100644 --- a/admin/layouts/site_view/linked_components_fullwidth.php +++ b/admin/layouts/site_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php index 754c7f23e..ab45d3b36 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 fb681cf40..3d87e360d 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 35bc05647..0f2766aa2 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 f1ba0a275..f37672112 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 72b9af6c0..38f0d35f0 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 fb681cf40..3d87e360d 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 32ecee070..4fb14add5 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 f874474c4..d0e0f82fc 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 6df1fb844..d761d08cf 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 9b2e232c3..f5696cacd 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 d462afb5f..9cfff0555 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 21469c10a..1d11bc093 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 fb681cf40..3d87e360d 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 ad942d2f1..727b044ff 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php index 2c8aa3729..146b0fc58 100644 --- a/admin/models/admin_fields.php +++ b/admin/models/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php @@ -101,6 +101,26 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $addfields = new Registry; $addfields->loadString($item->addfields); $item->addfields = $addfields->toArray(); + } + + // check what type of field array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->addfields) && isset($item->addfields['field'])) + { + $bucket = array(); + foreach($item->addfields as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addfields'.$nr][$option] = $value; + } + } + $item->addfields = $bucket; + // update the fields in the DB + $fieldsUpdate = new stdClass(); + $fieldsUpdate->id = (int) $item->id; + $fieldsUpdate->addfields = json_encode($bucket); + $this->_db->updateObject('#__componentbuilder_admin_fields', $fieldsUpdate, 'id'); } if (!empty($item->id)) @@ -150,8 +170,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin // Check for existing item. // Modify the form based on Edit State access controls. - if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_fields.' . (int) $id)) - || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder'))) + if ($id != 0 && (!$user->authorise('admin_fields.edit.state', 'com_componentbuilder.admin_fields.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); @@ -167,7 +187,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $form->setValue('created_by', null, $user->id); } // Modify the form based on Edit Creaded By access controls. - if (!$user->authorise('core.edit.created_by', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_fields.edit.created_by', 'com_componentbuilder.admin_fields.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields.edit.created_by', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); @@ -177,7 +198,8 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $form->setFieldAttribute('created_by', 'filter', 'unset'); } // Modify the form based on Edit Creaded Date access controls. - if (!$user->authorise('core.edit.created', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_fields.edit.created', 'com_componentbuilder.admin_fields.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields.edit.created', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); @@ -231,7 +253,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $user = JFactory::getUser(); // The record has been set. Check the record permissions. - return $user->authorise('core.delete', 'com_componentbuilder.admin_fields.' . (int) $record->id); + return $user->authorise('admin_fields.delete', 'com_componentbuilder.admin_fields.' . (int) $record->id); } return false; } @@ -253,14 +275,14 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_fields.' . (int) $recordId); + $permission = $user->authorise('admin_fields.edit.state', 'com_componentbuilder.admin_fields.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } // In the absense of better information, revert to the component permissions. - return parent::canEditState($record); + return $user->authorise('admin_fields.edit.state', 'com_componentbuilder'); } /** @@ -275,8 +297,9 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin protected function allowEdit($data = array(), $key = 'id') { // Check specific edit permission then general edit permission. + $user = JFactory::getUser(); - return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_fields.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key); + return $user->authorise('admin_fields.edit', 'com_componentbuilder.admin_fields.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_fields.edit', 'com_componentbuilder'); } /** @@ -528,7 +551,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_fields'); } - if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_fields.create') && !$this->canDo->get('admin_fields.batch')) { return false; } @@ -543,7 +566,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin { $values['published'] = 0; } - elseif (isset($values['published']) && !$this->canDo->get('core.edit.state')) + elseif (isset($values['published']) && !$this->canDo->get('admin_fields.edit.state')) { $values['published'] = 0; } @@ -560,7 +583,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin // only allow copy if user may edit this item. - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_fields.edit', $contexts[$pk])) { @@ -677,14 +700,14 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_fields'); } - if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_fields.edit') && !$this->canDo->get('admin_fields.batch')) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); return false; } // make sure published only updates if user has the permission. - if (isset($values['published']) && !$this->canDo->get('core.edit.state')) + if (isset($values['published']) && !$this->canDo->get('admin_fields.edit.state')) { unset($values['published']); } @@ -694,7 +717,7 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin // Parent exists so we proceed foreach ($pks as $pk) { - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_fields.edit', $contexts[$pk])) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php index 87be74748..05609d174 100644 --- a/admin/models/admin_fields_conditions.php +++ b/admin/models/admin_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php @@ -101,6 +101,26 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $addconditions = new Registry; $addconditions->loadString($item->addconditions); $item->addconditions = $addconditions->toArray(); + } + + // check what type of conditions array we have here (should be subform... but just incase) + // This could happen due to huge data sets + if (isset($item->addconditions) && isset($item->addconditions['target_field'])) + { + $bucket = array(); + foreach($item->addconditions as $option => $values) + { + foreach($values as $nr => $value) + { + $bucket['addconditions'.$nr][$option] = $value; + } + } + $item->addconditions = $bucket; + // update the fields + $conditionsUpdate = new stdClass(); + $conditionsUpdate->id = (int) $item->id; + $conditionsUpdate->addconditions = json_encode($bucket); + $this->_db->updateObject('#__componentbuilder_admin_fields_conditions', $conditionsUpdate, 'id'); } if (!empty($item->id)) @@ -150,8 +170,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin // Check for existing item. // Modify the form based on Edit State access controls. - if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $id)) - || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder'))) + if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); @@ -167,7 +187,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $form->setValue('created_by', null, $user->id); } // Modify the form based on Edit Creaded By access controls. - if (!$user->authorise('core.edit.created_by', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.created_by', 'com_componentbuilder.admin_fields_conditions.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.created_by', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); @@ -177,7 +198,8 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $form->setFieldAttribute('created_by', 'filter', 'unset'); } // Modify the form based on Edit Creaded Date access controls. - if (!$user->authorise('core.edit.created', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_fields_conditions.edit.created', 'com_componentbuilder.admin_fields_conditions.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_fields_conditions.edit.created', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); @@ -231,7 +253,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $user = JFactory::getUser(); // The record has been set. Check the record permissions. - return $user->authorise('core.delete', 'com_componentbuilder.admin_fields_conditions.' . (int) $record->id); + return $user->authorise('admin_fields_conditions.delete', 'com_componentbuilder.admin_fields_conditions.' . (int) $record->id); } return false; } @@ -253,14 +275,14 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId); + $permission = $user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } // In the absense of better information, revert to the component permissions. - return parent::canEditState($record); + return $user->authorise('admin_fields_conditions.edit.state', 'com_componentbuilder'); } /** @@ -275,8 +297,9 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin protected function allowEdit($data = array(), $key = 'id') { // Check specific edit permission then general edit permission. + $user = JFactory::getUser(); - return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_fields_conditions.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key); + return $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder.admin_fields_conditions.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder'); } /** @@ -528,7 +551,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions'); } - if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_fields_conditions.create') && !$this->canDo->get('admin_fields_conditions.batch')) { return false; } @@ -543,7 +566,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin { $values['published'] = 0; } - elseif (isset($values['published']) && !$this->canDo->get('core.edit.state')) + elseif (isset($values['published']) && !$this->canDo->get('admin_fields_conditions.edit.state')) { $values['published'] = 0; } @@ -560,7 +583,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin // only allow copy if user may edit this item. - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_fields_conditions.edit', $contexts[$pk])) { @@ -677,14 +700,14 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions'); } - if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_fields_conditions.edit') && !$this->canDo->get('admin_fields_conditions.batch')) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); return false; } // make sure published only updates if user has the permission. - if (isset($values['published']) && !$this->canDo->get('core.edit.state')) + if (isset($values['published']) && !$this->canDo->get('admin_fields_conditions.edit.state')) { unset($values['published']); } @@ -694,7 +717,7 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin // Parent exists so we proceed foreach ($pks as $pk) { - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_fields_conditions.edit', $contexts[$pk])) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 3be57afe9..94beb47e6 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -148,10 +148,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->ajax_input = $ajax_input->toArray(); } - if (!empty($item->php_after_delete)) + if (!empty($item->php_getitems)) { - // base64 Decode php_after_delete. - $item->php_after_delete = base64_decode($item->php_after_delete); + // base64 Decode php_getitems. + $item->php_getitems = base64_decode($item->php_getitems); + } + + if (!empty($item->php_batchmove)) + { + // base64 Decode php_batchmove. + $item->php_batchmove = base64_decode($item->php_batchmove); } if (!empty($item->php_save)) @@ -160,6 +166,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_save = base64_decode($item->php_save); } + 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_getlistquery)) { // base64 Decode php_getlistquery. @@ -178,12 +190,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_after_publish = base64_decode($item->php_after_publish); } - if (!empty($item->php_getitems)) - { - // base64 Decode php_getitems. - $item->php_getitems = base64_decode($item->php_getitems); - } - if (!empty($item->php_import)) { // base64 Decode php_import. @@ -208,12 +214,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_postsavehook = base64_decode($item->php_postsavehook); } - if (!empty($item->php_batchmove)) - { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); - } - if (!empty($item->php_batchcopy)) { // base64 Decode php_batchcopy. @@ -383,7 +383,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin * * @return mixed An array of data items on success, false on failure. */ - public function getVxzlinked_components() + public function getVxzcustom_import() { // Get the user object. $user = JFactory::getUser(); @@ -490,8 +490,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // Check for existing item. // Modify the form based on Edit State access controls. - if ($id != 0 && (!$user->authorise('core.edit.state', 'com_componentbuilder.admin_view.' . (int) $id)) - || ($id == 0 && !$user->authorise('core.edit.state', 'com_componentbuilder'))) + if ($id != 0 && (!$user->authorise('admin_view.edit.state', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.state', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('ordering', 'disabled', 'true'); @@ -507,7 +507,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $form->setValue('created_by', null, $user->id); } // Modify the form based on Edit Creaded By access controls. - if (!$user->authorise('core.edit.created_by', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_view.edit.created_by', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.created_by', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created_by', 'disabled', 'true'); @@ -517,7 +518,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $form->setFieldAttribute('created_by', 'filter', 'unset'); } // Modify the form based on Edit Creaded Date access controls. - if (!$user->authorise('core.edit.created', 'com_componentbuilder')) + if ($id != 0 && (!$user->authorise('admin_view.edit.created', 'com_componentbuilder.admin_view.' . (int) $id)) + || ($id == 0 && !$user->authorise('admin_view.edit.created', 'com_componentbuilder'))) { // Disable fields for display. $form->setFieldAttribute('created', 'disabled', 'true'); @@ -571,7 +573,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $user = JFactory::getUser(); // The record has been set. Check the record permissions. - return $user->authorise('core.delete', 'com_componentbuilder.admin_view.' . (int) $record->id); + return $user->authorise('admin_view.delete', 'com_componentbuilder.admin_view.' . (int) $record->id); } return false; } @@ -593,14 +595,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin if ($recordId) { // The record has been set. Check the record permissions. - $permission = $user->authorise('core.edit.state', 'com_componentbuilder.admin_view.' . (int) $recordId); + $permission = $user->authorise('admin_view.edit.state', 'com_componentbuilder.admin_view.' . (int) $recordId); if (!$permission && !is_null($permission)) { return false; } } // In the absense of better information, revert to the component permissions. - return parent::canEditState($record); + return $user->authorise('admin_view.edit.state', 'com_componentbuilder'); } /** @@ -615,8 +617,9 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin protected function allowEdit($data = array(), $key = 'id') { // Check specific edit permission then general edit permission. + $user = JFactory::getUser(); - return JFactory::getUser()->authorise('core.edit', 'com_componentbuilder.admin_view.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or parent::allowEdit($data, $key); + return $user->authorise('admin_view.edit', 'com_componentbuilder.admin_view.'. ((int) isset($data[$key]) ? $data[$key] : 0)) or $user->authorise('admin_view.edit', 'com_componentbuilder'); } /** @@ -904,7 +907,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_view'); } - if (!$this->canDo->get('core.create') || !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_view.create') && !$this->canDo->get('admin_view.batch')) { return false; } @@ -919,7 +922,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin { $values['published'] = 0; } - elseif (isset($values['published']) && !$this->canDo->get('core.edit.state')) + elseif (isset($values['published']) && !$this->canDo->get('admin_view.edit.state')) { $values['published'] = 0; } @@ -936,7 +939,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // only allow copy if user may edit this item. - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_view.edit', $contexts[$pk])) { @@ -1051,14 +1054,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $this->canDo = ComponentbuilderHelper::getActions('admin_view'); } - if (!$this->canDo->get('core.edit') && !$this->canDo->get('core.batch')) + if (!$this->canDo->get('admin_view.edit') && !$this->canDo->get('admin_view.batch')) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); return false; } // make sure published only updates if user has the permission. - if (isset($values['published']) && !$this->canDo->get('core.edit.state')) + if (isset($values['published']) && !$this->canDo->get('admin_view.edit.state')) { unset($values['published']); } @@ -1068,7 +1071,7 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // Parent exists so we proceed foreach ($pks as $pk) { - if (!$this->user->authorise('core.edit', $contexts[$pk])) + if (!$this->user->authorise('admin_view.edit', $contexts[$pk])) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT')); @@ -1241,10 +1244,16 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['ajax_input'] = ''; } - // Set the php_after_delete string to base64 string. - if (isset($data['php_after_delete'])) + // Set the php_getitems string to base64 string. + if (isset($data['php_getitems'])) { - $data['php_after_delete'] = base64_encode($data['php_after_delete']); + $data['php_getitems'] = base64_encode($data['php_getitems']); + } + + // Set the php_batchmove string to base64 string. + if (isset($data['php_batchmove'])) + { + $data['php_batchmove'] = base64_encode($data['php_batchmove']); } // Set the php_save string to base64 string. @@ -1253,6 +1262,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_save'] = base64_encode($data['php_save']); } + // 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_getlistquery string to base64 string. if (isset($data['php_getlistquery'])) { @@ -1271,12 +1286,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_after_publish'] = base64_encode($data['php_after_publish']); } - // Set the php_getitems string to base64 string. - if (isset($data['php_getitems'])) - { - $data['php_getitems'] = base64_encode($data['php_getitems']); - } - // Set the php_import string to base64 string. if (isset($data['php_import'])) { @@ -1301,12 +1310,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); } - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) - { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); - } - // Set the php_batchcopy string to base64 string. if (isset($data['php_batchcopy'])) { diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index 7f62d32cd..8ab537601 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -113,7 +113,24 @@ class ComponentbuilderModelAdmin_views extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); + $items = parent::getItems(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } // return items return $items; @@ -213,20 +230,31 @@ class ComponentbuilderModelAdmin_views extends JModelList // set values to display correctly. if (ComponentbuilderHelper::checkArray($items)) { + // get user object. + $user = JFactory::getUser(); foreach ($items as $nr => &$item) { - // decode php_after_delete - $item->php_after_delete = base64_decode($item->php_after_delete); + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + // decode php_getitems + $item->php_getitems = base64_decode($item->php_getitems); + // decode php_batchmove + $item->php_batchmove = base64_decode($item->php_batchmove); // decode php_save $item->php_save = base64_decode($item->php_save); + // decode php_after_delete + $item->php_after_delete = base64_decode($item->php_after_delete); // decode php_getlistquery $item->php_getlistquery = base64_decode($item->php_getlistquery); // decode php_allowedit $item->php_allowedit = base64_decode($item->php_allowedit); // decode php_after_publish $item->php_after_publish = base64_decode($item->php_after_publish); - // decode php_getitems - $item->php_getitems = base64_decode($item->php_getitems); // decode php_import $item->php_import = base64_decode($item->php_import); // decode php_getitems_after_all @@ -235,8 +263,6 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_before_save = base64_decode($item->php_before_save); // decode php_postsavehook $item->php_postsavehook = base64_decode($item->php_postsavehook); - // decode php_batchmove - $item->php_batchmove = base64_decode($item->php_batchmove); // decode php_batchcopy $item->php_batchcopy = base64_decode($item->php_batchcopy); // decode php_before_publish diff --git a/admin/models/admins_fields.php b/admin/models/admins_fields.php index b375ff59e..8af1845df 100644 --- a/admin/models/admins_fields.php +++ b/admin/models/admins_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields.php @@ -99,7 +99,24 @@ class ComponentbuilderModelAdmins_fields extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); + $items = parent::getItems(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $item->id) && $user->authorise('admin_fields.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } // return items return $items; diff --git a/admin/models/admins_fields_conditions.php b/admin/models/admins_fields_conditions.php index 36979f431..4883cf0c8 100644 --- a/admin/models/admins_fields_conditions.php +++ b/admin/models/admins_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admins_fields_conditions.php @@ -99,7 +99,24 @@ class ComponentbuilderModelAdmins_fields_conditions extends JModelList $this->checkInNow(); // load parent items - $items = parent::getItems(); + $items = parent::getItems(); + + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $item->id) && $user->authorise('admin_fields_conditions.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } // return items return $items; diff --git a/admin/models/ajax.php b/admin/models/ajax.php index b58ba619f..2c2435f15 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index 398a23be7..b540dc7ff 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php @@ -54,6 +54,9 @@ class ComponentbuilderModelComponentbuilder extends JModelList 'joomla_components.submenu' => 'joomla_component.submenu', 'joomla_components.dashboard_list' => 'joomla_component.dashboard_list', 'joomla_component.dashboard_add' => 'joomla_component.dashboard_add', + 'admin_view.create' => 'admin_view.create', + 'admin_views.access' => 'admin_view.access', + 'admin_view.access' => 'admin_view.access', 'admin_views.submenu' => 'admin_view.submenu', 'admin_views.dashboard_list' => 'admin_view.dashboard_list', 'admin_view.dashboard_add' => 'admin_view.dashboard_add', @@ -124,7 +127,13 @@ class ComponentbuilderModelComponentbuilder extends JModelList 'help_document.access' => 'help_document.access', 'help_documents.submenu' => 'help_document.submenu', 'help_documents.dashboard_list' => 'help_document.dashboard_list', - 'help_document.dashboard_add' => 'help_document.dashboard_add'); + 'help_document.dashboard_add' => 'help_document.dashboard_add', + 'admin_fields.create' => 'admin_fields.create', + 'admins_fields.access' => 'admin_fields.access', + 'admin_fields.access' => 'admin_fields.access', + 'admin_fields_conditions.create' => 'admin_fields_conditions.create', + 'admins_fields_conditions.access' => 'admin_fields_conditions.access', + 'admin_fields_conditions.access' => 'admin_fields_conditions.access'); foreach($viewGroups as $group => $views) { $i = 0; diff --git a/admin/models/field.php b/admin/models/field.php index 3604b418a..bff97fa66 100644 --- a/admin/models/field.php +++ b/admin/models/field.php @@ -166,6 +166,23 @@ class ComponentbuilderModelField extends JModelAdmin { $items = $db->loadObjectList(); + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } + // Filter by addfieldsvvwc in this Repetable Field if (ComponentbuilderHelper::checkArray($items) && isset($this->addfieldsvvwc)) { diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 208ef6616..995749d30 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviewfolderlist.php diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php index 077fcc271..042704d80 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php @@ -79,7 +79,7 @@ class JFormFieldAdminviews extends JFormFieldList } $user = JFactory::getUser(); // only add if user allowed to create admin_view - if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build Create button $buttonNamee = trim($buttonName); @@ -92,7 +92,7 @@ class JFormFieldAdminviews extends JFormFieldList '; } // only add if user allowed to edit admin_view - if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. { // build edit button $buttonNamee = trim($buttonName); diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index c14e6d885..07238581b 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage articles.php diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php index ccb86a672..e8a915b16 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php index 66bdb14d5..7d6b9a6ae 100644 --- a/admin/models/fields/components.php +++ b/admin/models/fields/components.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage components.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 4b64cd33f..415eebcb4 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 bc69b8833..b007a9ef5 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 666be06d7..51418843b 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 09df4d3f5..e1eda63ec 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 e60ed4939..a727528f3 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php index 28f9e2073..cbb6ee87b 100644 --- a/admin/models/fields/dynamicget.php +++ b/admin/models/fields/dynamicget.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage dynamicget.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 5cfac4ced..4cd91a92f 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 cbeb0dca4..772ce5fb2 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 731c207cc..5c6ac133b 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 fba9ce108..a70833672 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/ftps.php b/admin/models/fields/ftps.php index 3ae998a9f..805bcd530 100644 --- a/admin/models/fields/ftps.php +++ b/admin/models/fields/ftps.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage ftps.php diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php index 877ca35ea..5fea9c660 100644 --- a/admin/models/fields/lang.php +++ b/admin/models/fields/lang.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage lang.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index b18f26dbb..8b6718eb8 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage maingets.php diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php index e1a17660e..b155075ab 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage siteviewfolderlist.php diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php index dac3d1c10..b69a51766 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @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 7ba01126e..3eb187395 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/fields/viewtabs.php b/admin/models/fields/viewtabs.php new file mode 100644 index 000000000..39b441769 --- /dev/null +++ b/admin/models/fields/viewtabs.php @@ -0,0 +1,183 @@ + + @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'); + +// import the list field type +jimport('joomla.form.helper'); +JFormHelper::loadFieldClass('list'); + +/** + * Viewtabs Form Field class for the Componentbuilder component + */ +class JFormFieldViewtabs extends JFormFieldList +{ + /** + * The viewtabs field type. + * + * @var string + */ + public $type = 'viewtabs'; + /** + * Override to add new button + * + * @return string The field input markup. + * + * @since 3.2 + */ + protected function getInput() + { + // see if we should add buttons + $setButton = $this->getAttribute('button'); + // get html + $html = parent::getInput(); + // if true set button + if ($setButton === 'true') + { + $button = array(); + $script = array(); + $buttonName = $this->getAttribute('name'); + // get the input from url + $app = JFactory::getApplication(); + $jinput = $app->input; + // get the view name & id + $values = $jinput->getArray(array( + 'id' => 'int', + 'view' => 'word' + )); + // check if new item + $ref = ''; + $refJ = ''; + if (!is_null($values['id']) && strlen($values['view'])) + { + // only load referal if not new item. + $ref = '&ref=' . $values['view'] . '&refid=' . $values['id']; + $refJ = '&ref=' . $values['view'] . '&refid=' . $values['id']; + } + $user = JFactory::getUser(); + // only add if user allowed to create admin_view + if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build Create button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ' + '; + } + // only add if user allowed to edit admin_view + if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area. + { + // build edit button + $buttonNamee = trim($buttonName); + $buttonNamee = preg_replace('/_+/', ' ', $buttonNamee); + $buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee); + $buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee); + $buttonNamee = ucfirst(strtolower($buttonNamee)); + $button[] = ''; + // build script + $script[] = " + jQuery(document).ready(function() { + jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) { + e.preventDefault(); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val(); + ".$buttonName."Button(".$buttonName."Value); + }); + function ".$buttonName."Button(value) { + if (value > 0) { + // hide the create button + jQuery('#".$buttonName."Create').hide(); + // show edit button + jQuery('#".$buttonName."Edit').show(); + var url = 'index.php?option=com_componentbuilder&view=admin_views&task=admin_view.edit&id='+value+'".$refJ."'; + jQuery('#".$buttonName."Edit').attr('href', url); + } else { + // show the create button + jQuery('#".$buttonName."Create').show(); + // hide edit button + jQuery('#".$buttonName."Edit').hide(); + } + }"; + } + // check if button was created for admin_view field. + if (is_array($button) && count($button) > 0) + { + // Load the needed script. + $document = JFactory::getDocument(); + $document->addScriptDeclaration(implode(' ',$script)); + // return the button attached to input field. + return '
' .$html . implode('',$button).'
'; + } + } + return $html; + } + + /** + * Method to get a list of options for a list input. + * + * @return array An array of JHtml options. + */ + public function getOptions() + { + // get the input from url + $jinput = JFactory::getApplication()->input; + // get the view name & id + $fieldsID = $jinput->getInt('id', 0); + $db = JFactory::getDBO(); + $query = $db->getQuery(true); + $query->select($db->quoteName(array('a.id','a.addtabs'),array('id','addtabs'))); + $query->from($db->quoteName('#__componentbuilder_admin_view', 'a')); + $query->join('LEFT', $db->quoteName('#__componentbuilder_admin_fields', 'b') . ' ON (' . $db->quoteName('a.id') . ' = ' . $db->quoteName('b.admin_view') . ')'); + $query->where($db->quoteName('a.published') . ' >= 1'); + $query->where($db->quoteName('b.id') . ' = ' . (int) $fieldsID); + $query->order('a.addtabs ASC'); + $db->setQuery((string)$query); + $item = $db->loadObject(); + $options = array(); + if (isset($item->addtabs) && strlen($item->addtabs) > 5) + { + $items = json_decode($item->addtabs, true); + $nr = 1; + foreach($items as $itemName) + { + $options[] = JHtml::_('select.option', $nr, $itemName['name']); + $nr++; + } + } + else + { + $options[] = JHtml::_('select.option', 1, JText::_('COM_COMPONENTBUILDER_DETAILS')); + } + return $options; + } +} diff --git a/admin/models/forms/admin_fields.js b/admin/models/forms/admin_fields.js index 9cf522a5d..928ed138a 100644 --- a/admin/models/forms/admin_fields.js +++ b/admin/models/forms/admin_fields.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.js diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml index ad594989f..9aa2bbc66 100644 --- a/admin/models/forms/admin_fields.xml +++ b/admin/models/forms/admin_fields.xml @@ -112,7 +112,7 @@ name="field" label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL" description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION" - class="fieldMedium" + class="list_class" multiple="false" required="false" button="false" @@ -200,18 +200,17 @@ description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_DESCRIPTION" class="inputbox" /> - + diff --git a/admin/models/forms/admin_fields_conditions.js b/admin/models/forms/admin_fields_conditions.js index 8622ccdac..3c8108173 100644 --- a/admin/models/forms/admin_fields_conditions.js +++ b/admin/models/forms/admin_fields_conditions.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.js diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 89b4c3c6c..6ed7119c5 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js @@ -1210,36 +1210,6 @@ function addButtonID(type,where){ }) } -function getFieldSelectOptions_server(fieldId){ - var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json"; - if(token.length > 0 && fieldId > 0){ - var request = 'token='+token+'&id='+fieldId; - } - return jQuery.ajax({ - type: 'GET', - url: getUrl, - dataType: 'jsonp', - data: request, - jsonp: 'callback' - }); -} - -function getFieldSelectOptions(fieldKey, table_, nr_){ - // first check if the field is set - if(jQuery("#jform_addconditions"+table_+"_addconditions"+fieldKey+nr_+"_match_field").length) { - var fieldId = jQuery("#jform_addconditions"+table_+"_addconditions"+fieldKey+nr_+"_match_field option:selected").val(); - getFieldSelectOptions_server(fieldId).done(function(result) { - if(result){ - jQuery('textarea#jform_addconditions'+table_+'_addconditions'+fieldKey+nr_+'_match_options').val(result); - } - else - { - jQuery('textarea#jform_addconditions'+table_+'_addconditions'+fieldKey+nr_+'_match_options').val(''); - } - }); - } -} - function getTableColumns_server(tableName){ var getUrl = "index.php?option=com_componentbuilder&task=ajax.tableColumns&format=json"; if(token.length > 0 && tableName.length > 0){ diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 1966c1cc8..92b12974c 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -140,6 +140,69 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> + + + + + + + + + + + + + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY - + @@ -193,6 +284,19 @@ filter="HTML" hint="COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT" /> + + + + + + COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - + + + + + @@ -431,17 +476,17 @@ /> - + @@ -523,51 +568,6 @@ /> - - - - - - - - loadObjectList(); + // set values to display correctly. + if (ComponentbuilderHelper::checkArray($items)) + { + // get user object. + $user = JFactory::getUser(); + foreach ($items as $nr => &$item) + { + $access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $item->id) && $user->authorise('admin_view.access', 'com_componentbuilder')); + if (!$access) + { + unset($items[$nr]); + continue; + } + + } + } + // Filter by id Repetable Field $idvvvv = json_decode($this->idvvvv,true); if (ComponentbuilderHelper::checkArray($items) && isset($idvvvv) && ComponentbuilderHelper::checkArray($idvvvv)) diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index 2973d4c02..2a802b4ec 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -233,8 +233,8 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( KEY `idx_name_single` (`name_single`), KEY `idx_name_list` (`name_list`), KEY `idx_type` (`type`), - KEY `idx_add_fadein` (`add_fadein`), KEY `idx_source` (`source`), + KEY `idx_add_fadein` (`add_fadein`), KEY `idx_add_css_view` (`add_css_view`), KEY `idx_add_css_views` (`add_css_views`), KEY `idx_add_php_getitems` (`add_php_getitems`), diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php index 3844b96b0..be7966ad2 100644 --- a/admin/tables/admin_fields.php +++ b/admin/tables/admin_fields.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields.php diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php index 325ed90f1..2e9a91d8e 100644 --- a/admin/tables/admin_fields_conditions.php +++ b/admin/tables/admin_fields_conditions.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage admin_fields_conditions.php diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 36b2716ec..11ec3bec8 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/views/admin_fields/submitbutton.js b/admin/views/admin_fields/submitbutton.js index 54a0326b1..c21683f90 100644 --- a/admin/views/admin_fields/submitbutton.js +++ b/admin/views/admin_fields/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_fields/tmpl/edit.php b/admin/views/admin_fields/tmpl/edit.php index bfdc5fa9f..36dccbac8 100644 --- a/admin/views/admin_fields/tmpl/edit.php +++ b/admin/views/admin_fields/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage edit.php @@ -73,7 +73,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
- canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?> + canDo->get('admin_fields.delete') || $this->canDo->get('admin_fields.edit.created_by') || $this->canDo->get('admin_fields.edit.state') || $this->canDo->get('admin_fields.edit.created')) : ?>
diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php index 3df6e00d9..97ea09447 100644 --- a/admin/views/admin_fields/view.html.php +++ b/admin/views/admin_fields/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php @@ -95,12 +95,12 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy // Built the actions for new and existing records. if ($this->refid || $this->ref) { - if ($this->canDo->get('core.create') && $isNew) + if ($this->canDo->get('admin_fields.create') && $isNew) { // We can create the record. JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE'); } - elseif ($this->canDo->get('core.edit')) + elseif ($this->canDo->get('admin_fields.edit')) { // We can save the record. JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE'); @@ -121,7 +121,7 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy if ($isNew) { // For new records, check the create permission. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields.create')) { JToolBarHelper::apply('admin_fields.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE'); @@ -131,24 +131,24 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy } else { - if ($this->canDo->get('core.edit')) + if ($this->canDo->get('admin_fields.edit')) { // We can save the new record JToolBarHelper::apply('admin_fields.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_fields.save', 'JTOOLBAR_SAVE'); // We can save this record, but check the create permission to see // if we can return to make a new one. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields.create')) { JToolBarHelper::custom('admin_fields.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false); } } $canVersion = ($this->canDo->get('core.version') && $this->canDo->get('admin_fields.version')); - if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion) + if ($this->state->params->get('save_history', 1) && $this->canDo->get('admin_fields.edit') && $canVersion) { JToolbarHelper::versions('com_componentbuilder.admin_fields', $this->item->id); } - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields.create')) { JToolBarHelper::custom('admin_fields.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false); } diff --git a/admin/views/admin_fields_conditions/submitbutton.js b/admin/views/admin_fields_conditions/submitbutton.js index 77f5ff29d..ffe514063 100644 --- a/admin/views/admin_fields_conditions/submitbutton.js +++ b/admin/views/admin_fields_conditions/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage submitbutton.js diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php index 9d7cef97c..901a67fbb 100644 --- a/admin/views/admin_fields_conditions/tmpl/edit.php +++ b/admin/views/admin_fields_conditions/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage edit.php @@ -73,7 +73,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
- canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?> + canDo->get('admin_fields_conditions.delete') || $this->canDo->get('admin_fields_conditions.edit.created_by') || $this->canDo->get('admin_fields_conditions.edit.state') || $this->canDo->get('admin_fields_conditions.edit.created')) : ?>
diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php index 1b57c25f3..a680033b8 100644 --- a/admin/views/admin_fields_conditions/view.html.php +++ b/admin/views/admin_fields_conditions/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php @@ -95,12 +95,12 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy // Built the actions for new and existing records. if ($this->refid || $this->ref) { - if ($this->canDo->get('core.create') && $isNew) + if ($this->canDo->get('admin_fields_conditions.create') && $isNew) { // We can create the record. JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE'); } - elseif ($this->canDo->get('core.edit')) + elseif ($this->canDo->get('admin_fields_conditions.edit')) { // We can save the record. JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE'); @@ -121,7 +121,7 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy if ($isNew) { // For new records, check the create permission. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields_conditions.create')) { JToolBarHelper::apply('admin_fields_conditions.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE'); @@ -131,24 +131,24 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy } else { - if ($this->canDo->get('core.edit')) + if ($this->canDo->get('admin_fields_conditions.edit')) { // We can save the new record JToolBarHelper::apply('admin_fields_conditions.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_fields_conditions.save', 'JTOOLBAR_SAVE'); // We can save this record, but check the create permission to see // if we can return to make a new one. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields_conditions.create')) { JToolBarHelper::custom('admin_fields_conditions.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false); } } $canVersion = ($this->canDo->get('core.version') && $this->canDo->get('admin_fields_conditions.version')); - if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion) + if ($this->state->params->get('save_history', 1) && $this->canDo->get('admin_fields_conditions.edit') && $canVersion) { JToolbarHelper::versions('com_componentbuilder.admin_fields_conditions', $this->item->id); } - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_fields_conditions.create')) { JToolBarHelper::custom('admin_fields_conditions.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false); } diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index cae0aeee3..a574d91eb 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @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 6c6ee899b..142428597 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php @@ -58,18 +58,28 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ - canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?> + canDo->get('admin_view.delete') || $this->canDo->get('admin_view.edit.created_by') || $this->canDo->get('admin_view.edit.state') || $this->canDo->get('admin_view.edit.created')) : ?>
@@ -210,7 +210,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
- +
@@ -701,7 +701,6 @@ jQuery('input.form-field-repeatable').on('row-add', function (e) { }); }); item->addtables) + 3, 1);?> -item->addconditions) + 3, 1);?> // for the values already set jQuery(document).ready(function(){ @@ -710,23 +709,12 @@ jQuery(document).ready(function(){ e.preventDefault(); getTableColumns(, "_", "_"); }); - - - jQuery('#adminForm').on('change', '#jform_addconditions__addconditions__match_field',function (e) { - e.preventDefault(); - getFieldSelectOptions(, "_", "_"); - }); jQuery(document).on('subform-row-add', function(event, row){ var groupName = jQuery(row).data('group'); var fieldName = groupName.replace(/([0-9])/g, ''); var fieldNr = groupName.replace(/([A-z_])/g, ''); - if ('addconditions' === fieldName) { - jQuery('#adminForm').on('change', '#jform_addconditions_addconditions'+fieldNr+'_match_field',function (e) { - e.preventDefault(); - getFieldSelectOptions(fieldNr, "", ""); - }); - } else if ('addtables' === fieldName) { + if ('addtables' === fieldName) { jQuery('#adminForm').on('change', '#jform_addtables_addtables'+fieldNr+'_table',function (e) { e.preventDefault(); getTableColumns(fieldNr, "", ""); diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 57ba5200e..de0fd5bd6 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -71,7 +71,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } // Get Linked view data - $this->vxzlinked_components = $this->get('Vxzlinked_components'); + $this->vxzcustom_import = $this->get('Vxzcustom_import'); // Set the toolbar $this->addToolBar(); @@ -98,12 +98,12 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy // Built the actions for new and existing records. if ($this->refid || $this->ref) { - if ($this->canDo->get('core.create') && $isNew) + if ($this->canDo->get('admin_view.create') && $isNew) { // We can create the record. JToolBarHelper::save('admin_view.save', 'JTOOLBAR_SAVE'); } - elseif ($this->canDo->get('core.edit')) + elseif ($this->canDo->get('admin_view.edit')) { // We can save the record. JToolBarHelper::save('admin_view.save', 'JTOOLBAR_SAVE'); @@ -124,7 +124,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy if ($isNew) { // For new records, check the create permission. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_view.create')) { JToolBarHelper::apply('admin_view.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_view.save', 'JTOOLBAR_SAVE'); @@ -134,24 +134,24 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy } else { - if ($this->canDo->get('core.edit')) + if ($this->canDo->get('admin_view.edit')) { // We can save the new record JToolBarHelper::apply('admin_view.apply', 'JTOOLBAR_APPLY'); JToolBarHelper::save('admin_view.save', 'JTOOLBAR_SAVE'); // We can save this record, but check the create permission to see // if we can return to make a new one. - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_view.create')) { JToolBarHelper::custom('admin_view.save2new', 'save-new.png', 'save-new_f2.png', 'JTOOLBAR_SAVE_AND_NEW', false); } } $canVersion = ($this->canDo->get('core.version') && $this->canDo->get('admin_view.version')); - if ($this->state->params->get('save_history', 1) && $this->canDo->get('core.edit') && $canVersion) + if ($this->state->params->get('save_history', 1) && $this->canDo->get('admin_view.edit') && $canVersion) { JToolbarHelper::versions('com_componentbuilder.admin_view', $this->item->id); } - if ($this->canDo->get('core.create')) + if ($this->canDo->get('admin_view.create')) { JToolBarHelper::custom('admin_view.save2copy', 'save-copy.png', 'save-copy_f2.png', 'JTOOLBAR_SAVE_AS_COPY', false); } diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index 08963f4ce..333dd2903 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @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 c6823b8ee..1637f9576 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 @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @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 0a7049877..ad0df7a3f 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 @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @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 34821aa92..7d20fdeec 100644 --- a/admin/views/admin_views/tmpl/default_body.php +++ b/admin/views/admin_views/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php @@ -37,7 +37,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. ?> - get('core.edit.state')): ?> + get('admin_view.edit.state')): ?> saveOrder) { @@ -60,7 +60,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. - get('core.edit')): ?> + get('admin_view.edit')): ?> checked_out) : ?> id); ?> @@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. - get('core.edit')): ?> + get('admin_view.edit')): ?>
escape($item->system_name); ?> checked_out): ?> @@ -96,7 +96,7 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view. escape($item->short_description); ?> - get('core.edit.state')) : ?> + get('admin_view.edit.state')) : ?> checked_out) : ?> published, $i, 'admin_views.', true, 'cb'); ?> diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index b773b3c39..7b0a81b90 100644 --- a/admin/views/admin_views/tmpl/default_foot.php +++ b/admin/views/admin_views/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @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 a0c6bafe4..1ac0764a6 100644 --- a/admin/views/admin_views/tmpl/default_head.php +++ b/admin/views/admin_views/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @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 60efa9f19..e34e2f285 100644 --- a/admin/views/admin_views/tmpl/default_toolbar.php +++ b/admin/views/admin_views/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @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 0c6bf5c67..a762b480e 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 136 of this MVC - @build 12th October, 2017 + @version @update number 141 of this MVC + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php @@ -63,10 +63,10 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_view'); - $this->canEdit = $this->canDo->get('core.edit'); - $this->canState = $this->canDo->get('core.edit.state'); - $this->canCreate = $this->canDo->get('core.create'); - $this->canDelete = $this->canDo->get('core.delete'); + $this->canEdit = $this->canDo->get('admin_view.edit'); + $this->canState = $this->canDo->get('admin_view.edit.state'); + $this->canCreate = $this->canDo->get('admin_view.create'); + $this->canDelete = $this->canDo->get('admin_view.delete'); $this->canBatch = $this->canDo->get('core.batch'); // We don't need toolbar in the modal window. diff --git a/admin/views/admins_fields/tmpl/default.php b/admin/views/admins_fields/tmpl/default.php index 5b25bcdfc..8c10e71a0 100644 --- a/admin/views/admins_fields/tmpl/default.php +++ b/admin/views/admins_fields/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/admins_fields/tmpl/default_batch_body.php b/admin/views/admins_fields/tmpl/default_batch_body.php index f243f29f4..7d50c139c 100644 --- a/admin/views/admins_fields/tmpl/default_batch_body.php +++ b/admin/views/admins_fields/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admins_fields/tmpl/default_batch_footer.php b/admin/views/admins_fields/tmpl/default_batch_footer.php index a86f3180a..519b8f44a 100644 --- a/admin/views/admins_fields/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admins_fields/tmpl/default_body.php b/admin/views/admins_fields/tmpl/default_body.php index c1e76b3b7..af9016d1f 100644 --- a/admin/views/admins_fields/tmpl/default_body.php +++ b/admin/views/admins_fields/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_body.php @@ -37,7 +37,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie ?> - get('core.edit.state')): ?> + get('admin_fields.edit.state')): ?> saveOrder) { @@ -60,7 +60,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie - get('core.edit')): ?> + get('admin_fields.edit')): ?> checked_out) : ?> id); ?> @@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie - get('core.edit')): ?> + get('admin_fields.edit')): ?>
escape($item->admin_view_system_name); ?> checked_out): ?> @@ -87,7 +87,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie - get('core.edit.state')) : ?> + get('admin_fields.edit.state')) : ?> checked_out) : ?> published, $i, 'admins_fields.', true, 'cb'); ?> diff --git a/admin/views/admins_fields/tmpl/default_foot.php b/admin/views/admins_fields/tmpl/default_foot.php index 14c246781..22c4ae8e9 100644 --- a/admin/views/admins_fields/tmpl/default_foot.php +++ b/admin/views/admins_fields/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admins_fields/tmpl/default_head.php b/admin/views/admins_fields/tmpl/default_head.php index fd51f7619..598a73fab 100644 --- a/admin/views/admins_fields/tmpl/default_head.php +++ b/admin/views/admins_fields/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admins_fields/tmpl/default_toolbar.php b/admin/views/admins_fields/tmpl/default_toolbar.php index ea56ff939..ef18d1197 100644 --- a/admin/views/admins_fields/tmpl/default_toolbar.php +++ b/admin/views/admins_fields/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php index d274e3b14..abde65254 100644 --- a/admin/views/admins_fields/view.html.php +++ b/admin/views/admins_fields/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 16 of this MVC - @build 12th October, 2017 + @version @update number 21 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php @@ -63,10 +63,10 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_fields'); - $this->canEdit = $this->canDo->get('core.edit'); - $this->canState = $this->canDo->get('core.edit.state'); - $this->canCreate = $this->canDo->get('core.create'); - $this->canDelete = $this->canDo->get('core.delete'); + $this->canEdit = $this->canDo->get('admin_fields.edit'); + $this->canState = $this->canDo->get('admin_fields.edit.state'); + $this->canCreate = $this->canDo->get('admin_fields.create'); + $this->canDelete = $this->canDo->get('admin_fields.delete'); $this->canBatch = $this->canDo->get('core.batch'); // We don't need toolbar in the modal window. diff --git a/admin/views/admins_fields_conditions/tmpl/default.php b/admin/views/admins_fields_conditions/tmpl/default.php index 4ee4db719..5b018810f 100644 --- a/admin/views/admins_fields_conditions/tmpl/default.php +++ b/admin/views/admins_fields_conditions/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php index f22a9312e..081525861 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_body.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php index 6098671c3..3e187df90 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php +++ b/admin/views/admins_fields_conditions/tmpl/default_batch_footer.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_batch_footer.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_body.php b/admin/views/admins_fields_conditions/tmpl/default_body.php index 40d1b93b5..db4781076 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_body.php +++ b/admin/views/admins_fields_conditions/tmpl/default_body.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_body.php @@ -37,7 +37,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas ?> - get('core.edit.state')): ?> + get('admin_fields_conditions.edit.state')): ?> saveOrder) { @@ -60,7 +60,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas - get('core.edit')): ?> + get('admin_fields_conditions.edit')): ?> checked_out) : ?> id); ?> @@ -75,7 +75,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas - get('core.edit')): ?> + get('admin_fields_conditions.edit')): ?>
escape($item->admin_view_system_name); ?> checked_out): ?> @@ -87,7 +87,7 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas - get('core.edit.state')) : ?> + get('admin_fields_conditions.edit.state')) : ?> checked_out) : ?> published, $i, 'admins_fields_conditions.', true, 'cb'); ?> diff --git a/admin/views/admins_fields_conditions/tmpl/default_foot.php b/admin/views/admins_fields_conditions/tmpl/default_foot.php index 1a9390954..9f7ea8e35 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_foot.php +++ b/admin/views/admins_fields_conditions/tmpl/default_foot.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_foot.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_head.php b/admin/views/admins_fields_conditions/tmpl/default_head.php index 8e11541e3..8d7da6e5f 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_head.php +++ b/admin/views/admins_fields_conditions/tmpl/default_head.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_head.php diff --git a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php index 689f1b1be..a66f9806a 100644 --- a/admin/views/admins_fields_conditions/tmpl/default_toolbar.php +++ b/admin/views/admins_fields_conditions/tmpl/default_toolbar.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage default_toolbar.php diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php index 88d376d34..cc52def31 100644 --- a/admin/views/admins_fields_conditions/view.html.php +++ b/admin/views/admins_fields_conditions/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 7 of this MVC - @build 12th October, 2017 + @version @update number 14 of this MVC + @build 13th October, 2017 @created 12th October, 2017 @package Component Builder @subpackage view.html.php @@ -63,10 +63,10 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy $this->saveOrder = $this->listOrder == 'ordering'; // get global action permissions $this->canDo = ComponentbuilderHelper::getActions('admin_fields_conditions'); - $this->canEdit = $this->canDo->get('core.edit'); - $this->canState = $this->canDo->get('core.edit.state'); - $this->canCreate = $this->canDo->get('core.create'); - $this->canDelete = $this->canDo->get('core.delete'); + $this->canEdit = $this->canDo->get('admin_fields_conditions.edit'); + $this->canState = $this->canDo->get('admin_fields_conditions.edit.state'); + $this->canCreate = $this->canDo->get('admin_fields_conditions.create'); + $this->canDelete = $this->canDo->get('admin_fields_conditions.delete'); $this->canBatch = $this->canDo->get('core.batch'); // We don't need toolbar in the modal window. diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php index 851467d0b..ea070e90c 100644 --- a/admin/views/componentbuilder/tmpl/default.php +++ b/admin/views/componentbuilder/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php index af61463e9..b95e59c67 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_closed_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_closed_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php index 1754bc554..ffd5587c8 100644 --- a/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php +++ b/admin/views/componentbuilder/tmpl/default_issues_the_open_issues_on_github.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_issues_the_open_issues_on_github.php diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php index cc3e2ebf9..600e5e1c8 100644 --- a/admin/views/componentbuilder/tmpl/default_main.php +++ b/admin/views/componentbuilder/tmpl/default_main.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_main.php diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php index 80a81d560..855e2ccf1 100644 --- a/admin/views/componentbuilder/tmpl/default_readme_information.php +++ b/admin/views/componentbuilder/tmpl/default_readme_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_readme_information.php diff --git a/admin/views/componentbuilder/tmpl/default_releases_information.php b/admin/views/componentbuilder/tmpl/default_releases_information.php index 7e3b432eb..56f13c84a 100644 --- a/admin/views/componentbuilder/tmpl/default_releases_information.php +++ b/admin/views/componentbuilder/tmpl/default_releases_information.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_releases_information.php diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php index 56f392398..8fa32700c 100644 --- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php +++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vast_development_method_notice_board.php diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php index 711e75582..cda38364f 100644 --- a/admin/views/componentbuilder/tmpl/default_vdm.php +++ b/admin/views/componentbuilder/tmpl/default_vdm.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_vdm.php diff --git a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php index 886658f4f..4ea6d51aa 100644 --- a/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php +++ b/admin/views/componentbuilder/tmpl/default_wiki_tutorials.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_wiki_tutorials.php diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php index bbf827606..7657436b0 100644 --- a/admin/views/componentbuilder/view.html.php +++ b/admin/views/componentbuilder/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php index fb6a79631..ff1cb5057 100644 --- a/admin/views/field/tmpl/edit.php +++ b/admin/views/field/tmpl/edit.php @@ -89,6 +89,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ canDo->get('admin_view.access')) : ?>
@@ -98,6 +99,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ canDo->get('field.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('field.edit.state') || $this->canDo->get('core.edit.created')) : ?> diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php index d5938ef12..20c58b4c1 100644 --- a/admin/views/import/tmpl/default.php +++ b/admin/views/import/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php index 7d9c21522..4ddeb7717 100644 --- a/admin/views/import/view.html.php +++ b/admin/views/import/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php index 9dc1ae7a6..895080f85 100644 --- a/admin/views/import_joomla_components/tmpl/default.php +++ b/admin/views/import_joomla_components/tmpl/default.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage default.php diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php index 6052ad0b2..3ebffdcae 100644 --- a/admin/views/import_joomla_components/view.html.php +++ b/admin/views/import_joomla_components/view.html.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php index f7e3861e5..790781657 100644 --- a/admin/views/joomla_component/tmpl/edit.php +++ b/admin/views/joomla_component/tmpl/edit.php @@ -126,6 +126,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ canDo->get('admin_view.access')) : ?>
@@ -135,6 +136,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
+ canDo->get('custom_admin_view.access')) : ?> diff --git a/componentbuilder.xml b/componentbuilder.xml index 0619529d2..2488816da 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 12th October, 2017 + 13th October, 2017 Llewellyn van der Merwe joomla@vdm.io http://vdm.bz/component-builder diff --git a/script.php b/script.php index 6f45f4128..50c0e6097 100644 --- a/script.php +++ b/script.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage script.php @@ -2045,9 +2045,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_after_delete":"php_after_delete","type":"type","php_save":"php_save","description":"description","add_fadein":"add_fadein","icon":"icon","php_getlistquery":"php_getlistquery","icon_add":"icon_add","php_allowedit":"php_allowedit","icon_category":"icon_category","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchmove":"php_batchmove","php_batchcopy":"php_batchcopy","not_required":"not_required","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","add_fadein","source","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Set the object into the content types table. $admin_view_Inserted = $db->insertObject('#__content_types', $admin_view); @@ -2316,9 +2316,9 @@ class com_componentbuilderInstallerScript $admin_view->type_title = 'Componentbuilder Admin_view'; $admin_view->type_alias = 'com_componentbuilder.admin_view'; $admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}'; - $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_after_delete":"php_after_delete","type":"type","php_save":"php_save","description":"description","add_fadein":"add_fadein","icon":"icon","php_getlistquery":"php_getlistquery","icon_add":"icon_add","php_allowedit":"php_allowedit","icon_category":"icon_category","php_after_publish":"php_after_publish","source":"source","php_getitems":"php_getitems","php_import":"php_import","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchmove":"php_batchmove","php_batchcopy":"php_batchcopy","not_required":"not_required","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; + $admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "null","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","php_getitems":"php_getitems","php_batchmove":"php_batchmove","icon_add":"icon_add","php_save":"php_save","icon_category":"icon_category","icon":"icon","php_after_delete":"php_after_delete","php_getlistquery":"php_getlistquery","php_allowedit":"php_allowedit","type":"type","php_after_publish":"php_after_publish","description":"description","source":"source","add_fadein":"add_fadein","php_import":"php_import","not_required":"not_required","php_getitems_after_all":"php_getitems_after_all","php_before_save":"php_before_save","php_postsavehook":"php_postsavehook","php_batchcopy":"php_batchcopy","php_before_publish":"php_before_publish","php_before_delete":"php_before_delete","php_document":"php_document","sql":"sql","add_css_view":"add_css_view","php_import_display":"php_import_display","css_view":"css_view","php_import_save":"php_import_save","add_css_views":"add_css_views","add_php_getitems":"add_php_getitems","css_views":"css_views","add_php_getitems_after_all":"add_php_getitems_after_all","add_javascript_view_file":"add_javascript_view_file","add_php_getlistquery":"add_php_getlistquery","javascript_view_file":"javascript_view_file","add_php_before_save":"add_php_before_save","add_javascript_view_footer":"add_javascript_view_footer","add_php_save":"add_php_save","javascript_view_footer":"javascript_view_footer","add_php_postsavehook":"add_php_postsavehook","add_javascript_views_file":"add_javascript_views_file","add_php_allowedit":"add_php_allowedit","javascript_views_file":"javascript_views_file","add_php_batchcopy":"add_php_batchcopy","add_javascript_views_footer":"add_javascript_views_footer","add_php_batchmove":"add_php_batchmove","javascript_views_footer":"javascript_views_footer","add_php_before_publish":"add_php_before_publish","add_custom_button":"add_custom_button","add_php_after_publish":"add_php_after_publish","add_php_before_delete":"add_php_before_delete","php_controller":"php_controller","add_php_after_delete":"add_php_after_delete","php_model":"php_model","add_php_document":"add_php_document","php_controller_list":"php_controller_list","add_sql":"add_sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_ajaxmethod":"php_ajaxmethod","add_custom_import":"add_custom_import","html_import_view":"html_import_view","add_php_getitem":"add_php_getitem","php_import_setdata":"php_import_setdata","php_getitem":"php_getitem","php_import_ext":"php_import_ext"}}'; $admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute'; - $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","add_fadein","source","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; + $admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","type","source","add_fadein","not_required","add_css_view","add_css_views","add_php_getitems","add_php_getitems_after_all","add_javascript_view_file","add_php_getlistquery","add_php_before_save","add_javascript_view_footer","add_php_save","add_php_postsavehook","add_javascript_views_file","add_php_allowedit","add_php_batchcopy","add_javascript_views_footer","add_php_batchmove","add_php_before_publish","add_custom_button","add_php_after_publish","add_php_before_delete","add_php_after_delete","add_php_document","add_sql","add_php_ajax","add_custom_import","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"}]}'; // Check if admin_view type is already in content_type DB. $admin_view_id = null; diff --git a/site/assets/css/site.css b/site/assets/css/site.css index c12dee686..5d0859fa0 100644 --- a/site/assets/css/site.css +++ b/site/assets/css/site.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.css diff --git a/site/assets/js/site.js b/site/assets/js/site.js index 1ed4a4e6d..f66ccb8ce 100644 --- a/site/assets/js/site.js +++ b/site/assets/js/site.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage site.js diff --git a/site/componentbuilder.php b/site/componentbuilder.php index 56a0a307c..1f077c663 100644 --- a/site/componentbuilder.php +++ b/site/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/controller.php b/site/controller.php index 3077d6d80..ba6492d71 100644 --- a/site/controller.php +++ b/site/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/site/controllers/api.php b/site/controllers/api.php index 3a7736456..45b94e69d 100644 --- a/site/controllers/api.php +++ b/site/controllers/api.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage api.php diff --git a/site/controllers/help.php b/site/controllers/help.php index ba87c50ca..f2940c85d 100644 --- a/site/controllers/help.php +++ b/site/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/site/helpers/category.php b/site/helpers/category.php index aa3428827..20e0b527d 100644 --- a/site/helpers/category.php +++ b/site/helpers/category.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage category.php diff --git a/site/helpers/categoryfields.php b/site/helpers/categoryfields.php index 4ee508df4..4a25e651e 100644 --- a/site/helpers/categoryfields.php +++ b/site/helpers/categoryfields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfields.php diff --git a/site/helpers/categoryfieldtypes.php b/site/helpers/categoryfieldtypes.php index 50cc10ff8..6af242d73 100644 --- a/site/helpers/categoryfieldtypes.php +++ b/site/helpers/categoryfieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage categoryfieldtypes.php diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php index f59315795..4719eda6c 100644 --- a/site/helpers/componentbuilder.php +++ b/site/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php index 1bcdda490..76e526aec 100644 --- a/site/helpers/headercheck.php +++ b/site/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage headercheck.php diff --git a/site/helpers/route.php b/site/helpers/route.php index 45ca13550..7ee4a1519 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage route.php diff --git a/site/router.php b/site/router.php index ab1396aab..d48ae9abc 100644 --- a/site/router.php +++ b/site/router.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage router.php diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js index 96d0cbfbb..b3aa700e5 100644 --- a/site/views/api/submitbutton.js +++ b/site/views/api/submitbutton.js @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.5.8 - @build 12th October, 2017 + @build 13th October, 2017 @created 30th April, 2015 @package Component Builder @subpackage submitbutton.js