addedd the xml update server url

Added Wiki to JCB. Resolved gh-125 to insure phone numbers are treated as strings. Resolved gh-128 by adding field to Joomla Component View that allows javascript to be added globaly. Converted a few more repeatable fields to subform fields, this is an ongoing project to remove repeatable fields from JCB.
Updated the readme to link to the new Quick Build of a [Hello World component in JCB video on Youtube](https://youtu.be/1KBBtQUxMTc )
2017-10-06 20:29:35 +02:00 · 2017-10-06 20:28:28 +02:00 · 2017-09-20 16:49:38 +02:00 · 2017-09-18 04:20:50 +02:00 · 2017-09-18 02:18:23 +02:00
437 changed files with 7744 additions and 7120 deletions
--- a/README.md
+++ b/README.md
@ -1,15 +1,17 @@
 # Joomla Component Builder (JCB)
 [![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Component-Builder.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases) [![Total Downloads](https://img.shields.io/github/downloads/vdm-io/Joomla-Component-Builder/total.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases)

-This is a [Joomla 3.x](http://www.joomla.org/) component.
+This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://youtu.be/1KBBtQUxMTc)

 ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/vdm-component.jpg "The Component Builder")

-The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time.
+The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) that is highly advanced, truly able to build extremely complex components in a fraction of the time.

-Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
+Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.5.4) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.5.6) with **ALL** its features and **ALL** concepts totally open-source and free! 
+
+> Watch Quick Build of a Hello World component in [JCB on Youtube](https://youtu.be/1KBBtQUxMTc)

 Once installed upgrades are quick and easy via the default Joomla upgrade area.

@ -108,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 13th September, 2017
-+ *Version*: 2.5.4
+ *Last Build*: 6th October, 2017
+ *Version*: 2.5.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*: **120240**
-+ *File count*: **696**
+ *Line count*: **120884**
+ *File count*: **702**
 + *Folder count*: **121**

 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
--- a/admin/README.txt
+++ b/admin/README.txt
@ -1,15 +1,17 @@
 # Joomla Component Builder (JCB)
 [![GitHub release](https://img.shields.io/github/release/vdm-io/Joomla-Component-Builder.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases) [![Total Downloads](https://img.shields.io/github/downloads/vdm-io/Joomla-Component-Builder/total.svg)](https://github.com/vdm-io/Joomla-Component-Builder/releases)

-This is a [Joomla 3.x](http://www.joomla.org/) component.
+This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder/) component. [__See In Action__](https://youtu.be/1KBBtQUxMTc)

 ![Component Builder image](https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/vdm-component.jpg "The Component Builder")

-The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time.
+The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) that is highly advanced, truly able to build extremely complex components in a fraction of the time.

-Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
+Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.5.4) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.5.6) with **ALL** its features and **ALL** concepts totally open-source and free! 
+
+> Watch Quick Build of a Hello World component in [JCB on Youtube](https://youtu.be/1KBBtQUxMTc)

 Once installed upgrades are quick and easy via the default Joomla upgrade area.

@ -108,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 13th September, 2017
-+ *Version*: 2.5.4
+ *Last Build*: 6th October, 2017
+ *Version*: 2.5.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*: **120240**
-+ *File count*: **696**
+ *Line count*: **120884**
+ *File count*: **702**
 + *Folder count*: **121**

 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
--- a/admin/access.xml
+++ b/admin/access.xml
@ -159,7 +159,11 @@
 		<action name="fieldtype.dashboard_list" title="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_FIELDTYPES_DASHBOARD_LIST_DESC" />
 		<action name="fieldtype.delete" title="COM_COMPONENTBUILDER_FIELDTYPES_DELETE" description="COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC" />
 		<action name="fieldtype.edit" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC" />
+		<action name="fieldtype.edit.description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC" />
+		<action name="fieldtype.edit.name" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC" />
 		<action name="fieldtype.edit.own" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC" />
+		<action name="fieldtype.edit.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC" />
+		<action name="fieldtype.edit.short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC" />
 		<action name="fieldtype.edit.state" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
 		<action name="fieldtype.export" title="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT" description="COM_COMPONENTBUILDER_FIELDTYPES_EXPORT_DESC" />
@ -204,6 +208,7 @@
 		<action name="joomla_component.edit.add_admin_event" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT_DESC" />
 		<action name="joomla_component.edit.add_css" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC" />
 		<action name="joomla_component.edit.add_email_helper" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC" />
+		<action name="joomla_component.edit.add_javascript" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT_DESC" />
 		<action name="joomla_component.edit.add_license" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC" />
 		<action name="joomla_component.edit.add_php_dashboard_methods" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS_DESC" />
 		<action name="joomla_component.edit.add_php_helper_admin" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN_DESC" />
@ -247,6 +252,7 @@
 		<action name="joomla_component.edit.export_key" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY_DESC" />
 		<action name="joomla_component.edit.export_package_link" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC" />
 		<action name="joomla_component.edit.image" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC" />
+		<action name="joomla_component.edit.javascript" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT_DESC" />
 		<action name="joomla_component.edit.license" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC" />
 		<action name="joomla_component.edit.license_type" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE_DESC" />
 		<action name="joomla_component.edit.mvc_versiondate" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE_DESC" />
@ -345,76 +351,78 @@
 		<action name="joomla_component.edit.short_description" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SHORT_DESCRIPTION_DESC" />
 		<action name="joomla_component.edit.companyname" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPANYNAME" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COMPANYNAME_DESC" />
 		<action name="joomla_component.edit.author" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_AUTHOR" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_AUTHOR_DESC" />
-		<action name="joomla_component.edit.readme" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README_DESC" />
-		<action name="joomla_component.edit.add_php_dashboard_methods" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS_DESC" />
+		<action name="joomla_component.edit.sql" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_DESC" />
+		<action name="joomla_component.edit.add_css" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC" />
 		<action name="joomla_component.edit.description" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESCRIPTION" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DESCRIPTION_DESC" />
-		<action name="joomla_component.edit.add_php_helper_admin" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN_DESC" />
+		<action name="joomla_component.edit.add_admin_event" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT_DESC" />
 		<action name="joomla_component.edit.copyright" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COPYRIGHT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_COPYRIGHT_DESC" />
-		<action name="joomla_component.edit.php_postflight_install" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL_DESC" />
+		<action name="joomla_component.edit.php_preflight_update" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE_DESC" />
 		<action name="joomla_component.edit.debug_linenr" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DEBUG_LINENR" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DEBUG_LINENR_DESC" />
 		<action name="joomla_component.edit.mvc_versiondate" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_MVC_VERSIONDATE_DESC" />
-		<action name="joomla_component.edit.update_server_ftp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP_DESC" />
-		<action name="joomla_component.edit.add_php_helper_site" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE_DESC" />
-		<action name="joomla_component.edit.php_preflight_install" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL_DESC" />
+		<action name="joomla_component.edit.add_site_event" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT_DESC" />
+		<action name="joomla_component.edit.name" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_DESC" />
+		<action name="joomla_component.edit.dashboard_tab" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB_DESC" />
 		<action name="joomla_component.edit.creatuserhelper" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATUSERHELPER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CREATUSERHELPER_DESC" />
-		<action name="joomla_component.edit.php_method_uninstall" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL_DESC" />
-		<action name="joomla_component.edit.css" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS_DESC" />
+		<action name="joomla_component.edit.php_postflight_update" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE_DESC" />
+		<action name="joomla_component.edit.add_php_helper_both" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH_DESC" />
 		<action name="joomla_component.edit.version_update" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_UPDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_UPDATE_DESC" />
 		<action name="joomla_component.edit.email" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMAIL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMAIL_DESC" />
-		<action name="joomla_component.edit.buildcomp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP_DESC" />
+		<action name="joomla_component.edit.sales_server_ftp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP_DESC" />
 		<action name="joomla_component.edit.website" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WEBSITE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WEBSITE_DESC" />
 		<action name="joomla_component.edit.export_package_link" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC" />
 		<action name="joomla_component.edit.add_license" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC" />
 		<action name="joomla_component.edit.addfootable" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOOTABLE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOOTABLE_DESC" />
 		<action name="joomla_component.edit.license_type" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE_DESC" />
-		<action name="joomla_component.edit.add_php_helper_both" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_BOTH_DESC" />
-		<action name="joomla_component.edit.add_admin_event" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_ADMIN_EVENT_DESC" />
+		<action name="joomla_component.edit.add_php_helper_admin" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_ADMIN_DESC" />
+		<action name="joomla_component.edit.add_php_helper_site" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_HELPER_SITE_DESC" />
 		<action name="joomla_component.edit.whmcs_key" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_KEY" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_KEY_DESC" />
-		<action name="joomla_component.edit.add_site_event" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SITE_EVENT_DESC" />
+		<action name="joomla_component.edit.add_javascript" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT_DESC" />
 		<action name="joomla_component.edit.whmcs_url" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_URL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_WHMCS_URL_DESC" />
-		<action name="joomla_component.edit.dashboard_tab" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_DASHBOARD_TAB_DESC" />
+		<action name="joomla_component.edit.add_php_dashboard_methods" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS_DESC" />
 		<action name="joomla_component.edit.license" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC" />
-		<action name="joomla_component.edit.php_preflight_update" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_UPDATE_DESC" />
+		<action name="joomla_component.edit.php_preflight_install" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_PREFLIGHT_INSTALL_DESC" />
 		<action name="joomla_component.edit.bom" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BOM" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BOM_DESC" />
-		<action name="joomla_component.edit.php_postflight_update" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_UPDATE_DESC" />
+		<action name="joomla_component.edit.php_postflight_install" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_POSTFLIGHT_INSTALL_DESC" />
 		<action name="joomla_component.edit.image" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC" />
-		<action name="joomla_component.edit.sql" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_DESC" />
-		<action name="joomla_component.edit.update_server_target" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET_DESC" />
+		<action name="joomla_component.edit.php_method_uninstall" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_METHOD_UNINSTALL_DESC" />
 		<action name="joomla_component.edit.add_update_server" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_UPDATE_SERVER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_UPDATE_SERVER_DESC" />
-		<action name="joomla_component.edit.sales_server_ftp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SALES_SERVER_FTP_DESC" />
+		<action name="joomla_component.edit.readme" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_README_DESC" />
+		<action name="joomla_component.edit.update_server_target" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_TARGET_DESC" />
+		<action name="joomla_component.edit.update_server_ftp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_FTP_DESC" />
 		<action name="joomla_component.edit.addadmin_views" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDADMIN_VIEWS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDADMIN_VIEWS_DESC" />
-		<action name="joomla_component.edit.name" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NAME_DESC" />
+		<action name="joomla_component.edit.buildcomp" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMP_DESC" />
 		<action name="joomla_component.edit.addcustom_admin_views" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOM_ADMIN_VIEWS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOM_ADMIN_VIEWS_DESC" />
 		<action name="joomla_component.edit.export_key" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_KEY_DESC" />
 		<action name="joomla_component.edit.addsite_views" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDSITE_VIEWS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDSITE_VIEWS_DESC" />
 		<action name="joomla_component.edit.export_buy_link" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_BUY_LINK" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_BUY_LINK_DESC" />
 		<action name="joomla_component.edit.adduikit" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDUIKIT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDUIKIT_DESC" />
-		<action name="joomla_component.edit.add_css" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC" />
-		<action name="joomla_component.edit.sql_tweak" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK_DESC" />
 		<action name="joomla_component.edit.add_email_helper" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC" />
+		<action name="joomla_component.edit.sql_tweak" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_SQL_TWEAK_DESC" />
 		<action name="joomla_component.edit.php_helper_both" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_BOTH" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_BOTH_DESC" />
 		<action name="joomla_component.edit.php_helper_admin" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_ADMIN" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_ADMIN_DESC" />
-		<action name="joomla_component.edit.addcustommenus" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS_DESC" />
 		<action name="joomla_component.edit.php_admin_event" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_ADMIN_EVENT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_ADMIN_EVENT_DESC" />
+		<action name="joomla_component.edit.addcustommenus" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCUSTOMMENUS_DESC" />
 		<action name="joomla_component.edit.php_helper_site" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_SITE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_HELPER_SITE_DESC" />
 		<action name="joomla_component.edit.php_site_event" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_SITE_EVENT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_SITE_EVENT_DESC" />
+		<action name="joomla_component.edit.javascript" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT_DESC" />
 		<action name="joomla_component.edit.addconfig" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONFIG" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONFIG_DESC" />
+		<action name="joomla_component.edit.css" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_CSS_DESC" />
 		<action name="joomla_component.edit.php_dashboard_methods" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_DASHBOARD_METHODS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_PHP_DASHBOARD_METHODS_DESC" />
-		<action name="joomla_component.edit.add_php_preflight_install" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL_DESC" />
 		<action name="joomla_component.edit.addcontributors" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONTRIBUTORS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDCONTRIBUTORS_DESC" />
-		<action name="joomla_component.edit.add_php_preflight_update" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE_DESC" />
+		<action name="joomla_component.edit.add_php_preflight_install" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_INSTALL_DESC" />
 		<action name="joomla_component.edit.emptycontributors" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMPTYCONTRIBUTORS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EMPTYCONTRIBUTORS_DESC" />
-		<action name="joomla_component.edit.add_php_postflight_install" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL_DESC" />
+		<action name="joomla_component.edit.add_php_preflight_update" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_PREFLIGHT_UPDATE_DESC" />
 		<action name="joomla_component.edit.number" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NUMBER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_NUMBER_DESC" />
+		<action name="joomla_component.edit.add_php_postflight_install" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_INSTALL_DESC" />
 		<action name="joomla_component.edit.add_php_postflight_update" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_UPDATE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_POSTFLIGHT_UPDATE_DESC" />
 		<action name="joomla_component.edit.add_php_method_uninstall" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_METHOD_UNINSTALL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_METHOD_UNINSTALL_DESC" />
-		<action name="joomla_component.edit.add_sql" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL_DESC" />
 		<action name="joomla_component.edit.addfiles" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFILES" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFILES_DESC" />
+		<action name="joomla_component.edit.add_sql" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SQL_DESC" />
 		<action name="joomla_component.edit.addreadme" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDREADME" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDREADME_DESC" />
-		<action name="joomla_component.edit.update_server" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_DESC" />
 		<action name="joomla_component.edit.addfolders" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOLDERS" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADDFOLDERS_DESC" />
-		<action name="joomla_component.edit.add_sales_server" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER_DESC" />
+		<action name="joomla_component.edit.update_server" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_UPDATE_SERVER_DESC" />
 		<action name="joomla_component.edit.toignore" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_TOIGNORE" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_TOIGNORE_DESC" />
+		<action name="joomla_component.edit.add_sales_server" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_SALES_SERVER_DESC" />
 		<action name="joomla_component.edit.buildcompsql" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMPSQL" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_BUILDCOMPSQL_DESC" />
 		<action name="joomla_component.version" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC" />
 	</section>
@ -585,6 +593,10 @@
 		<action name="fieldtype.create" title="COM_COMPONENTBUILDER_FIELDTYPES_CREATE" description="COM_COMPONENTBUILDER_FIELDTYPES_CREATE_DESC" />
 		<action name="fieldtype.delete" title="COM_COMPONENTBUILDER_FIELDTYPES_DELETE" description="COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC" />
 		<action name="fieldtype.access" title="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS" description="COM_COMPONENTBUILDER_FIELDTYPES_ACCESS_DESC" />
+		<action name="fieldtype.edit.name" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC" />
+		<action name="fieldtype.edit.description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC" />
+		<action name="fieldtype.edit.short_description" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC" />
+		<action name="fieldtype.edit.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC" />
 		<action name="fieldtype.version" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION_DESC" />
 	</section>
 	<section name="language_translation">
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css
--- a/admin/assets/css/compiler.css
+++ b/admin/assets/css/compiler.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 53 of this MVC
-	@build			5th August, 2017
+	@version		@update number 55 of this MVC
+	@build			13th September, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.css
--- a/admin/assets/css/custom_admin_view.css
+++ b/admin/assets/css/custom_admin_view.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 22 of this MVC
-	@build			17th July, 2017
+	@version		@update number 27 of this MVC
+	@build			27th September, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css
--- a/admin/assets/css/custom_admin_views.css
+++ b/admin/assets/css/custom_admin_views.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 22 of this MVC
-	@build			17th July, 2017
+	@version		@update number 27 of this MVC
+	@build			27th September, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css
--- a/admin/assets/css/custom_code.css
+++ b/admin/assets/css/custom_code.css
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 82 of this MVC
-	@build			26th April, 2017
+	@build			4th October, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.css
--- a/admin/assets/css/custom_codes.css
+++ b/admin/assets/css/custom_codes.css
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 82 of this MVC
-	@build			26th April, 2017
+	@build			4th October, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.css
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css
--- a/admin/assets/css/dynamic_get.css
+++ b/admin/assets/css/dynamic_get.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 84 of this MVC
-	@build			4th May, 2017
+	@version		@update number 94 of this MVC
+	@build			27th September, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css
@ -24,4 +24,6 @@

 /* CSS Document */

-
+.fieldMedium {
+	width: 80px !important;
+}
--- a/admin/assets/css/dynamic_gets.css
+++ b/admin/assets/css/dynamic_gets.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 84 of this MVC
-	@build			4th May, 2017
+	@version		@update number 94 of this MVC
+	@build			27th September, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css
--- a/admin/assets/css/fieldtype.css
+++ b/admin/assets/css/fieldtype.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 13 of this MVC
-	@build			13th June, 2017
+	@version		@update number 15 of this MVC
+	@build			17th September, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css
--- a/admin/assets/css/fieldtypes.css
+++ b/admin/assets/css/fieldtypes.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 13 of this MVC
-	@build			13th June, 2017
+	@version		@update number 15 of this MVC
+	@build			17th September, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css
--- a/admin/assets/css/joomla_component.css
+++ b/admin/assets/css/joomla_component.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 366 of this MVC
-	@build			7th September, 2017
+	@version		@update number 385 of this MVC
+	@build			6th October, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.css
--- a/admin/assets/css/joomla_components.css
+++ b/admin/assets/css/joomla_components.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 366 of this MVC
-	@build			7th September, 2017
+	@version		@update number 385 of this MVC
+	@build			6th October, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.css
--- a/admin/assets/css/language_translation.css
+++ b/admin/assets/css/language_translation.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 39 of this MVC
-	@build			7th April, 2017
+	@version		@update number 43 of this MVC
+	@build			16th September, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translation.css
@ -25,3 +25,6 @@
 /* CSS Document */


+.translation_text_area {
+width: 100%;
+}
--- a/admin/assets/css/language_translations.css
+++ b/admin/assets/css/language_translations.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 39 of this MVC
-	@build			7th April, 2017
+	@version		@update number 43 of this MVC
+	@build			16th September, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translations.css
--- a/admin/assets/css/layout.css
+++ b/admin/assets/css/layout.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 77 of this MVC
-	@build			30th May, 2017
+	@version		@update number 81 of this MVC
+	@build			27th September, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.css
--- a/admin/assets/css/layouts.css
+++ b/admin/assets/css/layouts.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 77 of this MVC
-	@build			30th May, 2017
+	@version		@update number 81 of this MVC
+	@build			27th September, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.css
--- a/admin/assets/css/site_view.css
+++ b/admin/assets/css/site_view.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 51 of this MVC
-	@build			17th July, 2017
+	@version		@update number 54 of this MVC
+	@build			27th September, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_view.css
--- a/admin/assets/css/site_views.css
+++ b/admin/assets/css/site_views.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 51 of this MVC
-	@build			17th July, 2017
+	@version		@update number 54 of this MVC
+	@build			27th September, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_views.css
--- a/admin/assets/css/snippet.css
+++ b/admin/assets/css/snippet.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 16 of this MVC
-	@build			20th October, 2016
+	@version		@update number 17 of this MVC
+	@build			27th September, 2017
 	@created		19th May, 2015
 	@package		Component Builder
 	@subpackage		snippet.css
--- a/admin/assets/css/snippets.css
+++ b/admin/assets/css/snippets.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 16 of this MVC
-	@build			20th October, 2016
+	@version		@update number 17 of this MVC
+	@build			27th September, 2017
 	@created		19th May, 2015
 	@package		Component Builder
 	@subpackage		snippets.css
--- a/admin/assets/css/template.css
+++ b/admin/assets/css/template.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 40 of this MVC
-	@build			1st April, 2017
+	@version		@update number 45 of this MVC
+	@build			27th September, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		template.css
--- a/admin/assets/css/templates.css
+++ b/admin/assets/css/templates.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 40 of this MVC
-	@build			1st April, 2017
+	@version		@update number 45 of this MVC
+	@build			27th September, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		templates.css
--- a/admin/assets/js/admin.js
+++ b/admin/assets/js/admin.js
@ -0,0 +1,25 @@
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.5.6
+	@build			6th October, 2017
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		admin.js
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/* JS Document */
--- a/admin/compiler/joomla_3/admin.js
+++ b/admin/compiler/joomla_3/admin.js
@ -0,0 +1,4 @@
+###BOM###
+
+/* JS Document */
+###ADMINJS###
--- a/admin/compiler/joomla_3/site.js
+++ b/admin/compiler/joomla_3/site.js
@ -0,0 +1,4 @@
+###BOM###
+
+/* JS Document */
+###SITEJS###
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
--- a/admin/controller.php
+++ b/admin/controller.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
@ -49,17 +49,15 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('tableColumns', 'ajax');
 		$this->registerTask('fieldSelectOptions', 'ajax');
 		$this->registerTask('getImportScripts', 'ajax');
-		$this->registerTask('layoutDetails', 'ajax');
 		$this->registerTask('templateDetails', 'ajax');
-		$this->registerTask('snippetDetails', 'ajax');
-		$this->registerTask('dynamicValues', 'ajax');
-		$this->registerTask('dynamicFormDetails', 'ajax');
+		$this->registerTask('getLayoutDetails', 'ajax');
 		$this->registerTask('dbTableColumns', 'ajax');
 		$this->registerTask('viewTableColumns', 'ajax');
+		$this->registerTask('getDynamicValues', 'ajax');
 		$this->registerTask('checkFunctionName', 'ajax');
 		$this->registerTask('usedin', 'ajax');
+		$this->registerTask('snippetDetails', 'ajax');
 		$this->registerTask('fieldOptions', 'ajax');
-		$this->registerTask('getBuildTable', 'ajax');
 		$this->registerTask('getButton', 'ajax');
 	}

@ -341,44 +339,6 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
-				case 'layoutDetails':
-					try
-					{
-						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
-						$idValue = $jinput->get('id', null, 'INT');
-						if($idValue && $user->id != 0)
-						{
-							$result = $this->getModel('ajax')->getLayoutDetails($idValue);
-						}
-						else
-						{
-							$result = false;
-						}
-						if($callback = $jinput->get('callback', null, 'CMD'))
-						{
-							echo $callback . "(".json_encode($result).");";
-						}
-						elseif($returnRaw)
-						{
-							echo json_encode($result);
-						}
-						else
-						{
-							echo "(".json_encode($result).");";
-						}
-					}
-					catch(Exception $e)
-					{
-						if($callback = $jinput->get('callback', null, 'CMD'))
-						{
-							echo $callback."(".json_encode($e).");";
-						}
-						else
-						{
-							echo "(".json_encode($e).");";
-						}
-					}
-				break;
 				case 'templateDetails':
 					try
 					{
@ -417,91 +377,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
-				case 'snippetDetails':
+				case 'getLayoutDetails':
 					try
 					{
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						if($idValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getSnippetDetails($idValue);
-						}
-						else
-						{
-							$result = false;
-						}
-						if($callback = $jinput->get('callback', null, 'CMD'))
-						{
-							echo $callback . "(".json_encode($result).");";
-						}
-						elseif($returnRaw)
-						{
-							echo json_encode($result);
-						}
-						else
-						{
-							echo "(".json_encode($result).");";
-						}
-					}
-					catch(Exception $e)
-					{
-						if($callback = $jinput->get('callback', null, 'CMD'))
-						{
-							echo $callback."(".json_encode($e).");";
-						}
-						else
-						{
-							echo "(".json_encode($e).");";
-						}
-					}
-				break;
-				case 'dynamicValues':
-					try
-					{
-						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
-						$idValue = $jinput->get('id', NULL, 'INT');
-						$viewValue = $jinput->get('view', NULL, 'WORD');
-						if($idValue && $viewValue && $user->id != 0)
-						{
-							$result = $this->getModel('ajax')->getDynamicValues($idValue, $viewValue);
-						}
-						else
-						{
-							$result = false;
-						}
-						if($callback = $jinput->get('callback', null, 'CMD'))
-						{
-							echo $callback . "(".json_encode($result).");";
-						}
-						elseif($returnRaw)
-						{
-							echo json_encode($result);
-						}
-						else
-						{
-							echo "(".json_encode($result).");";
-						}
-					}
-					catch(Exception $e)
-					{
-						if($callback = $jinput->get('callback', null, 'CMD'))
-						{
-							echo $callback."(".json_encode($e).");";
-						}
-						else
-						{
-							echo "(".json_encode($e).");";
-						}
-					}
-				break;
-				case 'dynamicFormDetails':
-					try
-					{
-						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
-						$idValue = $jinput->get('id', NULL, 'INT');
-						if($idValue && $user->id != 0)
-						{
-							$result = $this->getModel('ajax')->getDynamicFormDetails($idValue);
+							$result = $this->getModel('ajax')->getLayoutDetails($idValue);
 						}
 						else
 						{
@ -612,6 +495,45 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
+				case 'getDynamicValues':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$idValue = $jinput->get('id', NULL, 'INT');
+						$viewValue = $jinput->get('view', NULL, 'WORD');
+						if($idValue && $viewValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->getDynamicValues($idValue, $viewValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
 				case 'checkFunctionName':
 					try
 					{
@ -691,14 +613,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
-				case 'fieldOptions':
+				case 'snippetDetails':
 					try
 					{
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
 						$idValue = $jinput->get('id', NULL, 'INT');
 						if($idValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getFieldOptions($idValue);
+							$result = $this->getModel('ajax')->getSnippetDetails($idValue);
 						}
 						else
 						{
@ -729,15 +651,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
-				case 'getBuildTable':
+				case 'fieldOptions':
 					try
 					{
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
-						$idNameValue = $jinput->get('idName', NULL, 'CMD');
-						$objectValue = $jinput->get('object', NULL, 'STRING');
-						if($idNameValue && $objectValue && $user->id != 0)
+						$idValue = $jinput->get('id', NULL, 'INT');
+						if($idValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getBuildTable($idNameValue, $objectValue);
+							$result = $this->getModel('ajax')->getFieldOptions($idValue);
 						}
 						else
 						{
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 53 of this MVC
-	@build			5th August, 2017
+	@version		@update number 55 of this MVC
+	@build			13th September, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.php
@ -70,13 +70,13 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 			$componentId 		= $jinput->post->get('component', 0, 'INT');
 			$version		= $jinput->post->get('version', 0, 'INT');
 			$addBackup		= $jinput->post->get('backup', 0, 'INT');
-			$addGit			= $jinput->post->get('git', 0, 'INT');
+			$addRepo			= $jinput->post->get('repository', 0, 'INT');
 			$addPlaceholders	= $jinput->post->get('placeholders', 2, 'INT');
 			$debugLinenr		= $jinput->post->get('debuglinenr', 2, 'INT');
 			// include component compiler
 			require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/compiler.php';
 			$model		= $this->getModel('compiler');
-			if ($model->builder($version,$componentId,$addBackup,$addGit,$addPlaceholders,$debugLinenr))
+			if ($model->builder($version,$componentId,$addBackup,$addRepo,$addPlaceholders,$debugLinenr))
 			{
 				$cache = JFactory::getCache('mod_menu');
 				$cache->clean();
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
--- a/admin/controllers/custom_admin_view.php
+++ b/admin/controllers/custom_admin_view.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 22 of this MVC
-	@build			17th July, 2017
+	@version		@update number 27 of this MVC
+	@build			27th September, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php
--- a/admin/controllers/custom_admin_views.php
+++ b/admin/controllers/custom_admin_views.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 22 of this MVC
-	@build			17th July, 2017
+	@version		@update number 27 of this MVC
+	@build			27th September, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php
--- a/admin/controllers/custom_code.php
+++ b/admin/controllers/custom_code.php
@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 82 of this MVC
-	@build			26th April, 2017
+	@build			4th October, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.php
--- a/admin/controllers/custom_codes.php
+++ b/admin/controllers/custom_codes.php
@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 82 of this MVC
-	@build			26th April, 2017
+	@build			4th October, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.php
--- a/admin/controllers/dynamic_get.php
+++ b/admin/controllers/dynamic_get.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 84 of this MVC
-	@build			4th May, 2017
+	@version		@update number 94 of this MVC
+	@build			27th September, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php
--- a/admin/controllers/dynamic_gets.php
+++ b/admin/controllers/dynamic_gets.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 84 of this MVC
-	@build			4th May, 2017
+	@version		@update number 94 of this MVC
+	@build			27th September, 2017
 	@created		21st May, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php
--- a/admin/controllers/fieldtype.php
+++ b/admin/controllers/fieldtype.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 13 of this MVC
-	@build			13th June, 2017
+	@version		@update number 15 of this MVC
+	@build			17th September, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php
--- a/admin/controllers/fieldtypes.php
+++ b/admin/controllers/fieldtypes.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 13 of this MVC
-	@build			13th June, 2017
+	@version		@update number 15 of this MVC
+	@build			17th September, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
--- a/admin/controllers/import_joomla_components.php
+++ b/admin/controllers/import_joomla_components.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php
--- a/admin/controllers/joomla_component.php
+++ b/admin/controllers/joomla_component.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 366 of this MVC
-	@build			7th September, 2017
+	@version		@update number 385 of this MVC
+	@build			6th October, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.php
--- a/admin/controllers/joomla_components.php
+++ b/admin/controllers/joomla_components.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 366 of this MVC
-	@build			7th September, 2017
+	@version		@update number 385 of this MVC
+	@build			6th October, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.php
--- a/admin/controllers/language_translation.php
+++ b/admin/controllers/language_translation.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 39 of this MVC
-	@build			7th April, 2017
+	@version		@update number 43 of this MVC
+	@build			16th September, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translation.php
--- a/admin/controllers/language_translations.php
+++ b/admin/controllers/language_translations.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 39 of this MVC
-	@build			7th April, 2017
+	@version		@update number 43 of this MVC
+	@build			16th September, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translations.php
--- a/admin/controllers/layout.php
+++ b/admin/controllers/layout.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 77 of this MVC
-	@build			30th May, 2017
+	@version		@update number 81 of this MVC
+	@build			27th September, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.php
--- a/admin/controllers/layouts.php
+++ b/admin/controllers/layouts.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 77 of this MVC
-	@build			30th May, 2017
+	@version		@update number 81 of this MVC
+	@build			27th September, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.php
--- a/admin/controllers/site_view.php
+++ b/admin/controllers/site_view.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 51 of this MVC
-	@build			17th July, 2017
+	@version		@update number 54 of this MVC
+	@build			27th September, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_view.php
--- a/admin/controllers/site_views.php
+++ b/admin/controllers/site_views.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 51 of this MVC
-	@build			17th July, 2017
+	@version		@update number 54 of this MVC
+	@build			27th September, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_views.php
--- a/admin/controllers/snippet.php
+++ b/admin/controllers/snippet.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 16 of this MVC
-	@build			20th October, 2016
+	@version		@update number 17 of this MVC
+	@build			27th September, 2017
 	@created		19th May, 2015
 	@package		Component Builder
 	@subpackage		snippet.php
--- a/admin/controllers/snippets.php
+++ b/admin/controllers/snippets.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 16 of this MVC
-	@build			20th October, 2016
+	@version		@update number 17 of this MVC
+	@build			27th September, 2017
 	@created		19th May, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
--- a/admin/controllers/template.php
+++ b/admin/controllers/template.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 40 of this MVC
-	@build			1st April, 2017
+	@version		@update number 45 of this MVC
+	@build			27th September, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		template.php
--- a/admin/controllers/templates.php
+++ b/admin/controllers/templates.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 40 of this MVC
-	@build			1st April, 2017
+	@version		@update number 45 of this MVC
+	@build			27th September, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		templates.php
--- a/admin/helpers/compiler.php
+++ b/admin/helpers/compiler.php
@ -54,7 +54,7 @@ class Compiler extends Infusion
 	// fixed pathes
 	protected $dynamicIntegration	= false;
 	protected $backupPath		= false;
-	protected $gitPath		= false;
+	protected $repoPath		= false;
 	protected $addCustomCodeAt	= array();

 	/**
@ -76,9 +76,9 @@ class Compiler extends Infusion
 				$this->backupPath		= $this->params->get('backup_folder_path', $this->tempPath).'/'.$this->componentBackupName.'.zip';
 				$this->dynamicIntegration	= true;
 			}
-			if ($config['addGit'])
+			if ($config['addRepo'])
 			{
-				$this->gitPath		= $this->params->get('git_folder_path', null);
+				$this->repoPath		= $this->params->get('git_folder_path', null);
 			}
 			// remove site folder if not needed (TODO add check if custom script was moved to site folder then we must do a more complex cleanup here)
 			if ($this->removeSiteFolder)
@ -402,15 +402,15 @@ class Compiler extends Infusion

 	private function zipComponent()
 	{
-		// before we zip the component we first need to move it to the git folder if set
-		if (ComponentbuilderHelper::checkString($this->gitPath))
+		// before we zip the component we first need to move it to the repo folder if set
+		if (ComponentbuilderHelper::checkString($this->repoPath))
 		{
-			// set the git path
-			$this->gitPath = $this->gitPath.'/com_'.$this->componentData->sales_name.'__joomla_'.$this->joomlaVersion;
+			// set the repo path
+			$repoFullPath = $this->repoPath.'/com_'.$this->componentData->sales_name.'__joomla_'.$this->joomlaVersion;
 			// remove old data
-			$this->removeFolder($this->gitPath, $this->componentData->toignore);
+			$this->removeFolder($repoFullPath, $this->componentData->toignore);
 			// set the new data
-			JFolder::copy($this->componentPath, $this->gitPath, '', true);
+			JFolder::copy($this->componentPath, $repoFullPath, '', true);
 		}
 		// the name of the zip file to create
 		$this->filepath = $this->tempPath.'/'.$this->componentFolderName.'.zip';
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@ -887,6 +887,17 @@ class Get
 			unset($old_component);
 		}

+		// add_javascript
+		if ($component->add_javascript == 1)
+		{
+			$this->customScriptBuilder['component_js'] = base64_decode($component->javascript);
+		}
+		else
+		{
+			$this->customScriptBuilder['component_js'] = '';
+		}
+		unset($component->javascript);
+
 		// add_css
 		if ($component->add_css == 1)
 		{
@ -897,6 +908,7 @@ class Get
 			$this->customScriptBuilder['component_css'] = '';
 		}
 		unset($component->css);
+		
 		// set the lang target
 		$this->lang = 'admin';
 		// add PHP in ADMIN
@ -1051,7 +1063,7 @@ class Get
 			$component->sales_server_ftp = 0;
 			$component->add_sales_server = 0;
 		}
-		// set the ignore folders for git if found
+		// set the ignore folders for repo if found
 		if (isset($component->toignore) && ComponentbuilderHelper::checkString($component->toignore))
 		{
 			if (strpos($component->toignore, ',') !== false)
@ -1065,7 +1077,7 @@ class Get
 		}
 		else
 		{
-			// the default is to ignore the git folder
+			// the default is to ignore the repo folder
 			$component->toignore = array('.git');
 		}
 		
@ -1184,6 +1196,19 @@ class Get
 			}
 			$this->customScriptBuilder['token'][$name_single] = false;
 			$this->customScriptBuilder['token'][$name_list] = false;
+			// set some placeholders
+			$this->placeholders['###view###'] = ComponentbuilderHelper::safeString($name_single);
+			$this->placeholders['###views###'] = ComponentbuilderHelper::safeString($name_list);
+			$this->placeholders['###View###'] = ComponentbuilderHelper::safeString($name_single, 'F');
+			$this->placeholders['###Views###'] = ComponentbuilderHelper::safeString($name_list, 'F');
+			$this->placeholders['###VIEW###'] = ComponentbuilderHelper::safeString($name_single, 'U');
+			$this->placeholders['###VIEWS###'] = ComponentbuilderHelper::safeString($name_list, 'U');
+			$this->placeholders['[[[view]]]'] = $this->placeholders['###view###'];
+			$this->placeholders['[[[views]]]'] = $this->placeholders['###views###'];
+			$this->placeholders['[[[View]]]'] = $this->placeholders['###View###'];
+			$this->placeholders['[[[Views]]]'] = $this->placeholders['###Views###'];
+			$this->placeholders['[[[VIEW]]]'] = $this->placeholders['###VIEW###'];
+			$this->placeholders['[[[VIEWS]]]'] = $this->placeholders['###VIEWS###'];
 			// load the values form params
 			$permissions		= json_decode($view->addpermissions,true);
 			unset($view->addpermissions);
@ -1537,6 +1562,19 @@ class Get
 					unset($view->sql);
 				}
 			}
+			// clear placeholders
+			unset($this->placeholders['###view###']);
+			unset($this->placeholders['###views###']);
+			unset($this->placeholders['###View###']);
+			unset($this->placeholders['###Views###']);
+			unset($this->placeholders['###VIEW###']);
+			unset($this->placeholders['###VIEWS###']);
+			unset($this->placeholders['[[[view]]]']);
+			unset($this->placeholders['[[[views]]]']);
+			unset($this->placeholders['[[[View]]]']);
+			unset($this->placeholders['[[[Views]]]']);
+			unset($this->placeholders['[[[VIEW]]]']);
+			unset($this->placeholders['[[[VIEWS]]]']);
 			// store this view to class object
 			$this->_adminViewData[$id] = $view;
 		}
@ -1753,7 +1791,7 @@ class Get

 			// Order it by the ordering field.
 			$query->select('a.*');
-			$query->select($this->db->quoteName(array('c.name', 'c.properties'),array('type_name','type_properties')));
+			$query->select($this->db->quoteName(array('c.name', 'c.properties'),array('type_name','properties')));
 			$query->from('#__componentbuilder_field AS a');
 			$query->join('LEFT', $this->db->quoteName('#__componentbuilder_fieldtype', 'c') . ' ON (' . $this->db->quoteName('a.fieldtype') . ' = ' . $this->db->quoteName('c.id') . ')');
 			$query->where($this->db->quoteName('a.id') . ' = '. $this->db->quote($id));
@ -1773,19 +1811,8 @@ class Get
 				$field->xml = $this->setDynamicValues(json_decode($field->xml));

 				// load the type values form type params
-				$properties = json_decode($field->type_properties,true);
-				unset($field->type_properties);
+				$field->properties = json_decode($field->properties,true);

-				if (ComponentbuilderHelper::checkArray($properties))
-				{
-					foreach ($properties as $option => $values)
-					{
-						foreach ($values as $nr => $value)
-						{
-							$field->properties[$nr][$option] = $value;
-						}
-					}
-				}
 				// check if we have advanced encryption
 				if (4 == $field->store &&  (!isset($this->advancedEncryption) || !$this->advancedEncryption))
 				{
@ -2054,205 +2081,147 @@ class Get
 							break;
 						}
 						// set join_view_table details
-						$join_view_table = json_decode($result->join_view_table,true);
-						unset($result->join_view_table);
-						$result->join_view_table = array();
-						if (ComponentbuilderHelper::checkArray($join_view_table))
+						$result->join_view_table = json_decode($result->join_view_table, true);
+						if (ComponentbuilderHelper::checkArray($result->join_view_table))
 						{
-							foreach ($join_view_table as $option => $values)
+							foreach ($result->join_view_table as $nr => &$option)
 							{
-								foreach ($values as $nr => $value)
+								if (ComponentbuilderHelper::checkString($option['selection']))
 								{
-									if (ComponentbuilderHelper::checkString($value))
+									// convert the type
+									$option['type']		= $typeArray[$option['type']];
+									// convert the operator
+									$option['operator']	= $operatorArray[$option['operator']];
+									// get the on field values
+									$on_field	= array(); // array(on_field_as, on_field)
+									$on_field	= array_map('trim', explode('.',$option['on_field']));
+									// get the join field values
+									$join_field	= array(); // array(join_field_as, join_field) 
+									$join_field	= array_map('trim', explode('.',$option['join_field']));
+									$option['selection'] =
+									$this->setDataSelection($result->key, $view_code, $option['selection'], $option['view_table'], $option['as'], $option['row_type'], 'view');
+									$option['key'] = $result->key;
+									// load to the getters
+									if ($option['row_type'] == 1)
 									{
-										if ($option === 'selection')
+										$result->main_get[] = $option;
+										if ($on_field[0] === 'a')
 										{
-											$on_field_as = '';
-											$on_field = '';
-											list($on_field_as,$on_field) = array_map('trim', explode('.',$result->join_view_table[$nr]['on_field']));
-											$join_field_as = '';
-											$join_field = '';
-											list($join_field_as,$join_field) = array_map('trim', explode('.',$result->join_view_table[$nr]['join_field']));
-											$result->join_view_table[$nr][$option] =
-											$this->setDataSelection($result->key,$view_code,$value,$result->join_view_table[$nr]['view_table'],$result->join_view_table[$nr]['as'],$result->join_view_table[$nr]['row_type'],'view');
-											$result->join_view_table[$nr]['key'] = $result->key;
-											if ($result->join_view_table[$nr]['row_type'] == 1)
-											{
-												$result->main_get[] = $result->join_view_table[$nr];
-												if ($on_field_as === 'a')
-												{
-													$this->siteMainGet[$this->target][$view_code][$result->join_view_table[$nr]['as']] = $result->join_view_table[$nr]['as'];
+											$this->siteMainGet[$this->target][$view_code][$option['as']] = $option['as'];
 										}
 										else
 										{
-													$this->siteDynamicGet[$this->target][$view_code][$result->join_view_table[$nr]['as']][$join_field] = $on_field_as;
+											$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
 										}
 									}
-											elseif ($result->join_view_table[$nr]['row_type'] == 2)
+									elseif ($option['row_type'] == 2)
 									{
-												$result->custom_get[] = $result->join_view_table[$nr];
-												if ($on_field_as != 'a')
+										$result->custom_get[] = $option;
+										if ($on_field[0] != 'a')
 										{
-													$this->siteDynamicGet[$this->target][$view_code][$result->join_view_table[$nr]['as']][$join_field] = $on_field_as;
+											$this->siteDynamicGet[$this->target][$view_code][$option['as']][$join_field[1]] = $on_field[0];
+										}
 									}
 								}
 								unset($result->join_view_table[$nr]);
 							}
-										else
-										{
-											if ($option === 'type')
-											{
-												$value = $typeArray[$value];
-											}
-											if ($option === 'operator')
-											{
-												$value = $operatorArray[$value];
-											}
-											$result->join_view_table[$nr][$option] = $value;
-										}
-									}
-								}
-							}
 						}
 						unset($result->join_view_table);
 						// set join_db_table details
-						$join_db_table = json_decode($result->join_db_table,true);
-						unset($result->join_db_table);
-						$result->join_db_table = array();
-						if (ComponentbuilderHelper::checkArray($join_db_table))
+						$result->join_db_table = json_decode($result->join_db_table, true);
+						if (ComponentbuilderHelper::checkArray($result->join_db_table))
 						{
-							foreach ($join_db_table as $option => $values)
+							foreach ($result->join_db_table as $nr => &$option1)
 							{
-								foreach ($values as $nr => $value)
+								if (ComponentbuilderHelper::checkString($option1['selection']))
 								{
-									if (ComponentbuilderHelper::checkString($value))
+									// convert the type
+									$option1['type']	= $typeArray[$option1['type']];
+									// convert the operator
+									$option1['operator']	= $operatorArray[$option1['operator']];
+									// get the on field values
+									$on_field	= array(); // array(on_field_as, on_field)
+									$on_field	= array_map('trim', explode('.',$option1['on_field']));
+									// get the join field values
+									$join_field	= array(); // array(join_field_as, join_field) 
+									$join_field	= array_map('trim', explode('.',$option1['join_field']));
+									$option1['selection'] =
+									$this->setDataSelection($result->key, $view_code, $value, $option1['db_table'], $option1['as'], $option1['row_type'], 'db');
+									$option1['key'] = $result->key;
+									// load to the getters
+									if ($option1['row_type'] == 1)
 									{
-										if ($option === 'selection')
+										$result->main_get[] = $option1;
+										if ($on_field[0] === 'a')
 										{
-											$on_field_as = '';
-											$on_field = '';
-											list($on_field_as,$on_field) = array_map('trim', explode('.',$result->join_db_table[$nr]['on_field']));
-											$join_field_as = '';
-											$join_field = '';
-											list($join_field_as,$join_field) = array_map('trim', explode('.',$result->join_db_table[$nr]['join_field']));
-											$result->join_db_table[$nr][$option] =
-											$this->setDataSelection($result->key,$view_code,$value,$result->join_db_table[$nr]['db_table'],$result->join_db_table[$nr]['as'],$result->join_db_table[$nr]['row_type'],'db');
-											$result->join_db_table[$nr]['key'] = $result->key;
-											if ($result->join_db_table[$nr]['row_type'] == 1)
-											{
-												$result->main_get[] = $result->join_db_table[$nr];
-												if ($on_field_as === 'a')
-												{
-													$this->siteMainGet[$this->target][$view_code][$result->join_db_table[$nr]['as']] = $result->join_db_table[$nr]['as'];
+											$this->siteMainGet[$this->target][$view_code][$option1['as']] = $option1['as'];
 										}
 										else
 										{
-													$this->siteDynamicGet[$this->target][$view_code][$result->join_db_table[$nr]['as']][$join_field] = $on_field_as;
+											$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
 										}
 									}
-											elseif ($result->join_db_table[$nr]['row_type'] == 2)
+									elseif ($option1['row_type'] == 2)
 									{
-												$result->custom_get[] = $result->join_db_table[$nr];
-												if ($on_field_as != 'a')
+										$result->custom_get[] = $option1;
+										if ($on_field[0] != 'a')
 										{
-													$this->siteDynamicGet[$this->target][$view_code][$result->join_db_table[$nr]['as']][$join_field] = $on_field_as;
+											$this->siteDynamicGet[$this->target][$view_code][$option1['as']][$join_field[1]] = $on_field[0];
+										}
 									}
 								}
 								unset($result->join_db_table[$nr]);
 							}
-										else
-										{
-											if ($option === 'type')
-											{
-												$value = $typeArray[$value];
-											}
-											if ($option === 'operator')
-											{
-												$value = $operatorArray[$value];
-											}
-											$result->join_db_table[$nr][$option] = $value;
-										}
-									}
-								}
-							}
 						}
 						unset($result->join_db_table);
 						// set filter details
-						$filter = json_decode($result->filter,true);
-						unset($result->filter);
-						$result->filter = array();
-						if (ComponentbuilderHelper::checkArray($filter))
+						$result->filter = json_decode($result->filter, true);
+						if (ComponentbuilderHelper::checkArray($result->filter))
 						{
-							foreach ($filter as $option => $values)
+							foreach ($result->filter as $nr => &$option2)
 							{
-								foreach ($values as $nr => $value)
+								if (isset($option2['operator']))
 								{
-									if (ComponentbuilderHelper::checkString($value))
-									{
-										if ($option === 'operator')
-										{
-											$value = $operatorArray[$value];
-											$result->filter[$nr]['key'] = $result->key;
+									$option2['operator'] = $operatorArray[$option2['operator']];
+									$option2['key'] = $result->key;
 								}
-										$result->filter[$nr][$option] = $value;
-									}
-								}
-							}
-						}
-						// set global details
-						$global = json_decode($result->global,true);
-						unset($result->global);
-						$result->global = array();
-						if (ComponentbuilderHelper::checkArray($global))
+								else
 								{
-							foreach ($global as $option => $values)
-							{
-								foreach ($values as $nr => $value)
-								{
-									if (ComponentbuilderHelper::checkString($value))
-									{
-										$result->global[$nr][$option] = $value;
-									}
-								}
-							}
-						}
-						// set order details
-						$order = json_decode($result->order,true);
-						unset($result->order);
-						$result->order = array();
-						if (ComponentbuilderHelper::checkArray($order))
-						{
-							foreach ($order as $option => $values)
-							{
-								foreach ($values as $nr => $value)
-								{
-									if (ComponentbuilderHelper::checkString($value))
-									{
-										$result->order[$nr][$option] = $value;
-									}
+									unset($result->filter[$nr]);
 								}
 							}
 						}
 						// set where details
-						$where = json_decode($result->where,true);
+						$result->where = json_decode($result->where, true);
+						if (ComponentbuilderHelper::checkArray($result->where))
+						{
+							foreach ($result->where as $nr => &$option3)
+							{
+								if (isset($option3['operator']))
+								{
+									$option3['operator'] = $operatorArray[$option3['operator']];
+								}
+								else
+								{
+									unset($result->where[$nr]);
+								}
+							}
+						}
+						else
+						{
 							unset($result->where);
-						$result->where = array();
-						if (ComponentbuilderHelper::checkArray($where))
-						{
-							foreach ($where as $option => $values)
-							{
-								foreach ($values as $nr => $value)
-								{
-									if (ComponentbuilderHelper::checkString($value))
-									{
-										if ($option === 'operator')
-										{
-											$value = $operatorArray[$value];
-										}
-										$result->where[$nr][$option] = $value;
-									}
 						}
+						// set order details
+						$result->order = json_decode($result->order, true);
+						if (!ComponentbuilderHelper::checkArray($result->order))
+						{
+							unset($result->order);
 						}
+						// set global details
+						$result->global = json_decode($result->global, true);
+						if (!ComponentbuilderHelper::checkArray($result->global))
+						{
+							unset($result->global);
 						}
 					}
 					return $results;
@ -3268,7 +3237,7 @@ class Get
 			}
 			// check what type of place holders we should load here
 			$placeholderType = (int) $item['comment_type'].'2';
-			if (stripos($item['code'], '[[[view') !== false || stripos($item['code'], '[[[sview') !== false)
+			if (stripos($item['code'], '[[[view') !== false || stripos($item['code'], '[[[sview') !== false || stripos($item['code'], '[[[arg') !== false)
 			{
 				// if view is being set dynamicly then we can't update this code via IDE (TODO)
 				$placeholderType = 3;
@ -3387,26 +3356,24 @@ class Get
 					}
 					// if we have an array continue
 					if (isset($this->multiLangString[$string]['translation']) 
-						&& ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']) 
-						&& isset($this->multiLangString[$string]['translation']['translation'])
-						&& isset($this->multiLangString[$string]['translation']['language'])
-						&& ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']['language'])
-						&& ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']['translation']))
+						&& ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']))
 					{
 						// great lets build the multi languages strings
-						foreach ($this->multiLangString[$string]['translation']['translation'] as $at => $lang)
+						foreach ($this->multiLangString[$string]['translation'] as $translations)
+						{
+							if (isset($translations['language']) && isset($translations['translation']))
 							{
-							$_tag = $this->multiLangString[$string]['translation']['language'][$at];
 								// build arrays
-							if (!isset($this->languages[$_tag]))
+								if (!isset($this->languages[$translations['language']]))
 								{
-								$this->languages[$_tag] = array();
+									$this->languages[$translations['language']] = array();
 								}
-							if (!isset($this->languages[$_tag][$area]))
+								if (!isset($this->languages[$translations['language']][$area]))
 								{
-								$this->languages[$_tag][$area] = array();
+									$this->languages[$translations['language']][$area] = array();
+								}
+								$this->languages[$translations['language']][$area][$placeholder] = $translations['translation'];
 							}
-							$this->languages[$_tag][$area][$placeholder] = $lang;
 						}
 					}
 					else
@ -3628,7 +3595,7 @@ class Get
 						elseif (ComponentbuilderHelper::checkJson($item['translation']))
 						{
 							$translation = json_decode($item['translation'], true);
-							if (ComponentbuilderHelper::checkArray($translation) && ComponentbuilderHelper::checkArray($translation['translation']))
+							if (ComponentbuilderHelper::checkArray($translation))
 							{
 								// only archive the item and update the string to unlink the current component
 								$this->setUpdateExistingLangStrings($item['id'], $components, 2, $today, $counterUpdate);
--- a/admin/helpers/compiler/b_Structure.php
+++ b/admin/helpers/compiler/b_Structure.php
@ -1100,13 +1100,13 @@ class Structure extends Get
 	 * Remove folders with files
 	 * 
 	 * @param   string   $dir     The path to folder to remove
-	 * @param   boolean   $git  if there is a git folder in that must not be removed
+	 * @param   boolean  $ignore  The files and folders to ignore
 	 *
 	 * @return  boolean   True if all is removed
 	 * 
 	 */
-	protected function removeFolder($dir, $git = false)
+	protected function removeFolder($dir, $ignore = false)
 	{
-		return ComponentbuilderHelper::removeFolder($dir, $git);
+		return ComponentbuilderHelper::removeFolder($dir, $ignore);
 	}
 }
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -3760,7 +3760,7 @@ class Interpretation extends Fields
 				$script .= PHP_EOL."\t\t\t{";
 				$script .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." JSON Decode ".$jsonString.".";
 				if (isset($this->jsonItemBuilderArray[$view])
-					&& ComponentbuilderHelper::checkArray($this->jsonStringBuilderArray[$view])
+					&& ComponentbuilderHelper::checkArray($this->jsonItemBuilderArray[$view])
 					&& in_array($jsonString, $this->jsonItemBuilderArray[$view]))
 				{
 					$makeArray = ',true';
@ -11772,14 +11772,14 @@ class Interpretation extends Fields
 				$display[] = PHP_EOL."\t\t<?php echo JHtml::_('bootstrap.addTab', 'cpanel_tab', '".$alias."', JText::_('".$tabname."', true)); ?>";
 				$display[] = "\t\t".'<div class="row-fluid">';
 				$display[] = $tab.'<div class="span12">';
-				$display[] = $tab."\t<?php  echo JHtml::_('bootstrap.startAccordion', '".$alias."_accordian', array('active' => 'one')); ?>";
+				$display[] = $tab."\t<?php  echo JHtml::_('bootstrap.startAccordion', '".$alias."_accordian', array('active' => '".$alias."_one')); ?>";
 				$slidecounter = 1;
 				foreach($accordians as $accordianname => $html)
 				{
 					$ac_alias = ComponentbuilderHelper::safeString($accordianname);
 					$counterName = ComponentbuilderHelper::safeString($slidecounter);
 					$tempName = $alias.'_'.$ac_alias;
-					$display[] = $tab."\t\t<?php  echo JHtml::_('bootstrap.addSlide', '".$alias."_accordian', '".$accordianname."', '".$counterName."'); ?>";
+					$display[] = $tab."\t\t<?php  echo JHtml::_('bootstrap.addSlide', '".$alias."_accordian', '".$accordianname."', '".$alias."_".$counterName."'); ?>";
 					$display[] = $tab."\t\t\t<?php echo \$this->loadTemplate('".$tempName."');?>";
 					$display[] = $tab."\t\t<?php  echo JHtml::_('bootstrap.endSlide'); ?>";
 					$slidecounter++;
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@ -143,6 +143,11 @@ class Infusion extends Interpretation
 			$this->setConfigFieldsets(1);
 			$this->lang = $keepLang;
 			
+			// ###ADMINJS###
+			$this->fileContentStatic['###ADMINJS###'] = $this->setPlaceholders($this->customScriptBuilder['component_js'], $this->placeholders);
+			// ###SITEJS###
+			$this->fileContentStatic['###SITEJS###'] = $this->setPlaceholders($this->customScriptBuilder['component_js'], $this->placeholders);
+			
 			// ###ADMINCSS###
 			$this->fileContentStatic['###ADMINCSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
 			// ###SITECSS###
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@ -265,20 +265,18 @@ abstract class ComponentbuilderHelper
 		{
 			$result = $db->loadObject();
 			$properties = json_decode($result->properties,true);
-			$pointer = 0;
 			$field = array('values' => "<field ", 'values_description' => '<ul>', 'short_description' => $result->short_description, 'description' => $result->description);
-			foreach ($properties['name'] as $line)
+			foreach ($properties as $property)
 			{
-				$field['values_description'] .= '<li><b>'.$properties['name'][$pointer].'</b> '.$properties['description'][$pointer].'</li>';
-				if(isset($settings[$properties['name'][$pointer]]))
+				$field['values_description'] .= '<li><b>'.$property['name'].'</b> '.$property['description'].'</li>';
+				if(isset($settings[$property['name']]))
 				{
-					$field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$settings[$properties['name'][$pointer]].'" ';
+					$field['values'] .= "\n\t".$property['name'].'="'.$settings[$property['name']].'" ';
 				}
 				else
 				{
-					$field['values'] .= "\n\t".$properties['name'][$pointer].'="'.$properties['example'][$pointer].'" ';
+					$field['values'] .= "\n\t".$property['name'].'="'.$property['example'].'" ';
 				}
-				$pointer++;
 			}
 			$field['values'] .= "\n/>";
 			$field['values_description'] .= '</ul>';
--- a/admin/helpers/componentbuilderemail.php
+++ b/admin/helpers/componentbuilderemail.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilderemail.php
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php
--- a/admin/helpers/indenter.php
+++ b/admin/helpers/indenter.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php
--- a/admin/helpers/js.php
+++ b/admin/helpers/js.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php
--- a/admin/helpers/minify.php
+++ b/admin/helpers/minify.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -1,8 +1,8 @@
 COM_COMPONENTBUILDER="Component Builder"
-COM_COMPONENTBUILDER_ADD_CORRESPONDING_LINE_NUMBERS_TO_THE_DYNAMIC_COMMENTS_SO_TO_SEE_WHERE_IN_THE_COMPILER_THE_LINES_OF_CODE_WAS_BUILD_THIS_WILL_HELP_IF_YOU_NEED_TO_GET_MORE_TECHNICAL_WITH_AN_ISSUE_ON_GITHUB="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github."
+COM_COMPONENTBUILDER_ADD_CORRESPONDING_LINE_NUMBERS_TO_THE_DYNAMIC_COMMENTS_SO_TO_SEE_WHERE_IN_THE_COMPILER_THE_LINES_OF_CODE_WAS_BUILD_THIS_WILL_HELP_IF_YOU_NEED_TO_GET_MORE_TECHNICAL_WITH_AN_ISSUE_ON_GITHUB_OR_EVEN_FOR_YOUR_OWN_DEBUGGING="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github, or even for your own debugging."
 COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders"
 COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT="Add to Backup Folder &amp; Sales Server &lt;small&gt;(if set)&lt;/small&gt;"
-COM_COMPONENTBUILDER_ADD_TO_GIT_FOLDER="Add to Git Folder"
+COM_COMPONENTBUILDER_ADD_TO_REPOSITORY_FOLDER="Add to Repository Folder"
 COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access"
@ -885,7 +885,7 @@ COM_COMPONENTBUILDER_BFIELD_TYPEB_IDS_MISMATCH_IN_BSB="<b>Field type</b> id:%s m
 COM_COMPONENTBUILDER_BFIELD_TYPEB_NOT_SET_FOR_BSB="<b>Field type</b> not set for <b>%s</b>."
 COM_COMPONENTBUILDER_BGET_THE_KEY_FROMB_A_CLASSBTN_BTNPRIMARY_HREFS_TARGET_BLANK_TITLEGET_A_KEY_FROM_SSA="<b>Get the key from</b> <a class="btn btn-primary" href="%s" target="_blank" title="get a key from %s">%s</a>"
 COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVE_TO_CORRECT_LOCATION="<b>Images</b> not move to correct location!"
-COM_COMPONENTBUILDER_BJOIN_VIEW_TABLE_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BVIEW_TABLEB_SO_THE_IDS_WAS_REMOVED="<b>Join view table in %s</b> has id mismatch of selected <b>view table</b>. So the id:%s was removed!"
+COM_COMPONENTBUILDER_BJOIN_VIEW_TABLE_IN_SB_HAS_ID_MISMATCH_OF_SELECTED_BJOIN_VIEW_TABLEB_SO_THE_IDS_WAS_REMOVED="<b>Join view table in %s</b> has id mismatch of selected <b>join view table</b>. So the id:%s was removed!"
 COM_COMPONENTBUILDER_BLINKED_VIEWB_IDS_MISMATCH_IN_BADMIN_VIEWSB_AND_WAS_EMREMOVEDEM_FROM_THE_LINKED_VIEWS="<b>Linked view</b> id:%s mismatch in <b>admin view:%s</b>, and was <em>removed</em> from the linked views."
 COM_COMPONENTBUILDER_BMAIN_GETB_IDS_MISMATCH_IN_BSB="<b>Main get</b> id:%s mismatch in <b>%s</b>."
 COM_COMPONENTBUILDER_BMAIN_GETB_NOT_SET_FOR_BSB="<b>Main get</b> not set for <b>%s</b>."
@ -1667,7 +1667,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_DESC="The date this Custom Code was modified."
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_CUSTOM_CODE_NEW="A New Custom Code"
-COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="<span id='jcb-placeholder'><code>[save to see placeholder]</code></span><br />You can also pass values to this code like this: <span id='jcb-placeholder-arg'><code>[save to see placeholder trick]</code></span> <br />Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arge1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]<br />Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.<br />Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI. <br />This note will change once we have resolved these limitations."
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="<span id='jcb-placeholder'><code>[save to see placeholder]</code></span><br />You can also pass values to this code like this: <span id='jcb-placeholder-arg'><code>[save to see placeholder trick]</code></span> <br />Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arg1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]<br />Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.<br />Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI. <br />This note will change once we have resolved these limitations."
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL="You can use this code in any JCB code area, simply add this PlaceHolder."
 COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div class='form-horizontal'><div class='span6'>
 <h1>Understand how the placeholders work in (IDE)</h1>
@ -1940,7 +1940,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_FF="ff"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER="Filter"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_DESCRIPTION="Here you can add filters to the query."
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_LABEL="Filter"
-COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_DESCRIPTION="The type of filter you want to setup."
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_LABEL="Filter Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FUNCTIONVAR="FunctionVar"
@ -1952,7 +1951,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_HINT="getMethodName"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_LABEL="Custom Name"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETITEM="getItem"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETLISTQUERY="getListQuery"
-COM_COMPONENTBUILDER_DYNAMIC_GET_GETTABLE="getTable"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE="Gettype"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_DESCRIPTION="Set the type of get method."
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETTYPE_LABEL="getType"
@ -1960,7 +1958,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_GG="gg"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL="Global"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_DESCRIPTION="Here you can add global variables."
 COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_LABEL="Set Global"
-COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN="greater than"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GREATER_THAN_OR_EQUAL="greater than or equal"
 COM_COMPONENTBUILDER_DYNAMIC_GET_H="h"
@ -1971,10 +1968,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_II="ii"
 COM_COMPONENTBUILDER_DYNAMIC_GET_IN="IN"
 COM_COMPONENTBUILDER_DYNAMIC_GET_J="j"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JJ="jj"
+COM_COMPONENTBUILDER_DYNAMIC_GET_JOINT="Joint"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE="Join Db Table"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_DESCRIPTION="Here you can add more table data to the query from other databases."
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_LABEL="Join DB Tables"
-COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_DESCRIPTION="Name of the field"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_HINT="b.field"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_FIELD_LABEL="Join Field"
@ -1986,7 +1983,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_RIGHT_OUTER="Join RIGHT OUTER"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE="Join View Table"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION="Here you can add more tables to the query from the views of this component."
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_LABEL="Join View Tables"
-COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_JOOMLA_DATABASE="Joomla Database"
 COM_COMPONENTBUILDER_DYNAMIC_GET_K="k"
 COM_COMPONENTBUILDER_DYNAMIC_GET_KEY_DESCRIPTION="The table as name."
@ -1998,6 +1994,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN="less than"
 COM_COMPONENTBUILDER_DYNAMIC_GET_LESS_THAN_OR_EQUAL_TO="less than or equal to"
 COM_COMPONENTBUILDER_DYNAMIC_GET_LL="ll"
 COM_COMPONENTBUILDER_DYNAMIC_GET_M="m"
+COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN="Main"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE="Main Source"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_DESCRIPTION="Select the main source of this dynamic get method."
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL="Main Source"
@ -2033,7 +2030,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER="Order"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_DESCRIPTION="Here you can set the ordering per data set."
 COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_LABEL="Ordering"
-COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_OTHER="Other"
 COM_COMPONENTBUILDER_DYNAMIC_GET_P="p"
 COM_COMPONENTBUILDER_DYNAMIC_GET_PAGINATION="Pagination"
@ -2097,7 +2093,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_LABEL="Table Key"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS="Tags"
 COM_COMPONENTBUILDER_DYNAMIC_GET_THIS="This"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TT="tt"
-COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Set Type"
+COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_U="u"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER="User"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS="User Groups"
@ -2123,7 +2119,6 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_W="w"
 COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE="Where"
 COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_DESCRIPTION="Here you can add where to the query."
 COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_LABEL="Where"
-COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_SELECT="Add"
 COM_COMPONENTBUILDER_DYNAMIC_GET_WW="ww"
 COM_COMPONENTBUILDER_DYNAMIC_GET_X="x"
 COM_COMPONENTBUILDER_DYNAMIC_GET_XX="xx"
@ -2222,8 +2217,16 @@ COM_COMPONENTBUILDER_FIELDTYPES_DELETE="Fieldtypes Delete"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC="Allows the users in this group to delete delete fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT="Fieldtypes Edit"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC="Allows the users in this group to edit the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION="Fieldtypes Edit Description"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME="Fieldtypes Edit Name"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN="Fieldtypes Edit Own"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own fieldtypes created by them"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES="Fieldtypes Edit Properties"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC="Allows the users in this group to update the edit properties of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION="Fieldtypes Edit Short Description"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE="Fieldtypes Edit State"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC="Allows the users in this group to update the state of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION="Fieldtypes Edit Version"
@ -2251,7 +2254,7 @@ COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNPUBLISHED="%s Fieldtypes unpublished."
 COM_COMPONENTBUILDER_FIELDTYPES_N_ITEMS_UNPUBLISHED_1="%s Fieldtype unpublished."
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to update the submenu of the fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION="Select if the value is adjustable. If not the Value/Example will be enforced."
+COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION="Select if the value is adjustable.<br />If not the Value/Example will be enforced."
 COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL="Adjustable"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_LABEL="Category"
@ -2271,7 +2274,7 @@ COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_LABEL="Value/Example"
 COM_COMPONENTBUILDER_FIELDTYPE_FIELDS="Fields"
 COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY="Fieldtype Category"
 COM_COMPONENTBUILDER_FIELDTYPE_ID="Id"
-COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION="Select if the property is mandatory."
+COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION="Select if the property<br />is mandatory."
 COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_LABEL="Mandatory"
 COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_DESC="The last user that modified this Fieldtype."
 COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_LABEL="Modified By"
@ -2282,7 +2285,6 @@ COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT="Name Here"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL="Name"
 COM_COMPONENTBUILDER_FIELDTYPE_NEW="A New Fieldtype"
-COM_COMPONENTBUILDER_FIELDTYPE_NO="No"
 COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_DESCRIPTION="To get more form field settings go to https://docs.joomla.org/Form_field"
 COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_LABEL="More Standard form field types"
 COM_COMPONENTBUILDER_FIELDTYPE_ORDERING_LABEL="Ordering"
@ -2290,7 +2292,6 @@ COM_COMPONENTBUILDER_FIELDTYPE_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES="Properties"
 COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_DESCRIPTION="Options for this field"
 COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_LABEL="Properties"
-COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_SELECT="Add"
 COM_COMPONENTBUILDER_FIELDTYPE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_FIELDTYPE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Fieldtype to customise the alias."
 COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION="Short Description"
@ -2302,7 +2303,6 @@ COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_DESCRIPTION="Select if the property
 COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_LABEL="Translatable"
 COM_COMPONENTBUILDER_FIELDTYPE_VERSION_DESC="A count of the number of times this Fieldtype has been revised."
 COM_COMPONENTBUILDER_FIELDTYPE_VERSION_LABEL="Revision"
-COM_COMPONENTBUILDER_FIELDTYPE_YES="Yes"
 COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW="Add Css View"
 COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS="Add Css Views"
 COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL="Add CSS (views)"
@ -2743,6 +2743,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS="Joomla Components Edit Add
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC="Allows the users in this group to update the edit add css of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER="Joomla Components Edit Add Email Helper"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC="Allows the users in this group to update the edit add email helper of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT="Joomla Components Edit Add Javascript"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT_DESC="Allows the users in this group to update the edit add javascript of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE="Joomla Components Edit Add License"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC="Allows the users in this group to update the edit add license of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS="Joomla Components Edit Add Php Dashboard Methods"
@ -2807,6 +2809,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK="Joomla Componen
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC="Allows the users in this group to update the edit export package link of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE="Joomla Components Edit Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC="Allows the users in this group to update the edit image of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT="Joomla Components Edit Javascript"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT_DESC="Allows the users in this group to update the edit javascript of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE="Joomla Components Edit License"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC="Allows the users in this group to update the edit license of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE="Joomla Components Edit License Type"
@ -2940,6 +2944,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_LABEL="Add CSS"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER="Add Email Helper"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION="Adding the email helper class, that can be used to send emails."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL="Add Email Helper"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT="Add Javascript"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_JAVASCRIPT_LABEL="Add Javascript"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE="Add License"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use a license in the component."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_LABEL="Add License (whmcs)"
@ -3217,6 +3223,10 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS="Joomla Co
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_COMPONENTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import components button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INFO="Info"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_INFO_CIRCLE="Info Circle"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT="Javascript"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_HINT="// JavaScript for the entire back-end"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL="Javascript"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_DESCRIPTION="The settings below are used when you export this component as a JCB Package, for more info on how this works please review the following tutorial (<a href='https://youtu.be/lkE0ZiSWufg' target='_blank'>https://youtu.be/lkE0ZiSWufg</a>)."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_LABEL="JCB Package Export Settings"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JOOMLA="Joomla"
@ -3288,8 +3298,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_FILES_DESCRIPTION="You can add cu
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_FILES_LABEL="Adding Custom Files"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_FOLDERS_DESCRIPTION="You can add custom folders to the component, simply add the folders to the administrator/components/com_componentbuilder/custom folder and then select them here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_FOLDERS_LABEL="Adding Custom Folders"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_DESCRIPTION="You can dynamically build the components back-end views and fields by adding a mySQL table dump, that has all the tables, or some more tables with its columns and data types. A very basic and generic set of fields and tables will be created, and added to the existing fields and tables of this component. <b>This is in beta testing, so this feature is still under development and will only be fully functional around June 2017...</b>"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_LABEL="Dynamic Builder Option"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION="You can dynamically build the components back-end views and fields by adding a mySql table dump, that has all the tables, or some more tables with its columns and data types. A very basic and generic set of fields and tables will be created, and added to the existing fields and tables of this component."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL="Dynamic Builder (mySql) Option"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION="In each admin view you can add data from a MySQL Table (this is done in the admin view MySQL tab). Here you can limit that data in relation to this component. This feature is useful when an admin view with demo data is used in more then one component, and you would like to exclude some demo data without creating a new admin view."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL=" MySql Tweak Options"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION="Only add contributors if you would like them listed on the component dashboard."
@ -3526,11 +3536,11 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_DESCRIPTION="Enter contributor's tit
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_HINT="Contributor's Role"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TITLE_LABEL="Job Title"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE="Toignore"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_DESCRIPTION="Coma separated names of folders or files to ignore when updating the git files during compilations."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_DESCRIPTION="Coma separated names of folders or files to ignore when updating the repository files during compilations."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_HINT="Coma separated names of folders or files"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_LABEL="Folders or Files to Ignore"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION="During compilation JCB deletes all files and folders from the git folder, and then adds the newly created files and folders back into the git folder. Yet there may be files or folders you may not want deleted, like the <b>.git</b> folder, since JCB does not dynamically create that folder and so it will not be placed back, but simply delete it, unless you add it in this text field below, so that it will be ignored, and therefore not deleted in the first place. You can add multiple folders and files, separated by commas. Like: <code>.git, .hg</code>"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL="Folders or Files to Ignore"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_LABEL="Repository Folders or Files to Ignore"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION="During compilation JCB deletes all files and folders from the repository folder, and then adds the newly created files and folders back into the repository folder. Yet there may be files or folders you may not want deleted, like the <b>.git</b> folder, since JCB does not dynamically create that folder and so it will not be placed back, but simply delete it, unless you add it in this text field below, so that it will be ignored, and therefore not deleted in the first place. You can add multiple folders and files, separated by commas. Like: <code>.git, .hg</code>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_LABEL="Repository Folders or Files to Ignore"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TRANSLATION="Translation"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TREE="Tree"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TREE_TWO="Tree 2"
@ -3741,7 +3751,6 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION="Translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION="The translation strings."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT="Translated String Here"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL="Translated String"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_SELECT="add/edit"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC="A count of the number of times this Language Translation has been revised."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_LANGUAGE_VERSION_DESC="A count of the number of times this Language has been revised."
@ -3889,7 +3898,7 @@ COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
 COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another."
 COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to compile"
 COM_COMPONENTBUILDER_SHOULD_JCB_INSERT_THE_CUSTOM_CODE_PLACEHOLDERS_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_CUSTOM_CODE="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
-COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_GIT_FOLDER="Should the component be moved to your local git folder?"
+COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_REPOSITORY_FOLDER="Should the component be moved to your local repository folder?"
 COM_COMPONENTBUILDER_SHOULD_THE_ZIPPED_PACKAGE_OF_THE_COMPONENT_BE_MOVED_TO_THE_LOCAL_BACKUP_AND_REMOTE_SALES_SERVER_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_THOSE_VALUES_SET="Should the zipped package of the component be moved to the local backup and remote sales server? This is only applicable if this component has those values set."
 COM_COMPONENTBUILDER_SHOULD_WE_FORCE_THE_UPDATE_OF_ALL_LOCAL_DATA_EVEN_IF_IT_IS_NEWER_THEN_THE_DATA_BEING_IMPORTED="Should we force the update of all local data, even if it is newer then the data being imported."
 COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB="Since the owner details are displayed during <b>import process</b> before adding the key, this way if the user/dev <b>does not</b> have the key they can see <b>where to get it</b>."
@ -4567,7 +4576,6 @@ COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
 COM_COMPONENTBUILDER_TOTAL_DOWNLOADS="total downloads"
 COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the <b>JCB Global Options</b>, go to the <b>Company</b> tab and add the correct company details there."
 COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the JCB Global Options, go to the Company tab and add the correct company details there."
-COM_COMPONENTBUILDER_TRANSLATION="Translation"
 COM_COMPONENTBUILDER_UP_TO_DATE="Up to date"
 COM_COMPONENTBUILDER_USED_IN="used in"
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
--- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
@ -316,8 +316,16 @@ COM_COMPONENTBUILDER_FIELDTYPES_DELETE="Fieldtypes Delete"
 COM_COMPONENTBUILDER_FIELDTYPES_DELETE_DESC="Allows the users in this group to delete delete fieldtypes"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT="Fieldtypes Edit"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESC="Allows the users in this group to edit the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION="Fieldtypes Edit Description"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_DESCRIPTION_DESC="Allows the users in this group to update the edit description of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME="Fieldtypes Edit Name"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_NAME_DESC="Allows the users in this group to update the edit name of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN="Fieldtypes Edit Own"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_OWN_DESC="Allows the users in this group to edit edit own fieldtypes created by them"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES="Fieldtypes Edit Properties"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_DESC="Allows the users in this group to update the edit properties of the fieldtype"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION="Fieldtypes Edit Short Description"
+COM_COMPONENTBUILDER_FIELDTYPES_EDIT_SHORT_DESCRIPTION_DESC="Allows the users in this group to update the edit short description of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE="Fieldtypes Edit State"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_STATE_DESC="Allows the users in this group to update the state of the fieldtype"
 COM_COMPONENTBUILDER_FIELDTYPES_EDIT_VERSION="Fieldtypes Edit Version"
@ -424,6 +432,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS="Joomla Components Edit Add
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_CSS_DESC="Allows the users in this group to update the edit add css of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER="Joomla Components Edit Add Email Helper"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_EMAIL_HELPER_DESC="Allows the users in this group to update the edit add email helper of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT="Joomla Components Edit Add Javascript"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_JAVASCRIPT_DESC="Allows the users in this group to update the edit add javascript of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE="Joomla Components Edit Add License"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_LICENSE_DESC="Allows the users in this group to update the edit add license of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_ADD_PHP_DASHBOARD_METHODS="Joomla Components Edit Add Php Dashboard Methods"
@ -488,6 +498,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK="Joomla Componen
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_EXPORT_PACKAGE_LINK_DESC="Allows the users in this group to update the edit export package link of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE="Joomla Components Edit Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_IMAGE_DESC="Allows the users in this group to update the edit image of the joomla component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT="Joomla Components Edit Javascript"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_JAVASCRIPT_DESC="Allows the users in this group to update the edit javascript of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE="Joomla Components Edit License"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_DESC="Allows the users in this group to update the edit license of the joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_LICENSE_TYPE="Joomla Components Edit License Type"
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php
--- a/admin/layouts/admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
--- a/admin/layouts/admin_view/custom_buttons_left.php
+++ b/admin/layouts/admin_view/custom_buttons_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
--- a/admin/layouts/admin_view/custom_import_fullwidth.php
+++ b/admin/layouts/admin_view/custom_import_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vxyfields;
+$items	= $displayData->vxzfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=fields&task=field.edit";
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php
--- a/admin/layouts/admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/admin_view/linked_components_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vxzlinked_components;
+$items	= $displayData->vyalinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
--- a/admin/layouts/admin_view/settings_above.php
+++ b/admin/layouts/admin_view/settings_above.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php
--- a/admin/layouts/admin_view/settings_left.php
+++ b/admin/layouts/admin_view/settings_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
--- a/admin/layouts/admin_view/settings_right.php
+++ b/admin/layouts/admin_view/settings_right.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
--- a/admin/layouts/admin_view/settings_under.php
+++ b/admin/layouts/admin_view/settings_under.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php
--- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
--- a/admin/layouts/custom_admin_view/custom_buttons_left.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
--- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
--- a/admin/layouts/custom_admin_view/details_above.php
+++ b/admin/layouts/custom_admin_view/details_above.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
--- a/admin/layouts/custom_admin_view/details_fullwidth.php
+++ b/admin/layouts/custom_admin_view/details_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
--- a/admin/layouts/custom_admin_view/details_left.php
+++ b/admin/layouts/custom_admin_view/details_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
--- a/admin/layouts/custom_admin_view/details_right.php
+++ b/admin/layouts/custom_admin_view/details_right.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
--- a/admin/layouts/custom_admin_view/details_rightside.php
+++ b/admin/layouts/custom_admin_view/details_rightside.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
--- a/admin/layouts/custom_admin_view/details_under.php
+++ b/admin/layouts/custom_admin_view/details_under.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
--- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vyjlinked_components;
+$items	= $displayData->vyklinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
--- a/admin/layouts/custom_admin_view/publishing.php
+++ b/admin/layouts/custom_admin_view/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
--- a/admin/layouts/custom_admin_view/publlshing.php
+++ b/admin/layouts/custom_admin_view/publlshing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.5.4
-	@build			13th September, 2017
+	@version		2.5.6
+	@build			6th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Llewellyn van der Merwe	c484306d21	addedd the xml update server url	2017-10-06 20:29:35 +02:00
Llewellyn van der Merwe	3d1ba0321a	Added Wiki to JCB. Resolved gh-125 to insure phone numbers are treated as strings. Resolved gh-128 by adding field to Joomla Component View that allows javascript to be added globaly. Converted a few more repeatable fields to subform fields, this is an ongoing project to remove repeatable fields from JCB.	2017-10-06 20:28:28 +02:00
Llewellyn van der Merwe	5bb5e3e909	Updated the readme to link to the new Quick Build of a [Hello World component in JCB video on Youtube](https://youtu.be/1KBBtQUxMTc )	2017-09-20 16:49:38 +02:00
Llewellyn van der Merwe	9e140b40da	convert repeatable properties field in the field types view to subform field	2017-09-18 04:20:50 +02:00
Llewellyn van der Merwe	06416e665d	Fixed gh-120 that allows export of component with language translations	2017-09-18 02:18:23 +02:00