From bc9e5495d7b7e941c27ec761d6fd7a1684424a19 Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 3 Mar 2017 23:53:18 +0200 Subject: [PATCH] fixed #43 to insure fields are sorted in the correct order. Added the noticeboard to the compiler page, to insure all our notices gets viewed by all those who use the JCB --- README.md | 4 +- admin/README.txt | 4 +- admin/assets/css/admin.css | 2 +- admin/assets/css/admin_view.css | 4 +- admin/assets/css/admin_views.css | 4 +- admin/assets/css/compiler.css | 4 +- admin/assets/css/dashboard.css | 2 +- admin/assets/css/joomla_component.css | 4 +- admin/assets/css/joomla_components.css | 4 +- .../compiler/joomla_3/install.mysql.utf8.sql | 7 +- admin/componentbuilder.php | 2 +- admin/controller.php | 2 +- admin/controllers/admin_view.php | 4 +- admin/controllers/admin_views.php | 4 +- admin/controllers/ajax.json.php | 2 +- admin/controllers/compiler.php | 65 +- admin/controllers/componentbuilder.php | 2 +- admin/controllers/help.php | 2 +- admin/controllers/import.php | 2 +- admin/controllers/joomla_component.php | 4 +- admin/controllers/joomla_components.php | 4 +- admin/helpers/compiler.php | 99 +- admin/helpers/compiler/b_Structure.php | 154 ++ admin/helpers/compiler/e_Interpretation.php | 6 +- admin/helpers/componentbuilder.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 | 15 +- 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 | 2 +- admin/layouts/admin_view/fields_fullwidth.php | 2 +- .../admin_view/javascript_fullwidth.php | 2 +- .../linked_components_fullwidth.php | 2 +- 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 +- admin/layouts/admin_view/settings_above.php | 2 +- admin/layouts/admin_view/settings_left.php | 2 +- admin/layouts/admin_view/settings_right.php | 2 +- admin/layouts/admin_view/settings_under.php | 2 +- 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/gettable_above.php | 2 +- .../dynamic_get/gettable_fullwidth.php | 2 +- admin/layouts/dynamic_get/gettable_left.php | 2 +- admin/layouts/dynamic_get/gettable_right.php | 2 +- admin/layouts/dynamic_get/gettable_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 | 2 +- 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_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/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 | 2 +- .../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 +- .../joomla_component/mysql_fullwidth.php | 2 +- .../joomla_component/php_fullwidth.php | 2 +- admin/layouts/joomla_component/publishing.php | 2 +- admin/layouts/joomla_component/publlshing.php | 2 +- .../layouts/joomla_component/readme_left.php | 2 +- .../layouts/joomla_component/readme_right.php | 2 +- .../joomla_component/settings_left.php | 8 +- .../joomla_component/settings_right.php | 4 +- .../joomla_component/site_views_fullwidth.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 +- 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_view.php | 309 ++- admin/models/admin_views.php | 78 +- admin/models/ajax.php | 6 +- admin/models/compiler.php | 18 +- admin/models/componentbuilder.php | 2 +- 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/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/dynamicgets.php | 2 +- admin/models/fields/fields.php | 2 +- admin/models/fields/fieldsmulti.php | 2 +- admin/models/fields/fieldtypes.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/forms/admin_view.js | 4 +- admin/models/forms/admin_view.xml | 1248 +++++------ admin/models/forms/joomla_component.js | 4 +- admin/models/forms/joomla_component.xml | 1920 ++++++++--------- admin/models/import.php | 2 +- admin/models/joomla_component.php | 100 +- admin/models/joomla_components.php | 44 +- admin/sql/install.mysql.utf8.sql | 71 +- admin/tables/admin_view.php | 4 +- admin/tables/joomla_component.php | 4 +- admin/views/admin_view/submitbutton.js | 4 +- admin/views/admin_view/tmpl/edit.php | 4 +- admin/views/admin_view/view.html.php | 4 +- 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 | 4 +- 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 | 4 +- admin/views/compiler/tmpl/default.php | 51 +- admin/views/compiler/view.html.php | 54 +- admin/views/componentbuilder/tmpl/default.php | 2 +- ...sed_issues_the_closed_issues_on_github.php | 2 +- .../componentbuilder/tmpl/default_main.php | 2 +- ..._open_issues_the_open_issues_on_github.php | 2 +- .../tmpl/default_readme_information.php | 2 +- ...t_vast_development_method_notice_board.php | 2 +- .../componentbuilder/tmpl/default_vdm.php | 2 +- admin/views/componentbuilder/view.html.php | 2 +- admin/views/import/tmpl/default.php | 2 +- admin/views/import/view.html.php | 2 +- admin/views/joomla_component/submitbutton.js | 4 +- admin/views/joomla_component/tmpl/edit.php | 4 +- admin/views/joomla_component/view.html.php | 4 +- .../views/joomla_components/tmpl/default.php | 4 +- .../tmpl/default_batch_body.php | 4 +- .../tmpl/default_batch_footer.php | 4 +- .../joomla_components/tmpl/default_body.php | 4 +- .../joomla_components/tmpl/default_foot.php | 4 +- .../joomla_components/tmpl/default_head.php | 4 +- .../tmpl/default_toolbar.php | 4 +- admin/views/joomla_components/view.html.php | 4 +- componentbuilder.xml | 2 +- script.php | 18 +- 217 files changed, 2471 insertions(+), 2276 deletions(-) diff --git a/README.md b/README.md index 7ca76de37..af4e3d271 100644 --- a/README.md +++ b/README.md @@ -104,11 +104,11 @@ 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*: 1st March, 2017 ++ *Last Build*: 3rd March, 2017 + *Version*: 2.3.6 + *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*: **92671** ++ *Line count*: **92696** + *File count*: **596** + *Folder count*: **105** diff --git a/admin/README.txt b/admin/README.txt index 7ca76de37..af4e3d271 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -104,11 +104,11 @@ 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*: 1st March, 2017 ++ *Last Build*: 3rd March, 2017 + *Version*: 2.3.6 + *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*: **92671** ++ *Line count*: **92696** + *File count*: **596** + *Folder count*: **105** diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css index f7c256291..0a7269baa 100644 --- a/admin/assets/css/admin.css +++ b/admin/assets/css/admin.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin.css diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css index 19ebdd638..ce53699b8 100644 --- a/admin/assets/css/admin_view.css +++ b/admin/assets/css/admin_view.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 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 2bdfee8ad..e5813b416 100644 --- a/admin/assets/css/admin_views.css +++ b/admin/assets/css/admin_views.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.css diff --git a/admin/assets/css/compiler.css b/admin/assets/css/compiler.css index d9f15f553..69b431c16 100644 --- a/admin/assets/css/compiler.css +++ b/admin/assets/css/compiler.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 26 of this MVC - @build 28th February, 2017 + @version @update number 46 of this MVC + @build 3rd March, 2017 @created 1st February, 2017 @package Component Builder @subpackage compiler.css diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css index f56b5fb0b..c77e44f83 100644 --- a/admin/assets/css/dashboard.css +++ b/admin/assets/css/dashboard.css @@ -10,7 +10,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage dashboard.css diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css index fce22eb7e..01da460b4 100644 --- a/admin/assets/css/joomla_component.css +++ b/admin/assets/css/joomla_component.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 96 of this MVC - @build 17th February, 2017 + @version @update number 97 of this MVC + @build 3rd March, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.css diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css index fb43f9e64..48fe1a4e9 100644 --- a/admin/assets/css/joomla_components.css +++ b/admin/assets/css/joomla_components.css @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 96 of this MVC - @build 17th February, 2017 + @version @update number 97 of this MVC + @build 3rd March, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.css diff --git a/admin/compiler/joomla_3/install.mysql.utf8.sql b/admin/compiler/joomla_3/install.mysql.utf8.sql index 16c3c66b0..520b17a19 100644 --- a/admin/compiler/joomla_3/install.mysql.utf8.sql +++ b/admin/compiler/joomla_3/install.mysql.utf8.sql @@ -1,6 +1,11 @@ ###INSTALL### -- --- Always insure this column is large enough for all the access control values. +-- Always insure this column rules is large enough for all the access control values. -- ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.'; + +-- +-- Always insure this column name is large enough for long component and view names. +-- +ALTER TABLE `#__assets` CHANGE `name` `name` VARCHAR(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'The unique name for the asset.'; diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php index e325fbd0a..74711eb11 100644 --- a/admin/componentbuilder.php +++ b/admin/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controller.php b/admin/controller.php index f57da2b5e..9f2662c00 100644 --- a/admin/controller.php +++ b/admin/controller.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage controller.php diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php index 22532154a..e3e9ccf80 100644 --- a/admin/controllers/admin_view.php +++ b/admin/controllers/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php index d4440396b..f27e03e2f 100644 --- a/admin/controllers/admin_views.php +++ b/admin/controllers/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php index 61aff2e0c..3e3f0a730 100644 --- a/admin/controllers/ajax.json.php +++ b/admin/controllers/ajax.json.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.json.php diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php index 6e62f9343..84a0d3a58 100644 --- a/admin/controllers/compiler.php +++ b/admin/controllers/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 26 of this MVC - @build 28th February, 2017 + @version @update number 46 of this MVC + @build 3rd March, 2017 @created 1st February, 2017 @package Component Builder @subpackage compiler.php @@ -66,9 +66,9 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin if($user->authorise('core.admin', 'com_componentbuilder')) { // get the post values - $jinput = JFactory::getApplication()->input; + $jinput = JFactory::getApplication()->input; $componentId = $jinput->post->get('component', 0, 'INT'); - $version = $jinput->post->get('version', 0, 'INT'); + $version = $jinput->post->get('version', 0, 'INT'); $addBackup = $jinput->post->get('backup', 0, 'INT'); $addGit = $jinput->post->get('git', 0, 'INT'); $addPlaceholders = $jinput->post->get('placeholders', 2, 'INT'); @@ -93,62 +93,37 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin if (empty($redirect_url) && $componentId > 0) { $redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false); - // setup the unrealistic numbers - $counter = $model->getCount(); - $folders = $counter['folders'] * 5; - $files = $counter['files'] * 5; - $lines = $counter['lines'] * 10; - $seconds = $folders + $files + $lines; - $totalHours = round($seconds / 3600); - $totalDays = round($totalHours / 8); - // setup the more realistic numbers - $debugging = $seconds / 4; - $planning = $seconds / 7; - $mapping = $seconds / 10; - $office = $seconds / 6; - $seconds = $folders + $files + $lines + $debugging + $planning + $mapping + $office; - $actualTotalHours = round($seconds / 3600); - $actualTotalDays = round($actualTotalHours / 8); - $debuggingHours = round($debugging / 3600); - $planningHours = round($planning / 3600); - $mappingHours = round($mapping / 3600); - $officeHours = round($office / 3600); - // the actual time spent - $actualHoursSpent = $actualTotalHours - $totalHours; - $actualDaysSpent = $actualTotalDays - $totalDays; - // calculate the projects actual time frame of completion - $projectWeekTime = round($actualTotalDays / 5,1); - $projectMonthTime = round($actualTotalDays / 24,1); - if (($pos = strpos($counter['filePath'], "/tmp/")) !== FALSE) + if (($pos = strpos($model->compiler->filepath, "/tmp/")) !== FALSE) { - $url = JURI::root() . substr($counter['filePath'], $pos + 1); + $url = JURI::root() . substr($model->compiler->filepath, $pos + 1); } // Message of successful build - $message = '

The ('.$counter['filename'].') Was Successfully Compiled!

'; + $message = '

The ('.$model->compiler->componentFolderName.') Was Successfully Compiled!

'; $message .= '

'; + $message .= 'Install '.$model->compiler->componentFolderName.' on this Joomla website.

'; $message .= '

Total time saved

'; $message .= ''; - $message .= '

'.$totalHours.' Hours or '.$totalDays.' Eight Hour Days (actual time you saved)
'; + $message .= '

'.$model->compiler->totalHours.' Hours or '.$model->compiler->totalDays.' Eight Hour Days (actual time you saved)
'; $message .= '(if creating a folder and file took 5 seconds and writing one line of code took 10 seconds, never making one mistake or taking any coffee break.)
'; - $message .= ''.$actualHoursSpent.' Hours or '.$actualDaysSpent.' Eight Hour Days (the actual time you spent)
'; - $message .= '(with the following break down: debugging @'.$debuggingHours.'hours = codingtime / 4; planning @'.$planningHours.'hours = codingtime / 7; mapping @'.$mappingHours.'hours = codingtime / 10; office @'.$officeHours.'hours = codingtime / 6;)

'; - $message .= '

'.$actualTotalHours.' Hours or '.$actualTotalDays.' Eight Hour Days (a total of the realistic time frame for this project)
'; + $message .= ''.$model->compiler->actualHoursSpent.' Hours or '.$model->compiler->actualDaysSpent.' Eight Hour Days (the actual time you spent)
'; + $message .= '(with the following break down: debugging @'.$model->compiler->debuggingHours.'hours = codingtime / 4; planning @'.$model->compiler->planningHours.'hours = codingtime / 7; mapping @'.$model->compiler->mappingHours.'hours = codingtime / 10; office @'.$model->compiler->officeHours.'hours = codingtime / 6;)

'; + $message .= '

'.$model->compiler->actualTotalHours.' Hours or '.$model->compiler->actualTotalDays.' Eight Hour Days (a total of the realistic time frame for this project)
'; $message .= '(if creating a folder and file took 5 seconds and writing one line of code took 10 seconds, with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)

'; - $message .= '

Project duration: '.$projectWeekTime. ' weeks or '.$projectMonthTime.' months

'; + $message .= '

Project duration: '.$model->compiler->projectWeekTime. ' weeks or '.$model->compiler->projectMonthTime.' months

'; $message .= '

Path to Zip File

'; - $message .= '

Path: '.$counter['filePath'].'
'; + $message .= '

Path: '.$model->compiler->filepath.'
'; $message .= 'URL: '.$url.'

'; $message .= 'Hey! you can also download the file right now!
Download

'; $message .= '

Remember! This file is in your tmp folder and therefore publicly accessible untill you click [Clear tmp]!

'; - $message .= '

Compilation took '.$counter['time'].' seconds to complete.

'; + $message .= '

Compilation took '.$model->compiler->secondsCompiled.' seconds to complete.

'; // set redirect $this->setRedirect($redirect_url,$message,'message'); - $app->setUserState('com_componentbuilder.extension_name', $counter['filename']); + $app->setUserState('com_componentbuilder.extension_name', $model->compiler->componentFolderName); } else { diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php index 64007916f..b5a44af78 100644 --- a/admin/controllers/componentbuilder.php +++ b/admin/controllers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/controllers/help.php b/admin/controllers/help.php index b586aa926..502c2c78a 100644 --- a/admin/controllers/help.php +++ b/admin/controllers/help.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage help.php diff --git a/admin/controllers/import.php b/admin/controllers/import.php index 9fe626e8e..4d17d1c4c 100644 --- a/admin/controllers/import.php +++ b/admin/controllers/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php index 2f0ebc549..b303f4eb7 100644 --- a/admin/controllers/joomla_component.php +++ b/admin/controllers/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 96 of this MVC - @build 17th February, 2017 + @version @update number 97 of this MVC + @build 3rd March, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php index c47340689..1f6e42b88 100644 --- a/admin/controllers/joomla_components.php +++ b/admin/controllers/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 96 of this MVC - @build 17th February, 2017 + @version @update number 97 of this MVC + @build 3rd March, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php index c59314724..08560867b 100644 --- a/admin/helpers/compiler.php +++ b/admin/helpers/compiler.php @@ -339,55 +339,66 @@ class Compiler extends Infusion private function buildReadMeData() { + // what is the size in terms of an A4 book + $this->pageCount = round($this->lineCount / 56); // setup the unrealistic numbers - $folders = $this->folderCount * 5; - $files = $this->fileCount * 5; - $lines = $this->lineCount * 10; - $seconds = $folders + $files + $lines; - $totalHours = round($seconds / 3600); - $totalDays = round($totalHours / 8); + $this->folderSeconds = $this->folderCount * 5; + $this->fileSeconds = $this->fileCount * 5; + $this->lineSeconds = $this->lineCount * 10; + $this->seconds = $this->folderSeconds + $this->fileSeconds + $this->lineSeconds; + $this->totalHours = round($this->seconds / 3600); + $this->totalDays = round($this->totalHours / 8); // setup the more realistic numbers - $debugging = $seconds / 4; - $planning = $seconds / 7; - $mapping = $seconds / 10; - $office = $seconds / 6; - $seconds = $folders + $files + $lines + $debugging + $planning + $mapping + $office; - $actualTotalHours = round($seconds / 3600); - $actualTotalDays = round($actualTotalHours / 8); - $debuggingHours = round($debugging / 3600); - $planningHours = round($planning / 3600); - $mappingHours = round($mapping / 3600); - $officeHours = round($office / 3600); + $this->secondsDebugging = $this->seconds / 4; + $this->secondsPlanning = $this->seconds / 7; + $this->secondsMapping = $this->seconds / 10; + $this->secondsOffice = $this->seconds / 6; + $this->actualSeconds = $this->folderSeconds + $this->fileSeconds + $this->lineSeconds + $this->secondsDebugging + $this->secondsPlanning + $this->secondsMapping + $this->secondsOffice; + $this->actualTotalHours = round($this->actualSeconds / 3600); + $this->actualTotalDays = round($this->actualTotalHours / 8); + $this->debuggingHours = round($this->secondsDebugging / 3600); + $this->planningHours = round($this->secondsPlanning / 3600); + $this->mappingHours = round($this->secondsMapping / 3600); + $this->officeHours = round($this->secondsOffice / 3600); // the actual time spent - $actualHoursSpent = $actualTotalHours - $totalHours; - $actualDaysSpent = $actualTotalDays - $totalDays; + $this->actualHoursSpent = $this->actualTotalHours - $this->totalHours; + $this->actualDaysSpent = $this->actualTotalDays - $this->totalDays; // calculate the projects actual time frame of completion - $projectWeekTime = round($actualTotalDays / 5,1); - $projectMonthTime = round($actualTotalDays / 24,1); + $this->projectWeekTime = round($this->actualTotalDays / 5,1); + $this->projectMonthTime = round($this->actualTotalDays / 24,1); // set some defaults - $this->fileContentStatic['###LINE_COUNT###'] = $this->lineCount; - $this->fileContentStatic['###FILE_COUNT###'] = $this->fileCount; - $this->fileContentStatic['###FOLDER_COUNT###'] = $this->folderCount; - $this->fileContentStatic['###folders###'] = $folders; - $this->fileContentStatic['###files###'] = $files; - $this->fileContentStatic['###lines###'] = $lines; - $this->fileContentStatic['###seconds###'] = $seconds; - $this->fileContentStatic['###totalHours###'] = $totalHours; - $this->fileContentStatic['###totalDays###'] = $totalDays; - $this->fileContentStatic['###debugging###'] = $debugging; - $this->fileContentStatic['###planning###'] = $planning; - $this->fileContentStatic['###mapping###'] = $mapping; - $this->fileContentStatic['###office###'] = $office; - $this->fileContentStatic['###actualTotalHours###'] = $actualTotalHours; - $this->fileContentStatic['###actualTotalDays###'] = $actualTotalDays; - $this->fileContentStatic['###debuggingHours###'] = $debuggingHours; - $this->fileContentStatic['###planningHours###'] = $planningHours; - $this->fileContentStatic['###mappingHours###'] = $mappingHours; - $this->fileContentStatic['###officeHours###'] = $officeHours; - $this->fileContentStatic['###actualHoursSpent###'] = $actualHoursSpent; - $this->fileContentStatic['###actualDaysSpent###'] = $actualDaysSpent; - $this->fileContentStatic['###projectWeekTime###'] = $projectWeekTime; - $this->fileContentStatic['###projectMonthTime###'] = $projectMonthTime; + $this->fileContentStatic['###LINE_COUNT###'] = $this->lineCount; + $this->fileContentStatic['###FILE_COUNT###'] = $this->fileCount; + $this->fileContentStatic['###FOLDER_COUNT###'] = $this->folderCount; + $this->fileContentStatic['###PAGE_COUNT###'] = $this->pageCount; + $this->fileContentStatic['###folders###'] = $this->folderSeconds; + $this->fileContentStatic['###foldersSeconds###'] = $this->folderSeconds; + $this->fileContentStatic['###files###'] = $this->fileSeconds; + $this->fileContentStatic['###filesSeconds###'] = $this->fileSeconds; + $this->fileContentStatic['###lines###'] = $this->lineSeconds; + $this->fileContentStatic['###linesSeconds###'] = $this->lineSeconds; + $this->fileContentStatic['###seconds###'] = $this->actualSeconds; + $this->fileContentStatic['###actualSeconds###'] = $this->actualSeconds; + $this->fileContentStatic['###totalHours###'] = $this->totalHours; + $this->fileContentStatic['###totalDays###'] = $this->totalDays; + $this->fileContentStatic['###debugging###'] = $this->secondsDebugging; + $this->fileContentStatic['###secondsDebugging###'] = $this->secondsDebugging; + $this->fileContentStatic['###planning###'] = $this->secondsPlanning; + $this->fileContentStatic['###secondsPlanning###'] = $this->secondsPlanning; + $this->fileContentStatic['###mapping###'] = $this->secondsMapping; + $this->fileContentStatic['###secondsMapping###'] = $this->secondsMapping; + $this->fileContentStatic['###office###'] = $this->secondsOffice; + $this->fileContentStatic['###secondsOffice###'] = $this->secondsOffice; + $this->fileContentStatic['###actualTotalHours###'] = $this->actualTotalHours; + $this->fileContentStatic['###actualTotalDays###'] = $this->actualTotalDays; + $this->fileContentStatic['###debuggingHours###'] = $this->debuggingHours; + $this->fileContentStatic['###planningHours###'] = $this->planningHours; + $this->fileContentStatic['###mappingHours###'] = $this->mappingHours; + $this->fileContentStatic['###officeHours###'] = $this->officeHours; + $this->fileContentStatic['###actualHoursSpent###'] = $this->actualHoursSpent; + $this->fileContentStatic['###actualDaysSpent###'] = $this->actualDaysSpent; + $this->fileContentStatic['###projectWeekTime###'] = $this->projectWeekTime; + $this->fileContentStatic['###projectMonthTime###'] = $this->projectMonthTime; } private function zipComponent() diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index d4f321f77..c0654cac5 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -45,6 +45,13 @@ class Structure extends Get */ public $fileCount = 0; + /** + * The page counter + * + * @var int + */ + public $pageCount = 0; + /** * The line counter * @@ -52,6 +59,153 @@ class Structure extends Get */ public $lineCount = 0; + /** + * The seconds counter + * + * @var int + */ + public $seconds = 0; + + /** + * The actual seconds counter + * + * @var int + */ + public $actualSeconds = 0; + + /** + * The folder seconds counter + * + * @var int + */ + public $folderSeconds = 0; + + /** + * The file seconds counter + * + * @var int + */ + public $fileSeconds = 0; + + /** + * The line seconds counter + * + * @var int + */ + public $lineSeconds = 0; + + /** + * The seconds debugging counter + * + * @var int + */ + public $secondsDebugging = 0; + + /** + * The seconds planning counter + * + * @var int + */ + public $secondsPlanning = 0; + + /** + * The seconds mapping counter + * + * @var int + */ + public $secondsMapping = 0; + + /** + * The seconds office counter + * + * @var int + */ + public $secondsOffice = 0; + + /** + * The total hours counter + * + * @var int + */ + public $totalHours = 0; + + /** + * The debugging hours counter + * + * @var int + */ + public $debuggingHours = 0; + + /** + * The planning hours counter + * + * @var int + */ + public $planningHours = 0; + + /** + * The mapping hours counter + * + * @var int + */ + public $mappingHours = 0; + + /** + * The office hours counter + * + * @var int + */ + public $officeHours = 0; + + /** + * The actual Total Hours counter + * + * @var int + */ + public $actualTotalHours = 0; + + /** + * The actual hours spent counter + * + * @var int + */ + public $actualHoursSpent = 0; + + /** + * The actual days spent counter + * + * @var int + */ + public $actualDaysSpent = 0; + + /** + * The total days counter + * + * @var int + */ + public $totalDays = 0; + + /** + * The actual Total Days counter + * + * @var int + */ + public $actualTotalDays = 0; + + /** + * The project week time counter + * + * @var int + */ + public $projectWeekTime = 0; + + /** + * The project month time counter + * + * @var int + */ + public $projectMonthTime = 0; + /** * The Joomla Version * diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 8bccb9350..60b364742 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -1469,15 +1469,15 @@ class Interpretation extends Fields break; case 5: // COM_COMPONENTBUILDER_DYNAMIC_GET_CATEGORIES - $string = ""; + $string = PHP_EOL."\t\t".$tab."//".$this->setLine(__LINE__)." (TODO) The dynamic category filter is not ready."; break; case 6: // COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS - $string = ""; + $string = PHP_EOL."\t\t".$tab."//".$this->setLine(__LINE__)." (TODO) The dynamic tags filter is not ready."; break; case 7: // COM_COMPONENTBUILDER_DYNAMIC_GET_DATE - $string = ""; + $string = PHP_EOL."\t\t".$tab."//".$this->setLine(__LINE__)." (TODO) The dynamic date filter is not ready."; break; case 8: // COM_COMPONENTBUILDER_DYNAMIC_GET_FUNCTIONVAR diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php index 8c4251745..98d247065 100644 --- a/admin/helpers/componentbuilder.php +++ b/admin/helpers/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php index 8b41ef5c8..77b1ab8ed 100644 --- a/admin/helpers/headercheck.php +++ b/admin/helpers/headercheck.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 9b35dd9db..24264bec6 100644 --- a/admin/helpers/html/batch_.php +++ b/admin/helpers/html/batch_.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage batch_.php diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php index 198fbe6ef..948910ba3 100644 --- a/admin/helpers/indenter.php +++ b/admin/helpers/indenter.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage indenter.php diff --git a/admin/helpers/js.php b/admin/helpers/js.php index df1e6197a..1585f0589 100644 --- a/admin/helpers/js.php +++ b/admin/helpers/js.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage js.php diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php index 96281675a..3271878aa 100644 --- a/admin/helpers/minify.php +++ b/admin/helpers/minify.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 0359fd70f..50a9968cd 100644 --- a/admin/language/en-GB/en-GB.com_componentbuilder.ini +++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini @@ -691,6 +691,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_YOUTUBE="Youtube" COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_IN="Zoom In" COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_OUT="Zoom Out" COM_COMPONENTBUILDER_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please check again latter." +COM_COMPONENTBUILDER_ALL_IS_GOOD_THERE_IN_NO_NOTICE_AT_THIS_TIME="All is good, there in no notice at this time." COM_COMPONENTBUILDER_AUTHOR="Author" COM_COMPONENTBUILDER_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING="A few closed issues from Github is loading" COM_COMPONENTBUILDER_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING="A few open issues from Github is loading" @@ -2462,9 +2463,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT="Editing the Joomla Component" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT_CREATE_SITE_VIEW_DESCRIPTION="add site edit & create view for this admin view" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT_CREATE_SITE_VIEW_LABEL="Edit/Create Site View" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL="Email" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION="Enter Email" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT="demo@example.com" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_LABEL="Email" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION="Enter Author Email" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT="Author Email Here" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_LABEL="Author Email" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS="Emptycontributors" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_DESCRIPTION="Set if a list of empty contributor fields should be added." COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_LABEL="Empty Contributor Fields" @@ -2891,7 +2892,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WARNING_CIRCLE="Warning Circle" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE="Website" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com" -COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Website" +COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Author Website" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY="Whmcs Key" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license" COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT="Secret Key" @@ -3016,6 +3017,7 @@ COM_COMPONENTBUILDER_LAYOUT_YES="Yes" COM_COMPONENTBUILDER_LICENSE="License" COM_COMPONENTBUILDER_NEW="New" COM_COMPONENTBUILDER_NEW_ISSUE="New Issue" +COM_COMPONENTBUILDER_NEW_NOTICE="New Notice" COM_COMPONENTBUILDER_NO="No" COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!" COM_COMPONENTBUILDER_OPENED_BY="opened by" @@ -3024,8 +3026,7 @@ COM_COMPONENTBUILDER_PLEASE_ADD_FOLDERS_TO_S="Please add folders to (%s)" COM_COMPONENTBUILDER_PLEASE_CHECK_AGAIN_LATTER="Please check again latter." COM_COMPONENTBUILDER_PLEASE_SELECT_A_COMPONENT_THAT_YOU_WOULD_LIKE_TO_COMPILE="Please select a component that you would like to compile." COM_COMPONENTBUILDER_PLEASE_WAIT_CLEARING_THE_TMP_FOLDER="Please wait! Clearing the tmp folder" -COM_COMPONENTBUILDER_PLEASE_WAIT_COMPILING_THE_COMPONENT="Please wait! Compiling the component" -COM_COMPONENTBUILDER_READY_TO_COMPILE_YOUR_COMPONENT="Ready to compile your component" +COM_COMPONENTBUILDER_READY_TO_COMPILE_A_COMPONENT="Ready to compile a component" COM_COMPONENTBUILDER_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on Github" COM_COMPONENTBUILDER_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github" COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved." @@ -3581,6 +3582,7 @@ COM_COMPONENTBUILDER_SUBMENU_LAYOUTS="Layouts" COM_COMPONENTBUILDER_SUBMENU_SITE_VIEWS="Site Views" COM_COMPONENTBUILDER_SUBMENU_SNIPPETS="Snippets" COM_COMPONENTBUILDER_SUBMENU_TEMPLATES="Templates" +COM_COMPONENTBUILDER_S_PLEASE_WAIT_THE_COMPONENT_IS_BEING_COMPILED="%s, please wait! The component is being compiled" COM_COMPONENTBUILDER_TEMPLATE="Template" COM_COMPONENTBUILDER_TEMPLATES="Templates" COM_COMPONENTBUILDER_TEMPLATES_ACCESS="Templates Access" @@ -3689,6 +3691,7 @@ COM_COMPONENTBUILDER_THE_README_IS_LOADING="The readme is loading" COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading" COM_COMPONENTBUILDER_USE_BATCH="Use Batch" COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method." +COM_COMPONENTBUILDER_VDM_NOTICE_BOARD="VDM Notice Board" COM_COMPONENTBUILDER_VERSION="Version" COM_COMPONENTBUILDER_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github" COM_COMPONENTBUILDER_WEBSITE="Website" diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php index 1f1baab11..1fd0f5d85 100644 --- a/admin/layouts/admin_view/css_fullwidth.php +++ b/admin/layouts/admin_view/css_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 dd99496cf..934178609 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 3069ac822..59efc0720 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 d6ea1bcec..9ebfaef39 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.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_import_fullwidth.php diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php index 5f2fcc60c..5dc408f4d 100644 --- a/admin/layouts/admin_view/fields_fullwidth.php +++ b/admin/layouts/admin_view/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage fields_fullwidth.php diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php index 24273cd2d..cbdac881d 100644 --- a/admin/layouts/admin_view/javascript_fullwidth.php +++ b/admin/layouts/admin_view/javascript_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 index 831fa5baf..f71bbd0f3 100644 --- a/admin/layouts/admin_view/linked_components_fullwidth.php +++ b/admin/layouts/admin_view/linked_components_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_components_fullwidth.php diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php index 90d71f9fc..c50c4fbca 100644 --- a/admin/layouts/admin_view/mysql_fullwidth.php +++ b/admin/layouts/admin_view/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 6359e25ab..552e76c6f 100644 --- a/admin/layouts/admin_view/mysql_left.php +++ b/admin/layouts/admin_view/mysql_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 9247703ed..203685ffa 100644 --- a/admin/layouts/admin_view/php_fullwidth.php +++ b/admin/layouts/admin_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/admin_view/publishing.php +++ b/admin/layouts/admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/admin_view/publlshing.php +++ b/admin/layouts/admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php index dd951573b..734f7a19b 100644 --- a/admin/layouts/admin_view/settings_above.php +++ b/admin/layouts/admin_view/settings_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_above.php diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php index 8884c88dd..edbc4356e 100644 --- a/admin/layouts/admin_view/settings_left.php +++ b/admin/layouts/admin_view/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php index 91b25e78b..8779d79ab 100644 --- a/admin/layouts/admin_view/settings_right.php +++ b/admin/layouts/admin_view/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php index 777e315fc..14dd5f01b 100644 --- a/admin/layouts/admin_view/settings_under.php +++ b/admin/layouts/admin_view/settings_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_under.php diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php index 1ddf2950f..efa6bc118 100644 --- a/admin/layouts/batchselection.php +++ b/admin/layouts/batchselection.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 c0fc6c4c6..7c6711026 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 3069ac822..59efc0720 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 5d2b0ee11..ef3b57f31 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 c0c3aaed1..e2d43fd32 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 b23263d7b..071e23f09 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e74488d0c..272cbd80d 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 972f56e37..acfd03938 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 bd7e5df1a..fd3f64c13 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5f24c4ff..0cff6b705 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 9dc8e5a1d..728b95730 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/custom_admin_view/publishing.php +++ b/admin/layouts/custom_admin_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/custom_admin_view/publlshing.php +++ b/admin/layouts/custom_admin_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 c7c82e4a9..824903604 100644 --- a/admin/layouts/custom_code/details_above.php +++ b/admin/layouts/custom_code/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 bd315a515..e19d5f268 100644 --- a/admin/layouts/custom_code/details_fullwidth.php +++ b/admin/layouts/custom_code/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 78c3692fe..de799ba7c 100644 --- a/admin/layouts/custom_code/details_left.php +++ b/admin/layouts/custom_code/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 a8896dc11..4ec239cd9 100644 --- a/admin/layouts/custom_code/details_right.php +++ b/admin/layouts/custom_code/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5f24c4ff..0cff6b705 100644 --- a/admin/layouts/custom_code/details_under.php +++ b/admin/layouts/custom_code/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/custom_code/publishing.php +++ b/admin/layouts/custom_code/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/custom_code/publlshing.php +++ b/admin/layouts/custom_code/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 a047003be..6c4ee0903 100644 --- a/admin/layouts/dynamic_get/abacus_fullwidth.php +++ b/admin/layouts/dynamic_get/abacus_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 771b531d3..23f900b47 100644 --- a/admin/layouts/dynamic_get/abacus_left.php +++ b/admin/layouts/dynamic_get/abacus_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ca2277561..91e0bddca 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.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_script_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php index db7402689..e74f460c8 100644 --- a/admin/layouts/dynamic_get/gettable_above.php +++ b/admin/layouts/dynamic_get/gettable_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_above.php diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php index 3ac4b0234..83e6b8b15 100644 --- a/admin/layouts/dynamic_get/gettable_fullwidth.php +++ b/admin/layouts/dynamic_get/gettable_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_fullwidth.php diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php index f589deb7f..c2af413cc 100644 --- a/admin/layouts/dynamic_get/gettable_left.php +++ b/admin/layouts/dynamic_get/gettable_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_left.php diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php index 38727e13b..3bed5ec3a 100644 --- a/admin/layouts/dynamic_get/gettable_right.php +++ b/admin/layouts/dynamic_get/gettable_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_right.php diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php index 4f60d1756..b4c6ded67 100644 --- a/admin/layouts/dynamic_get/gettable_under.php +++ b/admin/layouts/dynamic_get/gettable_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage gettable_under.php diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php index ebcffb6dd..360346bb4 100644 --- a/admin/layouts/dynamic_get/publishing.php +++ b/admin/layouts/dynamic_get/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/dynamic_get/publlshing.php +++ b/admin/layouts/dynamic_get/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 40b8332c7..d7585d601 100644 --- a/admin/layouts/field/details_fullwidth.php +++ b/admin/layouts/field/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 f3c7e9209..a659891d7 100644 --- a/admin/layouts/field/details_left.php +++ b/admin/layouts/field/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 4267bfec9..75cadfa02 100644 --- a/admin/layouts/field/details_right.php +++ b/admin/layouts/field/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5f24c4ff..0cff6b705 100644 --- a/admin/layouts/field/details_under.php +++ b/admin/layouts/field/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 d684684bf..280acb340 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.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage linked_admin_views_fullwidth.php diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php index ebcffb6dd..360346bb4 100644 --- a/admin/layouts/field/publishing.php +++ b/admin/layouts/field/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/field/publlshing.php +++ b/admin/layouts/field/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ca36b4987..4bdd18a74 100644 --- a/admin/layouts/field/scripts_left.php +++ b/admin/layouts/field/scripts_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 5eae48eef..b22dcff8f 100644 --- a/admin/layouts/field/scripts_right.php +++ b/admin/layouts/field/scripts_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage scripts_right.php diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php index df3e3ae56..507e657b7 100644 --- a/admin/layouts/fieldtype/details_left.php +++ b/admin/layouts/fieldtype/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 293ab19bb..2607d7b80 100644 --- a/admin/layouts/fieldtype/details_right.php +++ b/admin/layouts/fieldtype/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 cc8038ed4..f9a5573d9 100644 --- a/admin/layouts/fieldtype/fields_fullwidth.php +++ b/admin/layouts/fieldtype/fields_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/fieldtype/publishing.php +++ b/admin/layouts/fieldtype/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/fieldtype/publlshing.php +++ b/admin/layouts/fieldtype/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 39e876e01..82c8c2598 100644 --- a/admin/layouts/help_document/details_above.php +++ b/admin/layouts/help_document/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 eb9cf9f04..339bf6171 100644 --- a/admin/layouts/help_document/details_fullwidth.php +++ b/admin/layouts/help_document/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 b64e213f0..bd1209f31 100644 --- a/admin/layouts/help_document/details_left.php +++ b/admin/layouts/help_document/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ae62bf75f..74b06de85 100644 --- a/admin/layouts/help_document/details_right.php +++ b/admin/layouts/help_document/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5f24c4ff..0cff6b705 100644 --- a/admin/layouts/help_document/details_under.php +++ b/admin/layouts/help_document/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/help_document/publishing.php +++ b/admin/layouts/help_document/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 b41788047..c322c19eb 100644 --- a/admin/layouts/help_document/publlshing.php +++ b/admin/layouts/help_document/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 310b8b323..1bb27f732 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.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views_fullwidth.php diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php index 2f3fff504..12f52a9ab 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 c0c3aaed1..e2d43fd32 100644 --- a/admin/layouts/joomla_component/details_above.php +++ b/admin/layouts/joomla_component/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e07daff5e..92af889f7 100644 --- a/admin/layouts/joomla_component/details_left.php +++ b/admin/layouts/joomla_component/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 63f7044b8..dc278f817 100644 --- a/admin/layouts/joomla_component/details_right.php +++ b/admin/layouts/joomla_component/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5f24c4ff..0cff6b705 100644 --- a/admin/layouts/joomla_component/details_under.php +++ b/admin/layouts/joomla_component/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e181b731c..6697916b3 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 18b1b99f1..466b097f4 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 6c882e344..e6ee14938 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.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage libs_helpers_fullwidth.php diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php index de4395ad6..dc4ca82bb 100644 --- a/admin/layouts/joomla_component/mysql_fullwidth.php +++ b/admin/layouts/joomla_component/mysql_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 5b5d4dc2b..f21796f82 100644 --- a/admin/layouts/joomla_component/php_fullwidth.php +++ b/admin/layouts/joomla_component/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/joomla_component/publishing.php +++ b/admin/layouts/joomla_component/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publishing.php diff --git a/admin/layouts/joomla_component/publlshing.php b/admin/layouts/joomla_component/publlshing.php index 27c074dfa..112a7e47d 100644 --- a/admin/layouts/joomla_component/publlshing.php +++ b/admin/layouts/joomla_component/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php index 8aa181d30..90d884152 100644 --- a/admin/layouts/joomla_component/readme_left.php +++ b/admin/layouts/joomla_component/readme_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ffd74a849..a6572bb18 100644 --- a/admin/layouts/joomla_component/readme_right.php +++ b/admin/layouts/joomla_component/readme_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5d174fdf..284e8bcb6 100644 --- a/admin/layouts/joomla_component/settings_left.php +++ b/admin/layouts/joomla_component/settings_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_left.php @@ -34,13 +34,13 @@ $fields = $displayData->get('fields') ?: array( 'addadmin_views', 'addcustom_admin_views', 'addsite_views', - 'spacer_hr_c', + 'spacer_hr_e', 'note_mysql_tweak_options', 'sql_tweak', - 'spacer_hr_d', + 'spacer_hr_a', 'note_add_custom_menus', 'addcustommenus', - 'spacer_hr_e', + 'spacer_hr_d', 'note_add_config', 'addconfig' ); diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php index de1111031..abbddca5b 100644 --- a/admin/layouts/joomla_component/settings_right.php +++ b/admin/layouts/joomla_component/settings_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage settings_right.php @@ -34,7 +34,7 @@ $fields = $displayData->get('fields') ?: array( 'addcontributors', 'emptycontributors', 'number', - 'spacer_hr_a', + 'spacer_hr_c', 'note_add_files', 'addfiles', 'spacer_hr_b', diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php index bb48529ce..20c616d79 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.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage site_views_fullwidth.php diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php index 43282c472..59786fc8c 100644 --- a/admin/layouts/layout/custom_script_fullwidth.php +++ b/admin/layouts/layout/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 3172cdbb8..21f6a18f2 100644 --- a/admin/layouts/layout/details_fullwidth.php +++ b/admin/layouts/layout/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 3172a607e..89589f043 100644 --- a/admin/layouts/layout/details_left.php +++ b/admin/layouts/layout/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 13582bf0c..85b5c9567 100644 --- a/admin/layouts/layout/details_right.php +++ b/admin/layouts/layout/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 23c4b258b..77d394b04 100644 --- a/admin/layouts/layout/details_rightside.php +++ b/admin/layouts/layout/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5f24c4ff..0cff6b705 100644 --- a/admin/layouts/layout/details_under.php +++ b/admin/layouts/layout/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/layout/publishing.php +++ b/admin/layouts/layout/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/layout/publlshing.php +++ b/admin/layouts/layout/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 0e68298c1..db81b2777 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.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage custom_buttons_fullwidth.php diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php index c0c3aaed1..e2d43fd32 100644 --- a/admin/layouts/site_view/details_above.php +++ b/admin/layouts/site_view/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 b23263d7b..071e23f09 100644 --- a/admin/layouts/site_view/details_fullwidth.php +++ b/admin/layouts/site_view/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e74488d0c..272cbd80d 100644 --- a/admin/layouts/site_view/details_left.php +++ b/admin/layouts/site_view/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 13582bf0c..85b5c9567 100644 --- a/admin/layouts/site_view/details_right.php +++ b/admin/layouts/site_view/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 bd7e5df1a..fd3f64c13 100644 --- a/admin/layouts/site_view/details_rightside.php +++ b/admin/layouts/site_view/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5f24c4ff..0cff6b705 100644 --- a/admin/layouts/site_view/details_under.php +++ b/admin/layouts/site_view/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 37c783361..3814b2ab2 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 442875769..af871e815 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.3.6 - @build 1st March, 2017 + @build 3rd March, 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 0ee093eca..91ebd7c47 100644 --- a/admin/layouts/site_view/php_fullwidth.php +++ b/admin/layouts/site_view/php_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/site_view/publishing.php +++ b/admin/layouts/site_view/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/site_view/publlshing.php +++ b/admin/layouts/site_view/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 98cac5922..021bac471 100644 --- a/admin/layouts/snippet/details_above.php +++ b/admin/layouts/snippet/details_above.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 30618d687..3ae32eb77 100644 --- a/admin/layouts/snippet/details_left.php +++ b/admin/layouts/snippet/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 4c1fd04e5..8440bb3de 100644 --- a/admin/layouts/snippet/details_right.php +++ b/admin/layouts/snippet/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/snippet/publishing.php +++ b/admin/layouts/snippet/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/snippet/publlshing.php +++ b/admin/layouts/snippet/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 43282c472..59786fc8c 100644 --- a/admin/layouts/template/custom_script_fullwidth.php +++ b/admin/layouts/template/custom_script_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ece394d16..1f2f52150 100644 --- a/admin/layouts/template/details_fullwidth.php +++ b/admin/layouts/template/details_fullwidth.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 3172a607e..89589f043 100644 --- a/admin/layouts/template/details_left.php +++ b/admin/layouts/template/details_left.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 13582bf0c..85b5c9567 100644 --- a/admin/layouts/template/details_right.php +++ b/admin/layouts/template/details_right.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 23c4b258b..77d394b04 100644 --- a/admin/layouts/template/details_rightside.php +++ b/admin/layouts/template/details_rightside.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 e5f24c4ff..0cff6b705 100644 --- a/admin/layouts/template/details_under.php +++ b/admin/layouts/template/details_under.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ebcffb6dd..360346bb4 100644 --- a/admin/layouts/template/publishing.php +++ b/admin/layouts/template/publishing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 27c074dfa..112a7e47d 100644 --- a/admin/layouts/template/publlshing.php +++ b/admin/layouts/template/publlshing.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage publlshing.php diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php index 1d5a2e105..9adc618e9 100644 --- a/admin/models/admin_view.php +++ b/admin/models/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php @@ -95,48 +95,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->php_ajaxmethod)) - { - // base64 Decode php_ajaxmethod. - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); - } - - if (!empty($item->php_before_delete)) - { - // base64 Decode php_before_delete. - $item->php_before_delete = base64_decode($item->php_before_delete); - } - - if (!empty($item->php_before_publish)) - { - // base64 Decode php_before_publish. - $item->php_before_publish = base64_decode($item->php_before_publish); - } - if (!empty($item->html_import_view)) { // base64 Decode html_import_view. $item->html_import_view = base64_decode($item->html_import_view); } - if (!empty($item->php_batchmove)) - { - // base64 Decode php_batchmove. - $item->php_batchmove = base64_decode($item->php_batchmove); - } - - if (!empty($item->php_after_publish)) - { - // base64 Decode php_after_publish. - $item->php_after_publish = base64_decode($item->php_after_publish); - } - - 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_import_setdata)) { // base64 Decode php_import_setdata. @@ -149,6 +113,42 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->css_view = base64_decode($item->css_view); } + if (!empty($item->php_getitem)) + { + // base64 Decode php_getitem. + $item->php_getitem = base64_decode($item->php_getitem); + } + + if (!empty($item->php_getitems)) + { + // base64 Decode php_getitems. + $item->php_getitems = base64_decode($item->php_getitems); + } + + if (!empty($item->css_views)) + { + // base64 Decode css_views. + $item->css_views = base64_decode($item->css_views); + } + + if (!empty($item->php_getitems_after_all)) + { + // base64 Decode php_getitems_after_all. + $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); + } + + if (!empty($item->php_getlistquery)) + { + // base64 Decode php_getlistquery. + $item->php_getlistquery = base64_decode($item->php_getlistquery); + } + + if (!empty($item->javascript_view_file)) + { + // base64 Decode javascript_view_file. + $item->javascript_view_file = base64_decode($item->javascript_view_file); + } + if (!empty($item->php_save)) { // base64 Decode php_save. @@ -161,10 +161,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_postsavehook = base64_decode($item->php_postsavehook); } - if (!empty($item->css_views)) + if (!empty($item->javascript_view_footer)) { - // base64 Decode css_views. - $item->css_views = base64_decode($item->css_views); + // base64 Decode javascript_view_footer. + $item->javascript_view_footer = base64_decode($item->javascript_view_footer); } if (!empty($item->php_allowedit)) @@ -179,34 +179,46 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_batchcopy = base64_decode($item->php_batchcopy); } - if (!empty($item->javascript_view_file)) - { - // base64 Decode javascript_view_file. - $item->javascript_view_file = base64_decode($item->javascript_view_file); - } - - if (!empty($item->javascript_view_footer)) - { - // base64 Decode javascript_view_footer. - $item->javascript_view_footer = base64_decode($item->javascript_view_footer); - } - if (!empty($item->javascript_views_file)) { // base64 Decode javascript_views_file. $item->javascript_views_file = base64_decode($item->javascript_views_file); } + if (!empty($item->php_batchmove)) + { + // base64 Decode php_batchmove. + $item->php_batchmove = base64_decode($item->php_batchmove); + } + + if (!empty($item->php_before_publish)) + { + // base64 Decode php_before_publish. + $item->php_before_publish = base64_decode($item->php_before_publish); + } + if (!empty($item->javascript_views_footer)) { // base64 Decode javascript_views_footer. $item->javascript_views_footer = base64_decode($item->javascript_views_footer); } - if (!empty($item->php_document)) + if (!empty($item->php_after_publish)) { - // base64 Decode php_document. - $item->php_document = base64_decode($item->php_document); + // base64 Decode php_after_publish. + $item->php_after_publish = base64_decode($item->php_after_publish); + } + + if (!empty($item->php_before_delete)) + { + // base64 Decode php_before_delete. + $item->php_before_delete = base64_decode($item->php_before_delete); + } + + 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_controller)) @@ -215,22 +227,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_controller = base64_decode($item->php_controller); } - if (!empty($item->php_getitem)) + if (!empty($item->php_document)) { - // base64 Decode php_getitem. - $item->php_getitem = base64_decode($item->php_getitem); - } - - if (!empty($item->php_getitems)) - { - // base64 Decode php_getitems. - $item->php_getitems = base64_decode($item->php_getitems); - } - - if (!empty($item->php_getitems_after_all)) - { - // base64 Decode php_getitems_after_all. - $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); + // base64 Decode php_document. + $item->php_document = base64_decode($item->php_document); } if (!empty($item->php_controller_list)) @@ -263,18 +263,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $item->php_import_display = base64_decode($item->php_import_display); } + if (!empty($item->php_ajaxmethod)) + { + // base64 Decode php_ajaxmethod. + $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); + } + if (!empty($item->php_import)) { // base64 Decode php_import. $item->php_import = base64_decode($item->php_import); } - if (!empty($item->php_getlistquery)) - { - // base64 Decode php_getlistquery. - $item->php_getlistquery = base64_decode($item->php_getlistquery); - } - if (!empty($item->php_import_save)) { // base64 Decode php_import_save. @@ -1272,48 +1272,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the php_ajaxmethod string to base64 string. - if (isset($data['php_ajaxmethod'])) - { - $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); - } - - // Set the php_before_delete string to base64 string. - if (isset($data['php_before_delete'])) - { - $data['php_before_delete'] = base64_encode($data['php_before_delete']); - } - - // Set the php_before_publish string to base64 string. - if (isset($data['php_before_publish'])) - { - $data['php_before_publish'] = base64_encode($data['php_before_publish']); - } - // Set the html_import_view string to base64 string. if (isset($data['html_import_view'])) { $data['html_import_view'] = base64_encode($data['html_import_view']); } - // Set the php_batchmove string to base64 string. - if (isset($data['php_batchmove'])) - { - $data['php_batchmove'] = base64_encode($data['php_batchmove']); - } - - // Set the php_after_publish string to base64 string. - if (isset($data['php_after_publish'])) - { - $data['php_after_publish'] = base64_encode($data['php_after_publish']); - } - - // 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_import_setdata string to base64 string. if (isset($data['php_import_setdata'])) { @@ -1326,6 +1290,42 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['css_view'] = base64_encode($data['css_view']); } + // Set the php_getitem string to base64 string. + if (isset($data['php_getitem'])) + { + $data['php_getitem'] = base64_encode($data['php_getitem']); + } + + // Set the php_getitems string to base64 string. + if (isset($data['php_getitems'])) + { + $data['php_getitems'] = base64_encode($data['php_getitems']); + } + + // Set the css_views string to base64 string. + if (isset($data['css_views'])) + { + $data['css_views'] = base64_encode($data['css_views']); + } + + // Set the php_getitems_after_all string to base64 string. + if (isset($data['php_getitems_after_all'])) + { + $data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']); + } + + // Set the php_getlistquery string to base64 string. + if (isset($data['php_getlistquery'])) + { + $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); + } + + // Set the javascript_view_file string to base64 string. + if (isset($data['javascript_view_file'])) + { + $data['javascript_view_file'] = base64_encode($data['javascript_view_file']); + } + // Set the php_save string to base64 string. if (isset($data['php_save'])) { @@ -1338,10 +1338,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_postsavehook'] = base64_encode($data['php_postsavehook']); } - // Set the css_views string to base64 string. - if (isset($data['css_views'])) + // Set the javascript_view_footer string to base64 string. + if (isset($data['javascript_view_footer'])) { - $data['css_views'] = base64_encode($data['css_views']); + $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']); } // Set the php_allowedit string to base64 string. @@ -1356,34 +1356,46 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_batchcopy'] = base64_encode($data['php_batchcopy']); } - // Set the javascript_view_file string to base64 string. - if (isset($data['javascript_view_file'])) - { - $data['javascript_view_file'] = base64_encode($data['javascript_view_file']); - } - - // Set the javascript_view_footer string to base64 string. - if (isset($data['javascript_view_footer'])) - { - $data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']); - } - // Set the javascript_views_file string to base64 string. if (isset($data['javascript_views_file'])) { $data['javascript_views_file'] = base64_encode($data['javascript_views_file']); } + // Set the php_batchmove string to base64 string. + if (isset($data['php_batchmove'])) + { + $data['php_batchmove'] = base64_encode($data['php_batchmove']); + } + + // Set the php_before_publish string to base64 string. + if (isset($data['php_before_publish'])) + { + $data['php_before_publish'] = base64_encode($data['php_before_publish']); + } + // Set the javascript_views_footer string to base64 string. if (isset($data['javascript_views_footer'])) { $data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']); } - // Set the php_document string to base64 string. - if (isset($data['php_document'])) + // Set the php_after_publish string to base64 string. + if (isset($data['php_after_publish'])) { - $data['php_document'] = base64_encode($data['php_document']); + $data['php_after_publish'] = base64_encode($data['php_after_publish']); + } + + // Set the php_before_delete string to base64 string. + if (isset($data['php_before_delete'])) + { + $data['php_before_delete'] = base64_encode($data['php_before_delete']); + } + + // 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_controller string to base64 string. @@ -1392,22 +1404,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_controller'] = base64_encode($data['php_controller']); } - // Set the php_getitem string to base64 string. - if (isset($data['php_getitem'])) + // Set the php_document string to base64 string. + if (isset($data['php_document'])) { - $data['php_getitem'] = base64_encode($data['php_getitem']); - } - - // Set the php_getitems string to base64 string. - if (isset($data['php_getitems'])) - { - $data['php_getitems'] = base64_encode($data['php_getitems']); - } - - // Set the php_getitems_after_all string to base64 string. - if (isset($data['php_getitems_after_all'])) - { - $data['php_getitems_after_all'] = base64_encode($data['php_getitems_after_all']); + $data['php_document'] = base64_encode($data['php_document']); } // Set the php_controller_list string to base64 string. @@ -1440,18 +1440,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin $data['php_import_display'] = base64_encode($data['php_import_display']); } + // Set the php_ajaxmethod string to base64 string. + if (isset($data['php_ajaxmethod'])) + { + $data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']); + } + // Set the php_import string to base64 string. if (isset($data['php_import'])) { $data['php_import'] = base64_encode($data['php_import']); } - // Set the php_getlistquery string to base64 string. - if (isset($data['php_getlistquery'])) - { - $data['php_getlistquery'] = base64_encode($data['php_getlistquery']); - } - // Set the php_import_save string to base64 string. if (isset($data['php_import_save'])) { @@ -1472,9 +1472,8 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin // do the actual sort by tab and order_edit usort($out, function ($a, $b) { - $val_a = $a['tab'].$a['order_edit']; - $val_b = $b['tab'].$b['order_edit']; - + $val_a = sprintf('%02u', $a['tab']) . sprintf('%02u', $a['alignment']) . sprintf('%03u', $a['order_edit']); + $val_b = sprintf('%02u', $b['tab']) . sprintf('%02u', $b['alignment']) . sprintf('%03u', $b['order_edit']); return strcmp($val_a, $val_b); }); diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php index ac7975e19..4954c680f 100644 --- a/admin/models/admin_views.php +++ b/admin/models/admin_views.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_views.php @@ -191,7 +191,7 @@ class ComponentbuilderModelAdmin_views extends JModelList else { $search = $db->quote('%' . $db->escape($search) . '%'); - $query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.name_list LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.type LIKE '.$search.' OR a.description LIKE '.$search.')'); + $query->where('(a.system_name LIKE '.$search.' OR a.name_single LIKE '.$search.' OR a.name_list LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.description LIKE '.$search.' OR a.type LIKE '.$search.')'); } } @@ -262,52 +262,52 @@ class ComponentbuilderModelAdmin_views extends JModelList continue; } - // decode php_ajaxmethod - $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); - // decode php_before_delete - $item->php_before_delete = base64_decode($item->php_before_delete); - // decode php_before_publish - $item->php_before_publish = base64_decode($item->php_before_publish); // decode html_import_view $item->html_import_view = base64_decode($item->html_import_view); - // decode php_batchmove - $item->php_batchmove = base64_decode($item->php_batchmove); - // decode php_after_publish - $item->php_after_publish = base64_decode($item->php_after_publish); - // decode php_after_delete - $item->php_after_delete = base64_decode($item->php_after_delete); // decode php_import_setdata $item->php_import_setdata = base64_decode($item->php_import_setdata); // decode css_view $item->css_view = base64_decode($item->css_view); - // decode php_save - $item->php_save = base64_decode($item->php_save); - // decode php_postsavehook - $item->php_postsavehook = base64_decode($item->php_postsavehook); - // decode css_views - $item->css_views = base64_decode($item->css_views); - // decode php_allowedit - $item->php_allowedit = base64_decode($item->php_allowedit); - // decode php_batchcopy - $item->php_batchcopy = base64_decode($item->php_batchcopy); - // decode javascript_view_file - $item->javascript_view_file = base64_decode($item->javascript_view_file); - // decode javascript_view_footer - $item->javascript_view_footer = base64_decode($item->javascript_view_footer); - // decode javascript_views_file - $item->javascript_views_file = base64_decode($item->javascript_views_file); - // decode javascript_views_footer - $item->javascript_views_footer = base64_decode($item->javascript_views_footer); - // decode php_document - $item->php_document = base64_decode($item->php_document); - // decode php_controller - $item->php_controller = base64_decode($item->php_controller); // decode php_getitem $item->php_getitem = base64_decode($item->php_getitem); // decode php_getitems $item->php_getitems = base64_decode($item->php_getitems); + // decode css_views + $item->css_views = base64_decode($item->css_views); // decode php_getitems_after_all $item->php_getitems_after_all = base64_decode($item->php_getitems_after_all); + // decode php_getlistquery + $item->php_getlistquery = base64_decode($item->php_getlistquery); + // decode javascript_view_file + $item->javascript_view_file = base64_decode($item->javascript_view_file); + // decode php_save + $item->php_save = base64_decode($item->php_save); + // decode php_postsavehook + $item->php_postsavehook = base64_decode($item->php_postsavehook); + // decode javascript_view_footer + $item->javascript_view_footer = base64_decode($item->javascript_view_footer); + // decode php_allowedit + $item->php_allowedit = base64_decode($item->php_allowedit); + // decode php_batchcopy + $item->php_batchcopy = base64_decode($item->php_batchcopy); + // decode javascript_views_file + $item->javascript_views_file = base64_decode($item->javascript_views_file); + // decode php_batchmove + $item->php_batchmove = base64_decode($item->php_batchmove); + // decode php_before_publish + $item->php_before_publish = base64_decode($item->php_before_publish); + // decode javascript_views_footer + $item->javascript_views_footer = base64_decode($item->javascript_views_footer); + // decode php_after_publish + $item->php_after_publish = base64_decode($item->php_after_publish); + // decode php_before_delete + $item->php_before_delete = base64_decode($item->php_before_delete); + // decode php_after_delete + $item->php_after_delete = base64_decode($item->php_after_delete); + // decode php_controller + $item->php_controller = base64_decode($item->php_controller); + // decode php_document + $item->php_document = base64_decode($item->php_document); // decode php_controller_list $item->php_controller_list = base64_decode($item->php_controller_list); // decode php_model @@ -318,10 +318,10 @@ class ComponentbuilderModelAdmin_views extends JModelList $item->php_model_list = base64_decode($item->php_model_list); // decode php_import_display $item->php_import_display = base64_decode($item->php_import_display); + // decode php_ajaxmethod + $item->php_ajaxmethod = base64_decode($item->php_ajaxmethod); // decode php_import $item->php_import = base64_decode($item->php_import); - // decode php_getlistquery - $item->php_getlistquery = base64_decode($item->php_getlistquery); // decode php_import_save $item->php_import_save = base64_decode($item->php_import_save); // unset the values we don't want exported. diff --git a/admin/models/ajax.php b/admin/models/ajax.php index a0ab344c2..8677d0fcc 100644 --- a/admin/models/ajax.php +++ b/admin/models/ajax.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage ajax.php @@ -143,8 +143,8 @@ class ComponentbuilderModelAjax extends JModelList $html[] = '

' . JText::_('COM_COMPONENTBUILDER_LICENSE') . '

'; $html[] = '

' . $object->license . '

'; $html[] = '

' . JText::_('COM_COMPONENTBUILDER_COPYRIGHT') . '

'; - $html[] = '

' . $object->copyright . '

'; - $html[] = ' ' . JText::_('COM_COMPONENTBUILDER_EDIT') . ' ' .$object->system_name . ''; + $html[] = '

' . $object->copyright . '

'; + $html[] = ' ' . JText::_('COM_COMPONENTBUILDER_EDIT') . ' ' .$object->system_name . '

'; // now return the diplay return implode("\n", $html); } diff --git a/admin/models/compiler.php b/admin/models/compiler.php index e25e36879..bf210d692 100644 --- a/admin/models/compiler.php +++ b/admin/models/compiler.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 26 of this MVC - @build 28th February, 2017 + @version @update number 46 of this MVC + @build 3rd March, 2017 @created 1st February, 2017 @package Component Builder @subpackage compiler.php @@ -143,7 +143,7 @@ class ComponentbuilderModelCompiler extends JModelList return false; } - protected $compiler; + public $compiler; public function getComponents() { @@ -178,18 +178,6 @@ class ComponentbuilderModelCompiler extends JModelList } return false; } - - public function getCount() - { - return array( - 'lines' => $this->compiler->lineCount, - 'files' => $this->compiler->fileCount, - 'folders' => $this->compiler->folderCount, - 'filePath' => $this->compiler->filepath, - 'filename' => $this->compiler->componentFolderName, - 'time' => $this->compiler->secondsCompiled - ); - } public function emptyFolder($dir, $removeDir = false) { diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php index c60bdaf2b..78c28a966 100644 --- a/admin/models/componentbuilder.php +++ b/admin/models/componentbuilder.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage componentbuilder.php diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php index 2b13d245b..1412a057e 100644 --- a/admin/models/fields/adminviewfolderlist.php +++ b/admin/models/fields/adminviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 39cab36ad..704b0b22c 100644 --- a/admin/models/fields/adminviews.php +++ b/admin/models/fields/adminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage adminviews.php @@ -151,7 +151,7 @@ class JFormFieldAdminviews extends JFormFieldList { $db = JFactory::getDBO(); $query = $db->getQuery(true); - $query->select($db->quoteName(array('a.id','a.system_name'),array('id','adminview_system_name'))); + $query->select($db->quoteName(array('a.id','a.system_name'),array('id','before_system_name'))); $query->from($db->quoteName('#__componentbuilder_admin_view', 'a')); $query->where($db->quoteName('a.published') . ' = 1'); $query->order('a.system_name ASC'); @@ -163,7 +163,7 @@ class JFormFieldAdminviews extends JFormFieldList $options[] = JHtml::_('select.option', '', 'Select an option'); foreach($items as $item) { - $options[] = JHtml::_('select.option', $item->id, $item->adminview_system_name); + $options[] = JHtml::_('select.option', $item->id, $item->before_system_name); } } return $options; diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php index 9c044b4d1..63f0d8df7 100644 --- a/admin/models/fields/articles.php +++ b/admin/models/fields/articles.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 003a2b979..be18464db 100644 --- a/admin/models/fields/component.php +++ b/admin/models/fields/component.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage component.php diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php index 228e00469..3b25b19bf 100644 --- a/admin/models/fields/customadminviews.php +++ b/admin/models/fields/customadminviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 d6a5cc687..5eb5fb1b5 100644 --- a/admin/models/fields/customfilelist.php +++ b/admin/models/fields/customfilelist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 756f07026..83238270a 100644 --- a/admin/models/fields/customfolderlist.php +++ b/admin/models/fields/customfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 eb3b9dcf8..f1e273505 100644 --- a/admin/models/fields/customgets.php +++ b/admin/models/fields/customgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 c29fb7260..c1dae9b07 100644 --- a/admin/models/fields/dbtables.php +++ b/admin/models/fields/dbtables.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage dbtables.php diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php index 620f7f9f9..88dab2e02 100644 --- a/admin/models/fields/dynamicgets.php +++ b/admin/models/fields/dynamicgets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 41c51592b..b047b860e 100644 --- a/admin/models/fields/fields.php +++ b/admin/models/fields/fields.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 a6523cc80..3561f9e04 100644 --- a/admin/models/fields/fieldsmulti.php +++ b/admin/models/fields/fieldsmulti.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 32c1e51f8..db1749268 100644 --- a/admin/models/fields/fieldtypes.php +++ b/admin/models/fields/fieldtypes.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage fieldtypes.php diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php index 87fb38c17..dd7380a01 100644 --- a/admin/models/fields/maingets.php +++ b/admin/models/fields/maingets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 96faf0f1b..bc06d4f7b 100644 --- a/admin/models/fields/siteviewfolderlist.php +++ b/admin/models/fields/siteviewfolderlist.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 ca1d5874b..1330bcee9 100644 --- a/admin/models/fields/siteviews.php +++ b/admin/models/fields/siteviews.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 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 02a4990af..7d05bfec7 100644 --- a/admin/models/fields/snippets.php +++ b/admin/models/fields/snippets.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage snippets.php diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js index 51275050a..5d799b9a2 100644 --- a/admin/models/forms/admin_view.js +++ b/admin/models/forms/admin_view.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.js diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml index 2dc32bdd2..8ed840ed0 100644 --- a/admin/models/forms/admin_view.xml +++ b/admin/models/forms/admin_view.xml @@ -149,19 +149,142 @@ message="Error! Please add some short description here." hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -252,126 +375,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + @@ -420,59 +439,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -728,19 +658,13 @@ - - - + + + @@ -901,59 +825,11 @@ - - - - - - - - - + @@ -1048,6 +924,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1128,17 +1240,17 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_HINT" required="true" /> - + @@ -1154,11 +1266,11 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_HINT" required="true" /> - + @@ -1181,116 +1293,6 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_HINT" required="true" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + type="textarea" + name="php_batchmove" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_HINT" + required="true" + /> COM_COMPONENTBUILDER_ADMIN_VIEW_NO - + - - - - + type="textarea" + name="php_before_publish" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_HINT" + required="true" + /> - + - - - - @@ -1536,17 +1386,17 @@ - + @@ -2043,17 +1893,43 @@ - + + + + + @@ -2150,20 +2026,19 @@ hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT" required="true" /> - + - - - - + type="textarea" + name="php_ajaxmethod" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL" + rows="30" + cols="15" + description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_HINT" + required="true" + /> - + + type="repeatable" + name="ajax_input" + label="COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT_LABEL" + id="ajax_input" + class="ajax_inputs" + select="COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT_SELECT" + icon="list" + maximum="150"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + @@ -327,8 +370,38 @@ - - + + + + + + + + + + + + + + - + - + - - - - + type="textarea" + name="php_preflight_update" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_LABEL" + rows="17" + cols="5" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_HINT" + required="true" + /> - - - - - - + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - + - - - + type="repeatable" + name="addcontributors" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCONTRIBUTORS_LABEL" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCONTRIBUTORS_DESCRIPTION" + id="addcontributors" + class="addcontributor" + select="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCONTRIBUTORS_SELECT" + icon="list" + maximum="500"> + + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - + @@ -649,46 +691,113 @@ - + + + + + + + - + - + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_FTP + + - + + + + + + + - + - + - - - + - - - - - - - + - - - - - - - - @@ -829,31 +860,10 @@ - - - - - - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + type="textarea" + name="php_helper_site" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_LABEL" + rows="80" + cols="15" + description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_DESCRIPTION" + class="text_area span12" + filter="raw" + hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_HELPER_SITE_HINT" + required="true" + /> + + COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO - - - + + + + + + + + + + + + + + @@ -995,21 +1223,248 @@ - - - + + type="repeatable" + name="addcustommenus" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCUSTOMMENUS_LABEL" + id="addcustommenus" + class="addcustommenu" + select="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCUSTOMMENUS_SELECT" + icon="list" + maximum="50"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -2183,19 +2638,20 @@ - + + type="radio" + name="add_php_preflight_install" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + - - - + type="radio" + name="add_php_preflight_update" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + + + + + type="radio" + name="add_sql" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL" + class="btn-group btn-group-yesno" + default="0" + required="true"> + + + + - + + type="radio" + name="addreadme" + label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL" + class="btn-group btn-group-yesno" + default="0"> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/admin/models/import.php b/admin/models/import.php index 2ee392975..6cab02e75 100644 --- a/admin/models/import.php +++ b/admin/models/import.php @@ -11,7 +11,7 @@ /-------------------------------------------------------------------------------------------------------------------------------/ @version 2.3.6 - @build 1st March, 2017 + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage import.php diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php index e85521d23..eb578ed8b 100644 --- a/admin/models/joomla_component.php +++ b/admin/models/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 96 of this MVC - @build 17th February, 2017 + @version @update number 97 of this MVC + @build 3rd March, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php @@ -95,10 +95,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->metadata = $registry->toArray(); } - if (!empty($item->css)) + if (!empty($item->readme)) { - // base64 Decode css. - $item->css = base64_decode($item->css); + // base64 Decode readme. + $item->readme = base64_decode($item->readme); } if (!empty($item->php_postflight_update)) @@ -107,22 +107,22 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->php_postflight_update = base64_decode($item->php_postflight_update); } + if (!empty($item->buildcompsql)) + { + // base64 Decode buildcompsql. + $item->buildcompsql = base64_decode($item->buildcompsql); + } + if (!empty($item->php_preflight_update)) { // base64 Decode php_preflight_update. $item->php_preflight_update = base64_decode($item->php_preflight_update); } - if (!empty($item->readme)) + if (!empty($item->php_helper_both)) { - // base64 Decode readme. - $item->readme = base64_decode($item->readme); - } - - if (!empty($item->php_preflight_install)) - { - // base64 Decode php_preflight_install. - $item->php_preflight_install = base64_decode($item->php_preflight_install); + // base64 Decode php_helper_both. + $item->php_helper_both = base64_decode($item->php_helper_both); } if (!empty($item->php_postflight_install)) @@ -137,10 +137,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->php_method_uninstall = base64_decode($item->php_method_uninstall); } - if (!empty($item->php_helper_both)) + if (!empty($item->php_preflight_install)) { - // base64 Decode php_helper_both. - $item->php_helper_both = base64_decode($item->php_helper_both); + // base64 Decode php_preflight_install. + $item->php_preflight_install = base64_decode($item->php_preflight_install); + } + + if (!empty($item->sql)) + { + // base64 Decode sql. + $item->sql = base64_decode($item->sql); } if (!empty($item->php_helper_admin)) @@ -167,10 +173,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->php_site_event = base64_decode($item->php_site_event); } - if (!empty($item->sql)) + if (!empty($item->css)) { - // base64 Decode sql. - $item->sql = base64_decode($item->sql); + // base64 Decode css. + $item->css = base64_decode($item->css); } if (!empty($item->php_dashboard_methods)) @@ -179,12 +185,6 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $item->php_dashboard_methods = base64_decode($item->php_dashboard_methods); } - if (!empty($item->buildcompsql)) - { - // base64 Decode buildcompsql. - $item->buildcompsql = base64_decode($item->buildcompsql); - } - // Get the basic encription. $basickey = ComponentbuilderHelper::getCryptKey('basic'); // Get the encription object. @@ -1252,10 +1252,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['metadata'] = (string) $metadata; } - // Set the css string to base64 string. - if (isset($data['css'])) + // Set the readme string to base64 string. + if (isset($data['readme'])) { - $data['css'] = base64_encode($data['css']); + $data['readme'] = base64_encode($data['readme']); } // Set the php_postflight_update string to base64 string. @@ -1264,22 +1264,22 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['php_postflight_update'] = base64_encode($data['php_postflight_update']); } + // Set the buildcompsql string to base64 string. + if (isset($data['buildcompsql'])) + { + $data['buildcompsql'] = base64_encode($data['buildcompsql']); + } + // Set the php_preflight_update string to base64 string. if (isset($data['php_preflight_update'])) { $data['php_preflight_update'] = base64_encode($data['php_preflight_update']); } - // Set the readme string to base64 string. - if (isset($data['readme'])) + // Set the php_helper_both string to base64 string. + if (isset($data['php_helper_both'])) { - $data['readme'] = base64_encode($data['readme']); - } - - // Set the php_preflight_install string to base64 string. - if (isset($data['php_preflight_install'])) - { - $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); + $data['php_helper_both'] = base64_encode($data['php_helper_both']); } // Set the php_postflight_install string to base64 string. @@ -1294,10 +1294,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']); } - // Set the php_helper_both string to base64 string. - if (isset($data['php_helper_both'])) + // Set the php_preflight_install string to base64 string. + if (isset($data['php_preflight_install'])) { - $data['php_helper_both'] = base64_encode($data['php_helper_both']); + $data['php_preflight_install'] = base64_encode($data['php_preflight_install']); + } + + // Set the sql string to base64 string. + if (isset($data['sql'])) + { + $data['sql'] = base64_encode($data['sql']); } // Set the php_helper_admin string to base64 string. @@ -1324,10 +1330,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['php_site_event'] = base64_encode($data['php_site_event']); } - // Set the sql string to base64 string. - if (isset($data['sql'])) + // Set the css string to base64 string. + if (isset($data['css'])) { - $data['sql'] = base64_encode($data['sql']); + $data['css'] = base64_encode($data['css']); } // Set the php_dashboard_methods string to base64 string. @@ -1336,12 +1342,6 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin $data['php_dashboard_methods'] = base64_encode($data['php_dashboard_methods']); } - // Set the buildcompsql string to base64 string. - if (isset($data['buildcompsql'])) - { - $data['buildcompsql'] = base64_encode($data['buildcompsql']); - } - // Get the basic encription key. $basickey = ComponentbuilderHelper::getCryptKey('basic'); // Get the encription object diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php index 8726efe17..f006b3264 100644 --- a/admin/models/joomla_components.php +++ b/admin/models/joomla_components.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 96 of this MVC - @build 17th February, 2017 + @version @update number 97 of this MVC + @build 3rd March, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_components.php @@ -259,51 +259,51 @@ class ComponentbuilderModelJoomla_components extends JModelList { foreach ($items as $nr => &$item) { - // decode css - $item->css = base64_decode($item->css); - // decode php_postflight_update - $item->php_postflight_update = base64_decode($item->php_postflight_update); if ($basickey && !is_numeric($item->update_server_ftp) && $item->update_server_ftp === base64_encode(base64_decode($item->update_server_ftp, true))) { // decrypt update_server_ftp $item->update_server_ftp = $basic->decryptString($item->update_server_ftp); } - // decode php_preflight_update - $item->php_preflight_update = base64_decode($item->php_preflight_update); - // decode readme - $item->readme = base64_decode($item->readme); if ($basickey && !is_numeric($item->sales_server_ftp) && $item->sales_server_ftp === base64_encode(base64_decode($item->sales_server_ftp, true))) { // decrypt sales_server_ftp $item->sales_server_ftp = $basic->decryptString($item->sales_server_ftp); } - // decode php_preflight_install - $item->php_preflight_install = base64_decode($item->php_preflight_install); + // decode readme + $item->readme = base64_decode($item->readme); + // decode php_postflight_update + $item->php_postflight_update = base64_decode($item->php_postflight_update); + // decode buildcompsql + $item->buildcompsql = base64_decode($item->buildcompsql); + // decode php_preflight_update + $item->php_preflight_update = base64_decode($item->php_preflight_update); + // decode php_helper_both + $item->php_helper_both = base64_decode($item->php_helper_both); // decode php_postflight_install $item->php_postflight_install = base64_decode($item->php_postflight_install); // decode php_method_uninstall $item->php_method_uninstall = base64_decode($item->php_method_uninstall); + // decode php_preflight_install + $item->php_preflight_install = base64_decode($item->php_preflight_install); + // decode sql + $item->sql = base64_decode($item->sql); + // decode php_helper_admin + $item->php_helper_admin = base64_decode($item->php_helper_admin); + // decode php_admin_event + $item->php_admin_event = base64_decode($item->php_admin_event); if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true))) { // decrypt whmcs_key $item->whmcs_key = $basic->decryptString($item->whmcs_key); } - // decode php_helper_both - $item->php_helper_both = base64_decode($item->php_helper_both); - // decode php_helper_admin - $item->php_helper_admin = base64_decode($item->php_helper_admin); - // decode php_admin_event - $item->php_admin_event = base64_decode($item->php_admin_event); // decode php_helper_site $item->php_helper_site = base64_decode($item->php_helper_site); // decode php_site_event $item->php_site_event = base64_decode($item->php_site_event); - // decode sql - $item->sql = base64_decode($item->sql); + // decode css + $item->css = base64_decode($item->css); // decode php_dashboard_methods $item->php_dashboard_methods = base64_decode($item->php_dashboard_methods); - // decode buildcompsql - $item->buildcompsql = base64_decode($item->buildcompsql); // unset the values we don't want exported. unset($item->asset_id); unset($item->checked_out); diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql index f07fdf788..eadaff1a0 100644 --- a/admin/sql/install.mysql.utf8.sql +++ b/admin/sql/install.mysql.utf8.sql @@ -95,34 +95,34 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` ( KEY `idx_modifiedby` (`modified_by`), KEY `idx_state` (`published`), KEY `idx_name_code` (`name_code`), - KEY `idx_add_php_helper_site` (`add_php_helper_site`), - KEY `idx_creatuserhelper` (`creatuserhelper`), - KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), - KEY `idx_debug_linenr` (`debug_linenr`), - KEY `idx_add_sql` (`add_sql`), - KEY `idx_add_placeholders` (`add_placeholders`), - KEY `idx_mvc_versiondate` (`mvc_versiondate`), - KEY `idx_update_server_target` (`update_server_target`), - KEY `idx_addfootable` (`addfootable`), - KEY `idx_add_php_helper_both` (`add_php_helper_both`), - KEY `idx_add_admin_event` (`add_admin_event`), - KEY `idx_add_update_server` (`add_update_server`), - KEY `idx_add_site_event` (`add_site_event`), KEY `idx_add_php_dashboard_methods` (`add_php_dashboard_methods`), + KEY `idx_add_sales_server` (`add_sales_server`), KEY `idx_name` (`name`), + KEY `idx_adduikit` (`adduikit`), + KEY `idx_add_php_helper_site` (`add_php_helper_site`), + KEY `idx_add_email_helper` (`add_email_helper`), + KEY `idx_debug_linenr` (`debug_linenr`), + KEY `idx_add_placeholders` (`add_placeholders`), + KEY `idx_add_admin_event` (`add_admin_event`), + KEY `idx_mvc_versiondate` (`mvc_versiondate`), + KEY `idx_add_site_event` (`add_site_event`), + KEY `idx_update_server_target` (`update_server_target`), + KEY `idx_add_update_server` (`add_update_server`), + KEY `idx_creatuserhelper` (`creatuserhelper`), + KEY `idx_emptycontributors` (`emptycontributors`), KEY `idx_add_license` (`add_license`), KEY `idx_license_type` (`license_type`), - KEY `idx_adduikit` (`adduikit`), KEY `idx_add_css` (`add_css`), - KEY `idx_add_email_helper` (`add_email_helper`), - KEY `idx_add_php_preflight_install` (`add_php_preflight_install`), - KEY `idx_add_php_preflight_update` (`add_php_preflight_update`), + KEY `idx_addfootable` (`addfootable`), + KEY `idx_add_php_helper_both` (`add_php_helper_both`), + KEY `idx_add_php_helper_admin` (`add_php_helper_admin`), KEY `idx_add_php_postflight_install` (`add_php_postflight_install`), KEY `idx_add_php_postflight_update` (`add_php_postflight_update`), KEY `idx_add_php_method_uninstall` (`add_php_method_uninstall`), - KEY `idx_addreadme` (`addreadme`), - KEY `idx_add_sales_server` (`add_sales_server`), - KEY `idx_emptycontributors` (`emptycontributors`) + KEY `idx_add_php_preflight_install` (`add_php_preflight_install`), + KEY `idx_add_php_preflight_update` (`add_php_preflight_update`), + KEY `idx_add_sql` (`add_sql`), + KEY `idx_addreadme` (`addreadme`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( @@ -223,33 +223,33 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` ( KEY `idx_state` (`published`), KEY `idx_name_single` (`name_single`), KEY `idx_name_list` (`name_list`), - KEY `idx_add_php_getitems` (`add_php_getitems`), - KEY `idx_type` (`type`), - KEY `idx_add_php_document` (`add_php_document`), + KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`), + KEY `idx_add_php_after_publish` (`add_php_after_publish`), + KEY `idx_add_fadein` (`add_fadein`), KEY `idx_add_php_allowedit` (`add_php_allowedit`), KEY `idx_add_sql` (`add_sql`), KEY `idx_add_php_save` (`add_php_save`), + KEY `idx_add_php_batchmove` (`add_php_batchmove`), + KEY `idx_add_php_after_delete` (`add_php_after_delete`), + KEY `idx_add_php_getitems` (`add_php_getitems`), + KEY `idx_add_php_getlistquery` (`add_php_getlistquery`), KEY `idx_add_php_postsavehook` (`add_php_postsavehook`), KEY `idx_add_php_batchcopy` (`add_php_batchcopy`), - KEY `idx_add_fadein` (`add_fadein`), + KEY `idx_add_php_before_publish` (`add_php_before_publish`), + KEY `idx_add_php_before_delete` (`add_php_before_delete`), + KEY `idx_add_php_document` (`add_php_document`), + KEY `idx_type` (`type`), KEY `idx_add_php_getitem` (`add_php_getitem`), - KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`), KEY `idx_add_custom_import` (`add_custom_import`), KEY `idx_add_css_view` (`add_css_view`), KEY `idx_add_css_views` (`add_css_views`), KEY `idx_add_javascript_view_file` (`add_javascript_view_file`), - KEY `idx_add_php_batchmove` (`add_php_batchmove`), KEY `idx_add_javascript_view_footer` (`add_javascript_view_footer`), - KEY `idx_add_php_before_publish` (`add_php_before_publish`), - KEY `idx_add_php_after_publish` (`add_php_after_publish`), KEY `idx_add_javascript_views_file` (`add_javascript_views_file`), - KEY `idx_add_php_before_delete` (`add_php_before_delete`), - KEY `idx_add_php_after_delete` (`add_php_after_delete`), KEY `idx_add_javascript_views_footer` (`add_javascript_views_footer`), KEY `idx_add_custom_button` (`add_custom_button`), KEY `idx_source` (`source`), - KEY `idx_add_php_ajax` (`add_php_ajax`), - KEY `idx_add_php_getlistquery` (`add_php_getlistquery`) + KEY `idx_add_php_ajax` (`add_php_ajax`) ) ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` ( @@ -918,6 +918,11 @@ INSERT INTO `#__componentbuilder_help_document` (`id`, `admin_view`, `alias`, `a (11, 'help_documents', 'welcome-to-the-list-view-of-help-documents', '', '', '\"\"', 1, '', '', 2, 'Welcome to the List view of Help Documents', 3, 'http://projects.vdm.io/projects/joomla-component-builder/wiki/Help_Documents_List_View', '', 1, 2, '', 11); -- --- Always insure this column is large enough for all the access control values. +-- Always insure this column rules is large enough for all the access control values. -- ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.'; + +-- +-- Always insure this column name is large enough for long component and view names. +-- +ALTER TABLE `#__assets` CHANGE `name` `name` VARCHAR(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'The unique name for the asset.'; diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php index 723c9267e..c84057e9f 100644 --- a/admin/tables/admin_view.php +++ b/admin/tables/admin_view.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage admin_view.php diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php index fd7ca6d4b..00f40e870 100644 --- a/admin/tables/joomla_component.php +++ b/admin/tables/joomla_component.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 96 of this MVC - @build 17th February, 2017 + @version @update number 97 of this MVC + @build 3rd March, 2017 @created 6th May, 2015 @package Component Builder @subpackage joomla_component.php diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js index 4098ab4cf..e7297a25e 100644 --- a/admin/views/admin_view/submitbutton.js +++ b/admin/views/admin_view/submitbutton.js @@ -9,8 +9,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 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 57aa1ee89..a8adad994 100644 --- a/admin/views/admin_view/tmpl/edit.php +++ b/admin/views/admin_view/tmpl/edit.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage edit.php diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php index 862204b3f..83a5d7f78 100644 --- a/admin/views/admin_view/view.html.php +++ b/admin/views/admin_view/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php index f44354a0a..9780983e3 100644 --- a/admin/views/admin_views/tmpl/default.php +++ b/admin/views/admin_views/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 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 bce71de6f..0f0b7f6ec 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 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 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 9e2503bf2..c9b25f6f8 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 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 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 d29d31759..702a8c408 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 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage default_body.php diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php index 7541f11d1..74f5779d6 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 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 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 08e53f43b..d37c1d740 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 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 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 fe414ac2c..61fc1230b 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 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 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 5a0983435..7b2141fb9 100644 --- a/admin/views/admin_views/view.html.php +++ b/admin/views/admin_views/view.html.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 99 of this MVC - @build 1st March, 2017 + @version @update number 103 of this MVC + @build 3rd March, 2017 @created 30th April, 2015 @package Component Builder @subpackage view.html.php diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php index 557787061..ade8227ec 100644 --- a/admin/views/compiler/tmpl/default.php +++ b/admin/views/compiler/tmpl/default.php @@ -10,8 +10,8 @@ |_| /-------------------------------------------------------------------------------------------------------------------------------/ - @version @update number 26 of this MVC - @build 28th February, 2017 + @version @update number 46 of this MVC + @build 3rd March, 2017 @created 1st February, 2017 @package Component Builder @subpackage default.php @@ -27,7 +27,8 @@ defined('_JEXEC') or die('Restricted access'); $this->app->input->set('hidemainmenu', false); -$selectNotice = '

' . JText::_('COM_COMPONENTBUILDER_HI') . ' ' . $this->user->name . '

' . JText::_('COM_COMPONENTBUILDER_PLEASE_SELECT_A_COMPONENT_THAT_YOU_WOULD_LIKE_TO_COMPILE') . '

'; +$selectNotice = '

' . JText::_('COM_COMPONENTBUILDER_HI') . ' ' . $this->user->name . '

'; +$selectNotice .= '

' . JText::_('COM_COMPONENTBUILDER_PLEASE_SELECT_A_COMPONENT_THAT_YOU_WOULD_LIKE_TO_COMPILE') . '

'; JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); JHtml::_('behavior.tooltip'); @@ -89,16 +90,16 @@ jQuery(document).ready(function($) { }); sidebar)): ?> -
- sidebar; ?> -
-
+
+ sidebar; ?> +
+
-
+
-
+
-

+


@@ -121,20 +122,26 @@ jQuery(document).ready(function($) {
-
- +
+
+
+

+
.
+ +
-
- - + -