README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 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.6.17) 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.6.18) 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://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -126,14 +126,14 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 27th February, 2018
++ *Last Build*: 19th March, 2018
-+ *Version*: 2.6.17
++ *Version*: 2.6.18
 + *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*: **183098**
++ *Line count*: **186136**
-+ *Field count*: **1641**
++ *Field count*: **994**
-+ *File count*: **1169**
++ *File count*: **1171**
-+ *Folder count*: **188**
++ *Folder count*: **189**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 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.6.17) 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.6.18) 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://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -126,14 +126,14 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 27th February, 2018
++ *Last Build*: 19th March, 2018
-+ *Version*: 2.6.17
++ *Version*: 2.6.18
 + *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*: **183098**
++ *Line count*: **186136**
-+ *Field count*: **1641**
++ *Field count*: **994**
-+ *File count*: **1169**
++ *File count*: **1171**
-+ *Folder count*: **188**
++ *Folder count*: **189**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)

admin/access.xml

@@ -473,9 +473,9 @@
 		<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.properties" title="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES" description="COM_COMPONENTBUILDER_FIELDTYPES_EDIT_PROPERTIES_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">

admin/assets/css/dynamic_get.css

@@ -24,6 +24,7 @@
 
 /* CSS Document */
 
+
 .fieldMedium {
 	width: 80px !important;
 }

admin/assets/css/joomla_component.css

@@ -24,4 +24,7 @@
 
 /* CSS Document */
 
-
+
+#jform_dashboard_chzn {
+width: 100% !important;
+}

admin/compiler/joomla_3/DASHJModelList.php

@@ -48,6 +48,7 @@ class ###Component###Model###Component### extends JModelList
 		$viewGroups = array(
 			'main' => array(###DASHBOARDICONS###)
 		);###DASHBOARDICONACCESS###
+		// loop over the $views
 		foreach($viewGroups as $group => $views)
 		{
 			$i = 0;
@@ -56,47 +57,62 @@ class ###Component###Model###Component### extends JModelList
 				foreach($views as $view)
 				{
 					$add = false;
-					if (strpos($view,'.') !== false)
+					// external views (links)
+					if (strpos($view,'||') !== false)
 					{
-							$dwd = explode('.', $view);
+						$dwd = explode('||', $view);
-							if (count($dwd) == 3)
+						if (count($dwd) == 3)
+						{
+							list($type, $name, $url) = $dwd;
+							$viewName 	= $name;
+							$alt 		= $name;
+							$url 		= $url;
+							$image 		= $name.'.'.$type;
+							$name 		= 'COM_###COMPONENT###_DASHBOARD_'.###Component###Helper::safeString($name,'U');
+						}
+					}
+					// internal views
+					elseif (strpos($view,'.') !== false)
+					{
+						$dwd = explode('.', $view);
+						if (count($dwd) == 3)
+						{
+							list($type, $name, $action) = $dwd;
+						}
+						elseif (count($dwd) == 2)
+						{
+							list($type, $name) = $dwd;
+							$action = false;
+						}
+						if ($action)
+						{
+							$viewName = $name;
+							switch($action)
 							{
-								list($type, $name, $action) = $dwd;
+								case 'add':
-							}
+									$url 	= 'index.php?option=com_###component###&view='.$name.'&layout=edit';
-							elseif (count($dwd) == 2)
+									$image 	= $name.'_'.$action.'.'.$type;
-							{
+									$alt 	= $name.' '.$action;
-								list($type, $name) = $dwd;
+									$name	= 'COM_###COMPONENT###_DASHBOARD_'.###Component###Helper::safeString($name,'U').'_ADD';
-								$action = false;
+									$add	= true;
-							}
+								break;
-							if ($action)
+								default:
-							{
+									$url 	= 'index.php?option=com_categories&view=categories&extension=com_###component###.'.$name;
-								$viewName = $name;
+									$image 	= $name.'_'.$action.'.'.$type;
-								switch($action)
+									$alt 	= $name.' '.$action;
-								{
+									$name	= 'COM_###COMPONENT###_DASHBOARD_'.###Component###Helper::safeString($name,'U').'_'.###Component###Helper::safeString($action,'U');
-									case 'add':
+								break;
-										$url 	='index.php?option=com_###component###&view='.$name.'&layout=edit';
-										$image 	= $name.'_'.$action.'.'.$type;
-										$alt 	= $name.' '.$action;
-										$name	= 'COM_###COMPONENT###_DASHBOARD_'.###Component###Helper::safeString($name,'U').'_ADD';
-										$add	= true;
-									break;
-									default:
-										$url 	= 'index.php?option=com_categories&view=categories&extension=com_###component###.'.$name;
-										$image 	= $name.'_'.$action.'.'.$type;
-										$alt 	= $name.' '.$action;
-										$name	= 'COM_###COMPONENT###_DASHBOARD_'.###Component###Helper::safeString($name,'U').'_'.###Component###Helper::safeString($action,'U');
-									break;
-								}
-							}
-							else
-							{
-								$viewName 	= $name;
-								$alt 		= $name;
-								$url 		= 'index.php?option=com_###component###&view='.$name;
-								$image 		= $name.'.'.$type;
-								$name 		= 'COM_###COMPONENT###_DASHBOARD_'.###Component###Helper::safeString($name,'U');
-								$hover		= false;
 							}
+						}
+						else
+						{
+							$viewName 	= $name;
+							$alt 		= $name;
+							$url 		= 'index.php?option=com_###component###&view='.$name;
+							$image 		= $name.'.'.$type;
+							$name 		= 'COM_###COMPONENT###_DASHBOARD_'.###Component###Helper::safeString($name,'U');
+							$hover		= false;
+						}
 					}
 					else
 					{
@@ -149,7 +165,7 @@ class ###Component###Model###Component### extends JModelList
 							// check access
 							if($user->authorise($accessAdd, 'com_###component###') && $user->authorise($accessTo, 'com_###component###') && $dashboard_add)
 							{
-								$icons[$group][$i]              = new StdClass;
+								$icons[$group][$i]			= new StdClass;
 								$icons[$group][$i]->url 	= $url;
 								$icons[$group][$i]->name 	= $name;
 								$icons[$group][$i]->image 	= $image;
@@ -161,7 +177,7 @@ class ###Component###Model###Component### extends JModelList
 							// check access
 							if($user->authorise($accessTo, 'com_###component###') && $dashboard_list)
 							{
-								$icons[$group][$i]              = new StdClass;
+								$icons[$group][$i]			= new StdClass;
 								$icons[$group][$i]->url 	= $url;
 								$icons[$group][$i]->name 	= $name;
 								$icons[$group][$i]->image 	= $image;
@@ -173,7 +189,7 @@ class ###Component###Model###Component### extends JModelList
 							// check access
 							if($user->authorise($accessAdd, 'com_###component###') && $dashboard_add)
 							{
-								$icons[$group][$i]              = new StdClass;
+								$icons[$group][$i]			= new StdClass;
 								$icons[$group][$i]->url 	= $url;
 								$icons[$group][$i]->name 	= $name;
 								$icons[$group][$i]->image 	= $image;
@@ -182,7 +198,7 @@ class ###Component###Model###Component### extends JModelList
 						}
 						else
 						{
-							$icons[$group][$i]              = new StdClass;
+							$icons[$group][$i]			= new StdClass;
 							$icons[$group][$i]->url 	= $url;
 							$icons[$group][$i]->name 	= $name;
 							$icons[$group][$i]->image 	= $image;
@@ -191,7 +207,7 @@ class ###Component###Model###Component### extends JModelList
 					}
 					else
 					{
-						$icons[$group][$i]              = new StdClass;
+						$icons[$group][$i]			= new StdClass;
 						$icons[$group][$i]->url 	= $url;
 						$icons[$group][$i]->name 	= $name;
 						$icons[$group][$i]->image 	= $image;

admin/compiler/joomla_3/Helper.php

@@ -42,12 +42,12 @@ abstract class ###Component###Helper
 		$manifestUrl = JPATH_ADMINISTRATOR."/components/com_###component###/###component###.xml";
 		return simplexml_load_file($manifestUrl);
 	}
-	
+
 	/**
 	*	Joomla version object
 	**/	
 	protected static $JVersion;
-	
+
 	/**
 	*	set/get Joomla version
 	**/
@@ -503,7 +503,7 @@ abstract class ###Component###Helper
 		}
 		return $model;
 	}
-	
+
 	/**
 	*	Add to asset Table
 	*/
@@ -565,7 +565,7 @@ abstract class ###Component###Helper
 		}
 		return false;
 	}
-	
+
 	/**
 	 *	Gets the default asset Rules for a component/view.
 	 */
@@ -641,7 +641,14 @@ abstract class ###Component###Helper
 		return $button->input;
 
 	}
-	
+
+	/**
+	*	Check if have an json string
+	*
+	*	@input	string   The json string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -652,15 +659,29 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	*	Check if have an object with a length
+	*
+	*	@input	object   The object to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkObject($object)
 	{
-		if (isset($object) && is_object($object) && count($object) > 0)
+		if (isset($object) && is_object($object))
 		{
-			return true;
+			return count((array)$object) > 0;
 		}
 		return false;
 	}
 
+	/**
+	*	Check if have an array with a length
+	*
+	*	@input	array   The array to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
@@ -682,6 +703,13 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	*	Check if have a string with a length
+	*
+	*	@input	string   The string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -690,7 +718,7 @@ abstract class ###Component###Helper
 		}
 		return false;
 	}
-	
+
 	/**
 	*	Check if we are connected
 	*	Thanks https://stackoverflow.com/a/4860432/1429677
@@ -716,6 +744,13 @@ abstract class ###Component###Helper
 		return $is_conn;
 	}
 
+	/**
+	*	Merge an array of array's
+	*
+	*	@input	array   The arrays you would like to merge
+	*
+	*	@returns array on success
+	**/
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -739,6 +774,13 @@ abstract class ###Component###Helper
 		return self::shorten($string, $length, $addTip);
 	}
 
+	/**
+	*	Shorten a string
+	*
+	*	@input	string   The you would like to shorten
+	*
+	*	@returns string on success
+	**/
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -773,6 +815,13 @@ abstract class ###Component###Helper
 		return $string;
 	}
 
+	/**
+	*	Making strings safe (various ways)
+	*
+	*	@input	string   The you would like to make safe
+	*
+	*	@returns string on success
+	**/
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
 	{
 		if ($replaceNumbers === true)
@@ -900,7 +949,7 @@ abstract class ###Component###Helper
 		// return the string with no numbers remaining.
 		return $string;
 	}
-	
+
 	/**
 	*	Convert an integer into an English word string
 	*	Thanks to Tom Nicholson <http://php.net/manual/en/function.strval.php#41988>

admin/compiler/joomla_3/Helper_site.php

@@ -65,7 +65,7 @@ abstract class ###Component###Helper
 		}
 		return $value;
 	}
-	
+
 	/**
 	*	Load the Component xml manifest.
 	**/
@@ -74,12 +74,12 @@ abstract class ###Component###Helper
 		$manifestUrl = JPATH_ADMINISTRATOR."/components/com_###component###/###component###.xml";
 		return simplexml_load_file($manifestUrl);
 	}
-	
+
 	/**
 	*	Joomla version object
 	**/	
 	protected static $JVersion;
-	
+
 	/**
 	*	set/get Joomla version
 	**/
@@ -174,7 +174,7 @@ abstract class ###Component###Helper
 		}
 		return $model;
 	}
-	
+
 	/**
 	*	Add to asset Table
 	*/
@@ -238,7 +238,7 @@ abstract class ###Component###Helper
 		}
 		return false;
 	}
-	
+
 	/**
 	 *	Gets the default asset Rules for a component/view.
 	 */
@@ -441,7 +441,7 @@ abstract class ###Component###Helper
 		}
 		return $id;
 	}
-	
+
 	/**
 	*	Get the actions permissions
 	**/
@@ -633,7 +633,14 @@ abstract class ###Component###Helper
 		}
 		return $result;
 	}
-	
+
+	/**
+	*	Check if have an json string
+	*
+	*	@input	string   The json string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -644,15 +651,29 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	*	Check if have an object with a length
+	*
+	*	@input	object   The object to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkObject($object)
 	{
-		if (isset($object) && is_object($object) && count($object) > 0)
+		if (isset($object) && is_object($object))
 		{
-			return true;
+			return count((array)$object) > 0;
 		}
 		return false;
 	}
 
+	/**
+	*	Check if have an array with a length
+	*
+	*	@input	array   The array to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
@@ -674,6 +695,13 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	*	Check if have a string with a length
+	*
+	*	@input	string   The string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -682,7 +710,7 @@ abstract class ###Component###Helper
 		}
 		return false;
 	}
-	
+
 	/**
 	*	Check if we are connected
 	*	Thanks https://stackoverflow.com/a/4860432/1429677
@@ -708,6 +736,13 @@ abstract class ###Component###Helper
 		return $is_conn;
 	}
 
+	/**
+	*	Merge an array of array's
+	*
+	*	@input	array   The arrays you would like to merge
+	*
+	*	@returns array on success
+	**/
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -731,6 +766,13 @@ abstract class ###Component###Helper
 		return self::shorten($string, $length, $addTip);
 	}
 
+	/**
+	*	Shorten a string
+	*
+	*	@input	string   The you would like to shorten
+	*
+	*	@returns string on success
+	**/
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -765,6 +807,13 @@ abstract class ###Component###Helper
 		return $string;
 	}
 
+	/**
+	*	Making strings safe (various ways)
+	*
+	*	@input	string   The you would like to make safe
+	*
+	*	@returns string on success
+	**/
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
 	{
 		if ($replaceNumbers === true)
@@ -892,7 +941,7 @@ abstract class ###Component###Helper
 		// return the string with no numbers remaining.
 		return $string;
 	}
-	
+
 	/**
 	*	Convert an integer into an English word string
 	*	Thanks to Tom Nicholson <http://php.net/manual/en/function.strval.php#41988>

admin/compiler/joomla_3/JControllerLegacy.php

@@ -37,6 +37,23 @@ jimport('joomla.application.component.controller');
  */
 class ###Component###Controller extends JControllerLegacy
 {
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($config = array())
+	{
+		// set the default view
+		$config['default_view'] = '###DASHBOARDVIEW###';
+
+		parent::__construct($config);
+	}
+
 	/**
 	 * display task
 	 *
@@ -45,7 +62,7 @@ class ###Component###Controller extends JControllerLegacy
 	function display($cachable = false, $urlparams = false)
 	{
 		// set default view if not set
-		$view   = $this->input->getCmd('view', '###Component###');
+		$view   = $this->input->getCmd('view', '###DASHBOARDVIEW###');
 		$data	= $this->getViewRelation($view);
 		$layout	= $this->input->get('layout', null, 'WORD');
 		$id    	= $this->input->getInt('id');
@@ -88,18 +105,22 @@ class ###Component###Controller extends JControllerLegacy
 
 	protected function getViewRelation($view)
 	{
+		// check the we have a value
 		if (###Component###Helper::checkString($view))
 		{
+			// the view relationships
 			$views = array(###VIEWARRAY###
 					);
 			// check if this is a list view
-			if (in_array($view,$views))
+			if (in_array($view, $views))
 			{
+				// this is a list view
 				return array('edit' => false, 'view' => array_search($view,$views), 'views' => $view);
 			}
 			// check if it is an edit view
-			elseif (array_key_exists($view,$views))
+			elseif (array_key_exists($view, $views))
 			{
+				// this is a edit view
 				return array('edit' => true, 'view' => $view, 'views' => $views[$view]);
 			}
 		}

admin/compiler/joomla_3/JControllerLegacySITE.php

@@ -38,18 +38,30 @@ jimport('joomla.application.component.controller');
 class ###Component###Controller extends JControllerLegacy
 {
 	/**
-	 * display task
+	 * Method to display a view.
+	 *
+	 * @param   boolean  $cachable   If true, the view output will be cached.
+	 * @param   boolean  $urlparams  An array of safe URL parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
 	 *
-	 * @return void
 	 */
 	function display($cachable = false, $urlparams = false)
 	{
 		// set default view if not set
 		$view		= $this->input->getCmd('view', '###SITE_DEFAULT_VIEW###');
+		$this->input->set('view', $view);
 		$isEdit		= $this->checkEditView($view);
 		$layout		= $this->input->get('layout', null, 'WORD');
 		$id			= $this->input->getInt('id');
-		$cachable	= true;
+		// $cachable	= true; (TODO) working on a fix [gh-238](https://github.com/vdm-io/Joomla-Component-Builder/issues/238)
+		
+		// insure that the view is not cashable if edit view or if user is logged in
+		$user = JFactory::getUser();
+		if ($user->get('id') || $isEdit)
+		{
+			$cachable = false;
+		}
 		
 		// Check for edit form.
 		if($isEdit)
@@ -81,8 +93,33 @@ class ###Component###Controller extends JControllerLegacy
 				return false;
 			}
 		}
+		
+		// we may need to make this more dynamic in the future. (TODO)
+		$safeurlparams = array(
+			'catid' => 'INT',
+			'id' => 'INT',
+			'cid' => 'ARRAY',
+			'year' => 'INT',
+			'month' => 'INT',
+			'limit' => 'UINT',
+			'limitstart' => 'UINT',
+			'showall' => 'INT',
+			'return' => 'BASE64',
+			'filter' => 'STRING',
+			'filter_order' => 'CMD',
+			'filter_order_Dir' => 'CMD',
+			'filter-search' => 'STRING',
+			'print' => 'BOOLEAN',
+			'lang' => 'CMD',
+			'Itemid' => 'INT');
 
-		return parent::display($cachable, $urlparams);
+		// should these not merge?
+		if (###Component###Helper::checkArray($urlparams))
+		{
+			$safeurlparams = ###Component###Helper::mergeArrays(array($urlparams, $safeurlparams));
+		}
+
+		return parent::display($cachable, $safeurlparams);
 	}
 
 	protected function checkEditView($view)

admin/compiler/joomla_3/component.xml

@@ -71,7 +71,7 @@
 		<files folder="admin">
 			<filename>access.xml</filename>
 			<filename>config.xml</filename>
-			<filename>controller.php</filename>###ENCRYPT_FILE###
+			<filename>controller.php</filename>###WHMCS_ENCRYPT_FILE###
 			<filename>index.html</filename>
 			<filename>###component###.php</filename>###EXSTRA_ADMIN_FILES###
 			<folder>assets</folder>

admin/compiler/joomla_3/script.php

@@ -111,6 +111,8 @@ class com_###component###InstallerScript
 	 */
 	function postflight($type, $parent)
 	{
+		// get application
+		$app = JFactory::getApplication();###MOVEFOLDERSSCRIPT###
 		// set the default component settings
 		if ($type == 'install')
 		{###POSTINSTALLSCRIPT###
@@ -119,5 +121,5 @@ class com_###component###InstallerScript
 		if ($type == 'update')
 		{###POSTUPDATESCRIPT###
 		}
-	}
+	}###MOVEFOLDERSMETHOD###
 }

admin/compiler/joomla_3/settings.json

@@ -216,10 +216,10 @@
 		},
 		"dynamic": {
 			"admin": {
-				"vdm.php": {
+				"whmcs.php": {
 					"path": "c0mp0n3nt/admin",
 					"rename": false,
-					"type": "encrypt"
+					"type": "whmcs"
 				},
 				"Helper_email.php": {
 					"path": "c0mp0n3nt/admin/helpers",

admin/compiler/joomla_3/whmcs.php

@@ -29,4 +29,4 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-###VDM_ENCRYPTION_BODY###
+###WHMCS_ENCRYPTION_BODY###

admin/config.xml

@@ -47,78 +47,113 @@
 		/>
 		<field type="spacer" name="spacerHistory" hr="true" />
 
-	<!--  Minify Field. Type: Radio. (joomla) -->
+		<!-- Minify Field. Type: Radio. (joomla) -->
-	<field type="radio"
+		<field
-               name="minify"
+			type="radio"
-               label="COM_COMPONENTBUILDER_CONFIG_MINIFY_LABEL"
+			name="minify"
-               description="COM_COMPONENTBUILDER_CONFIG_MINIFY_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_CONFIG_MINIFY_LABEL"
-               class="btn-group btn-group-yesno"
+			description="COM_COMPONENTBUILDER_CONFIG_MINIFY_DESCRIPTION"
-               default="0">
+			class="btn-group btn-group-yesno"
-                <!-- Option Set.-->
+			default="0">
-                <option value="1">COM_COMPONENTBUILDER_CONFIG_YES</option>
+			<!-- Option Set. -->
-                <option value="0">COM_COMPONENTBUILDER_CONFIG_NO</option>
+			<option value="1">
-        </field>		
+				COM_COMPONENTBUILDER_CONFIG_YES</option>
-	<!--  Percentagelanguageadd Field. Type: Number. (joomla) -->
+			<option value="0">
-	<field type="number"
+				COM_COMPONENTBUILDER_CONFIG_NO</option>
-               name="percentagelanguageadd"
+		</field>
-               label="COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_LABEL"
+		<!-- Percentagelanguageadd Field. Type: Number. (joomla) -->
-               default="50"
+		<field
-               description="COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_DESCRIPTION"
+			type="number"
-               class="text_area"
+			name="percentagelanguageadd"
-               required="true"
+			label="COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_LABEL"
-               min="10"
+			default="50"
-               max="100"
+			description="COM_COMPONENTBUILDER_CONFIG_PERCENTAGELANGUAGEADD_DESCRIPTION"
-               step="10" />		
+			class="text_area"
-	<!--  Spacer_hr_a Field. Type: Spacer. A None Database Field. (joomla) -->
+			required="true"
-	<field type="spacer"
+			min="10"
-               name="spacer_hr_a"
+			max="100"
-               hr="true"
+			step="10"
-               class="spacer_hr_a" />		
+		/>
-	<!--  Api Field. Type: User. (joomla) -->
+		<!-- Spacer_hr_one Field. Type: Spacer. A None Database Field. (joomla) -->
-	<field type="user"
+		<field type="spacer" name="spacer_hr_one" hr="true" class="spacer_hr_one" />
-               name="api"
+		<!-- Compiler_field_builder_type Field. Type: List. (joomla) -->
-               label="COM_COMPONENTBUILDER_CONFIG_API_LABEL"
+		<field
-               description="COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION" />		
+			type="list"
-	<!--  Set_browser_storage Field. Type: Radio. (joomla) -->
+			name="compiler_field_builder_type"
-	<field type="radio"
+			label="COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_LABEL"
-               name="set_browser_storage"
+			description="COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_DESCRIPTION"
-               label="COM_COMPONENTBUILDER_CONFIG_SET_BROWSER_STORAGE_LABEL"
+			class="list_class"
-               description="COM_COMPONENTBUILDER_CONFIG_SET_BROWSER_STORAGE_DESCRIPTION"
+			filter="INT"
-               class="btn-group btn-group-yesno"
+			required="true"
-               default="1"
+			default="2">
-               required="true">
+			<!-- Option Set. -->
-                <!-- Option Set.-->
+			<option value="1">
-                <option value="1">COM_COMPONENTBUILDER_CONFIG_ACTIVE</option>
+				COM_COMPONENTBUILDER_CONFIG_STRING_MANIPULATION</option>
-                <option value="0">COM_COMPONENTBUILDER_CONFIG_INACTIVE</option>
+			<option value="2">
-        </field>		
+				COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS</option>
-	<!--  Storage_time_to_live Field. Type: List. (joomla) -->
+		</field>
-	<field type="list"
+		<!-- Spacer_hr_two Field. Type: Spacer. A None Database Field. (joomla) -->
-               name="storage_time_to_live"
+		<field type="spacer" name="spacer_hr_two" hr="true" class="spacer_hr_two" />
-               label="COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_LABEL"
+		<!-- Api Field. Type: User. (joomla) -->
-               description="COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_DESCRIPTION"
+		<field
-               class="list_class"
+			type="user"
-               multiple="false"
+			name="api"
-               default="global"
+			label="COM_COMPONENTBUILDER_CONFIG_API_LABEL"
-               showon="set_browser_storage:1">
+			description="COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION"
-                <!-- Option Set.-->
+		/>
-                <option value="global">COM_COMPONENTBUILDER_CONFIG_EVERY_SESSION</option>
+		<!-- Set_browser_storage Field. Type: Radio. (joomla) -->
-                <option value="30">COM_COMPONENTBUILDER_CONFIG_EVERY_THIRTY_SECONDS</option>
+		<field
-                <option value="60">COM_COMPONENTBUILDER_CONFIG_EVERY_MINUTE</option>
+			type="radio"
-                <option value="300">COM_COMPONENTBUILDER_CONFIG_EVERY_FIVE_MINUTES</option>
+			name="set_browser_storage"
-                <option value="900">COM_COMPONENTBUILDER_CONFIG_EVERY_FIFTEEN_MINUTES</option>
+			label="COM_COMPONENTBUILDER_CONFIG_SET_BROWSER_STORAGE_LABEL"
-                <option value="1800">COM_COMPONENTBUILDER_CONFIG_EVERY_THIRTY_MINUTES</option>
+			description="COM_COMPONENTBUILDER_CONFIG_SET_BROWSER_STORAGE_DESCRIPTION"
-                <option value="3600">COM_COMPONENTBUILDER_CONFIG_EVERY_HOUR</option>
+			class="btn-group btn-group-yesno"
-                <option value="18000">COM_COMPONENTBUILDER_CONFIG_EVERY_FIVE_HOURS</option>
+			default="1"
-                <option value="36000">COM_COMPONENTBUILDER_CONFIG_EVERY_TEN_HOURS</option>
+			required="true">
-                <option value="86400">COM_COMPONENTBUILDER_CONFIG_EVERY_DAY</option>
+			<!-- Option Set. -->
-                <option value="604800">COM_COMPONENTBUILDER_CONFIG_EVERY_WEEK</option>
+			<option value="1">
-                <option value="0">COM_COMPONENTBUILDER_CONFIG_NEVER_UPDATE</option>
+				COM_COMPONENTBUILDER_CONFIG_ACTIVE</option>
-        </field>		
+			<option value="0">
-	<!--  Spacer_hr_b Field. Type: Spacer. A None Database Field. (joomla) -->
+				COM_COMPONENTBUILDER_CONFIG_INACTIVE</option>
-	<field type="spacer"
+		</field>
-               name="spacer_hr_b"
+		<!-- Storage_time_to_live Field. Type: List. (joomla) -->
-               hr="true"
+		<field
-               class="spacer_hr_b" />
+			type="list"
+			name="storage_time_to_live"
+			label="COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			default="global"
+			showon="set_browser_storage:1">
+			<!-- Option Set. -->
+			<option value="global">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_SESSION</option>
+			<option value="30">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_THIRTY_SECONDS</option>
+			<option value="60">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_MINUTE</option>
+			<option value="300">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_FIVE_MINUTES</option>
+			<option value="900">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_FIFTEEN_MINUTES</option>
+			<option value="1800">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_THIRTY_MINUTES</option>
+			<option value="3600">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_HOUR</option>
+			<option value="18000">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_FIVE_HOURS</option>
+			<option value="36000">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_TEN_HOURS</option>
+			<option value="86400">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_DAY</option>
+			<option value="604800">
+				COM_COMPONENTBUILDER_CONFIG_EVERY_WEEK</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_CONFIG_NEVER_UPDATE</option>
+		</field>
+		<!-- Spacer_hr_three Field. Type: Spacer. A None Database Field. (joomla) -->
+		<field type="spacer" name="spacer_hr_three" hr="true" class="spacer_hr_three" />
 		<field name="autorTitle"
 			type="spacer"
 			label="COM_COMPONENTBUILDER_CONFIG_AUTHOR"
@@ -540,268 +575,271 @@
 		name="cronjob_custom_config"
 		label="COM_COMPONENTBUILDER_CONFIG_CRONJOB">
 
-	<!--  Backupcronjob_note Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Backupcronjob_note Field. Type: Note. A None Database Field. (joomla) -->
-	<field type="note"
+		<field type="note" name="backupcronjob_note" label="COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_LABEL" description="COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_DESCRIPTION" heading="h4" class="backupcronjob_note" />
-               name="backupcronjob_note"
+		<!-- Cronjob_backup_type Field. Type: Radio. (joomla) -->
-               label="COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_LABEL"
+		<field
-               description="COM_COMPONENTBUILDER_CONFIG_BACKUPCRONJOB_NOTE_DESCRIPTION"
+			type="radio"
-               heading="h4"
+			name="cronjob_backup_type"
-               class="backupcronjob_note" />		
+			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_LABEL"
-	<!--  Cronjob_backup_type Field. Type: Radio. (joomla) -->
+			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_DESCRIPTION"
-	<field type="radio"
+			class="btn-group btn-group-yesno"
-               name="cronjob_backup_type"
+			default="1">
-               label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_LABEL"
+			<!-- Option Set. -->
-               description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_TYPE_DESCRIPTION"
+			<option value="1">
-               class="btn-group btn-group-yesno"
+				COM_COMPONENTBUILDER_CONFIG_LOCAL_FOLDER</option>
-               default="1">
+			<option value="2">
-                <!-- Option Set.-->
+				COM_COMPONENTBUILDER_CONFIG_REMOTE_SERVER</option>
-                <option value="1">COM_COMPONENTBUILDER_CONFIG_LOCAL_FOLDER</option>
+		</field>
-                <option value="2">COM_COMPONENTBUILDER_CONFIG_REMOTE_SERVER</option>
+		<!-- Cronjob_backup_server Field. Type: Servers. (custom) -->
-        </field>		
+		<field
-	<!--  Cronjob_backup_server Field. Type: Servers. (custom) -->
+			type="servers"
-	<field type="servers"
+			name="cronjob_backup_server"
-               name="cronjob_backup_server"
+			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_LABEL"
-               label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_DESCRIPTION"
-               description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_SERVER_DESCRIPTION"
+			class="list_class"
-               class="list_class"
+			multiple="false"
-               multiple="false"
+			default="0"
-               default="0"
+			showon="cronjob_backup_type:2"
-               showon="cronjob_backup_type:2"
+			button="true"
-               button="true" />		
+		/>
-	<!--  Cronjob_backup_folder_path Field. Type: Text. (joomla) -->
+		<!-- Cronjob_backup_folder_path Field. Type: Text. (joomla) -->
-	<field type="text"
+		<field
-               name="cronjob_backup_folder_path"
+			type="text"
-               label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_LABEL"
+			name="cronjob_backup_folder_path"
-               size="70"
+			label="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_LABEL"
-               maxlength="150"
+			size="70"
-               description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION"
+			maxlength="150"
-               class="text_area"
+			description="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_DESCRIPTION"
-               readonly="false"
+			class="text_area"
-               disabled="false"
+			readonly="false"
-               required="false"
+			disabled="false"
-               filter="PATH"
+			required="false"
-               message="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_MESSAGE"
+			filter="PATH"
-               hint="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_HINT"
+			message="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_MESSAGE"
-               showon="cronjob_backup_type:1" />		
+			hint="COM_COMPONENTBUILDER_CONFIG_CRONJOB_BACKUP_FOLDER_PATH_HINT"
-	<!--  Backup_email Field. Type: Text. (joomla) -->
+			showon="cronjob_backup_type:1"
-	<field type="text"
+		/>
-               name="backup_email"
+		<!-- Backup_email Field. Type: Text. (joomla) -->
-               label="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_LABEL"
+		<field
-               size="10"
+			type="text"
-               maxlength="50"
+			name="backup_email"
-               description="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_LABEL"
-               class="text_area"
+			size="10"
-               filter="STRING"
+			maxlength="50"
-               validate="email"
+			description="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_DESCRIPTION"
-               message="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_MESSAGE"
+			class="text_area"
-               hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_HINT" />		
+			filter="STRING"
-	<!--  Package_name_plaeholders Field. Type: Note. A None Database Field. (joomla) -->
+			validate="email"
-	<field type="note"
+			message="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_MESSAGE"
-               name="package_name_plaeholders"
+			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_EMAIL_HINT"
-               label="COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_LABEL"
+		/>
-               description="COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_DESCRIPTION"
+		<!-- Package_name_plaeholders Field. Type: Note. A None Database Field. (joomla) -->
-               heading="h4"
+		<field type="note" name="package_name_plaeholders" label="COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_LABEL" description="COM_COMPONENTBUILDER_CONFIG_PACKAGE_NAME_PLAEHOLDERS_DESCRIPTION" heading="h4" class="package_name_plaeholders" />
-               class="package_name_plaeholders" />		
+		<!-- Backup_package_name Field. Type: Text. (joomla) -->
-	<!--  Backup_package_name Field. Type: Text. (joomla) -->
+		<field
-	<field type="text"
+			type="text"
-               name="backup_package_name"
+			name="backup_package_name"
-               label="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_LABEL"
+			label="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_LABEL"
-               size="40"
+			size="40"
-               maxlength="150"
+			maxlength="150"
-               default="JCB_Backup_[YEAR]_[MONTH]_[DAY]"
+			default="JCB_Backup_[YEAR]_[MONTH]_[DAY]"
-               description="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_DESCRIPTION"
-               class="text_area"
+			class="text_area"
-               readonly="false"
+			readonly="false"
-               disabled="false"
+			disabled="false"
-               required="true"
+			required="true"
-               filter="STRING"
+			filter="STRING"
-               message="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_MESSAGE"
+			message="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_MESSAGE"
-               hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_HINT" />
+			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_HINT"
+		/>
 	</fieldset>
 	<fieldset
 		name="folder_paths_custom_config"
 		label="COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS">
 
-	<!--  Note_compiler_folder_path Field. Type: Note. A None Database Field. (joomla) -->
+		<!-- Note_compiler_folder_path Field. Type: Note. A None Database Field. (joomla) -->
-	<field type="note"
+		<field type="note" name="note_compiler_folder_path" label="COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_DESCRIPTION" heading="h4" class="alert alert-info note_compiler_folder_path" />
-               name="note_compiler_folder_path"
+		<!-- Compiler_folder_path Field. Type: Text. (joomla) -->
-               label="COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_LABEL"
+		<field
-               description="COM_COMPONENTBUILDER_CONFIG_NOTE_COMPILER_FOLDER_PATH_DESCRIPTION"
+			type="text"
-               heading="h4"
+			name="compiler_folder_path"
-               class="alert alert-info note_compiler_folder_path" />		
+			label="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_LABEL"
-	<!--  Compiler_folder_path Field. Type: Text. (joomla) -->
+			size="70"
-	<field type="text"
+			maxlength="150"
-               name="compiler_folder_path"
+			description="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_DESCRIPTION"
-               label="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_LABEL"
+			class="text_area"
-               size="70"
+			readonly="false"
-               maxlength="150"
+			disabled="false"
-               description="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_DESCRIPTION"
+			required="false"
-               class="text_area"
+			filter="PATH"
-               readonly="false"
+			message="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_MESSAGE"
-               disabled="false"
+			hint="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_HINT"
-               required="false"
+		/>
-               filter="PATH"
+		<!-- Note_custom_folder_path Field. Type: Note. A None Database Field. (joomla) -->
-               message="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_MESSAGE"
+		<field type="note" name="note_custom_folder_path" label="COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_DESCRIPTION" heading="h4" class="alert alert-info note_custom_folder_path" />
-               hint="COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_HINT" />		
+		<!-- Custom_folder_path Field. Type: Text. (joomla) -->
-	<!--  Note_custom_folder_path Field. Type: Note. A None Database Field. (joomla) -->
+		<field
-	<field type="note"
+			type="text"
-               name="note_custom_folder_path"
+			name="custom_folder_path"
-               label="COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_LABEL"
+			label="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL"
-               description="COM_COMPONENTBUILDER_CONFIG_NOTE_CUSTOM_FOLDER_PATH_DESCRIPTION"
+			size="70"
-               heading="h4"
+			maxlength="150"
-               class="alert alert-info note_custom_folder_path" />		
+			description="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_DESCRIPTION"
-	<!--  Custom_folder_path Field. Type: Text. (joomla) -->
+			class="text_area"
-	<field type="text"
+			readonly="false"
-               name="custom_folder_path"
+			disabled="false"
-               label="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL"
+			required="false"
-               size="70"
+			filter="PATH"
-               maxlength="150"
+			message="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_MESSAGE"
-               description="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_HINT"
-               class="text_area"
+		/>
-               readonly="false"
+		<!-- Note_backup_folder_path Field. Type: Note. A None Database Field. (joomla) -->
-               disabled="false"
+		<field type="note" name="note_backup_folder_path" label="COM_COMPONENTBUILDER_CONFIG_NOTE_BACKUP_FOLDER_PATH_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_BACKUP_FOLDER_PATH_DESCRIPTION" heading="h4" class="alert alert-info note_backup_folder_path" />
-               required="false"
+		<!-- Backup_folder_path Field. Type: Text. (joomla) -->
-               filter="PATH"
+		<field
-               message="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_MESSAGE"
+			type="text"
-               hint="COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_HINT" />		
+			name="backup_folder_path"
-	<!--  Note_backup_folder_path Field. Type: Note. A None Database Field. (joomla) -->
+			label="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_LABEL"
-	<field type="note"
+			size="70"
-               name="note_backup_folder_path"
+			maxlength="150"
-               label="COM_COMPONENTBUILDER_CONFIG_NOTE_BACKUP_FOLDER_PATH_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_DESCRIPTION"
-               description="COM_COMPONENTBUILDER_CONFIG_NOTE_BACKUP_FOLDER_PATH_DESCRIPTION"
+			class="text_area"
-               heading="h4"
+			readonly="false"
-               class="alert alert-info note_backup_folder_path" />		
+			disabled="false"
-	<!--  Backup_folder_path Field. Type: Text. (joomla) -->
+			required="false"
-	<field type="text"
+			filter="PATH"
-               name="backup_folder_path"
+			message="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_MESSAGE"
-               label="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_LABEL"
+			hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_HINT"
-               size="70"
+		/>
-               maxlength="150"
+		<!-- Note_git_folder_path Field. Type: Note. A None Database Field. (joomla) -->
-               description="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_DESCRIPTION"
+		<field type="note" name="note_git_folder_path" label="COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_LABEL" description="COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_DESCRIPTION" heading="h4" class="alert alert-info note_git_folder_path" />
-               class="text_area"
+		<!-- Git_folder_path Field. Type: Text. (joomla) -->
-               readonly="false"
+		<field
-               disabled="false"
+			type="text"
-               required="false"
+			name="git_folder_path"
-               filter="PATH"
+			label="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_LABEL"
-               message="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_MESSAGE"
+			size="70"
-               hint="COM_COMPONENTBUILDER_CONFIG_BACKUP_FOLDER_PATH_HINT" />		
+			maxlength="150"
-	<!--  Note_git_folder_path Field. Type: Note. A None Database Field. (joomla) -->
+			description="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_DESCRIPTION"
-	<field type="note"
+			class="text_area"
-               name="note_git_folder_path"
+			readonly="false"
-               label="COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_LABEL"
+			disabled="false"
-               description="COM_COMPONENTBUILDER_CONFIG_NOTE_GIT_FOLDER_PATH_DESCRIPTION"
+			required="false"
-               heading="h4"
+			filter="PATH"
-               class="alert alert-info note_git_folder_path" />		
+			message="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_MESSAGE"
-	<!--  Git_folder_path Field. Type: Text. (joomla) -->
+			hint="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_HINT"
-	<field type="text"
+		/>
-               name="git_folder_path"
-               label="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_LABEL"
-               size="70"
-               maxlength="150"
-               description="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_DESCRIPTION"
-               class="text_area"
-               readonly="false"
-               disabled="false"
-               required="false"
-               filter="PATH"
-               message="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_MESSAGE"
-               hint="COM_COMPONENTBUILDER_CONFIG_GIT_FOLDER_PATH_HINT" />
 	</fieldset>
 	<fieldset
 		name="company_custom_config"
 		label="COM_COMPONENTBUILDER_CONFIG_COMPANY">
 
-	<!--  Export_company Field. Type: Text. (joomla) -->
+		<!-- Export_company Field. Type: Text. (joomla) -->
-	<field type="text"
+		<field
-               name="export_company"
+			type="text"
-               label="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_LABEL"
+			name="export_company"
-               size="40"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_LABEL"
-               maxlength="150"
+			size="40"
-               description="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_DESCRIPTION"
+			maxlength="150"
-               class="text_area"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_DESCRIPTION"
-               readonly="false"
+			class="text_area"
-               disabled="false"
+			readonly="false"
-               required="true"
+			disabled="false"
-               filter="STRING"
+			required="true"
-               message="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_MESSAGE"
+			filter="STRING"
-               hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_HINT" />		
+			message="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_MESSAGE"
-	<!--  Export_owner Field. Type: Text. (joomla) -->
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_HINT"
-	<field type="text"
+		/>
-               name="export_owner"
+		<!-- Export_owner Field. Type: Text. (joomla) -->
-               label="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_LABEL"
+		<field
-               size="10"
+			type="text"
-               maxlength="120"
+			name="export_owner"
-               description="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_LABEL"
-               class="text_area"
+			size="10"
-               readonly="false"
+			maxlength="120"
-               disabled="false"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_DESCRIPTION"
-               required="true"
+			class="text_area"
-               filter="HTML"
+			readonly="false"
-               message="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_MESSAGE"
+			disabled="false"
-               hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_HINT" />		
+			required="true"
-	<!--  Export_email Field. Type: Text. (joomla) -->
+			filter="HTML"
-	<field type="text"
+			message="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_MESSAGE"
-               name="export_email"
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_OWNER_HINT"
-               label="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_LABEL"
+		/>
-               size="40"
+		<!-- Export_email Field. Type: Text. (joomla) -->
-               maxlength="150"
+		<field
-               description="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_DESCRIPTION"
+			type="text"
-               class="text_area"
+			name="export_email"
-               required="true"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_LABEL"
-               filter="STRING"
+			size="40"
-               validate="email"
+			maxlength="150"
-               message="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_MESSAGE"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_DESCRIPTION"
-               hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_HINT" />		
+			class="text_area"
-	<!--  Export_website Field. Type: Url. (joomla) -->
+			required="true"
-	<field type="url"
+			filter="STRING"
-               name="export_website"
+			validate="email"
-               label="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL"
+			message="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_MESSAGE"
-               size="60"
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_EMAIL_HINT"
-               maxlength="150"
+		/>
-               description="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_DESCRIPTION"
+		<!-- Export_website Field. Type: Url. (joomla) -->
-               class="text_area"
+		<field
-               required="true"
+			type="url"
-               filter="url"
+			name="export_website"
-               validated="url"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL"
-               message="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_MESSAGE"
+			size="60"
-               hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_HINT" />		
+			maxlength="150"
-	<!--  Export_license Field. Type: Textarea. (joomla) -->
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_DESCRIPTION"
-	<field type="textarea"
+			class="text_area"
-               name="export_license"
+			required="true"
-               label="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_LABEL"
+			filter="url"
-               rows="7"
+			validated="url"
-               cols="10"
+			message="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_MESSAGE"
-               default="GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html"
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_HINT"
-               description="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_DESCRIPTION"
+		/>
-               class="text_area span12"
+		<!-- Export_license Field. Type: Textarea. (joomla) -->
-               filter="HTML"
+		<field
-               hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_HINT"
+			type="textarea"
-               required="true" />		
+			name="export_license"
-	<!--  Export_copyright Field. Type: Textarea. (joomla) -->
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_LABEL"
-	<field type="textarea"
+			rows="7"
-               name="export_copyright"
+			cols="10"
-               label="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_LABEL"
+			default="GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html"
-               rows="7"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_DESCRIPTION"
-               cols="10"
+			class="text_area span12"
-               default="Copyright (C) 2015. All Rights Reserved"
+			filter="HTML"
-               description="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_LICENSE_HINT"
-               class="text_area span12"
+			required="true"
-               filter="HTML"
+		/>
-               hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_HINT"
+		<!-- Export_copyright Field. Type: Textarea. (joomla) -->
-               required="true" />		
+		<field
-	<!--  Export_buy_link Field. Type: Url. (joomla) -->
+			type="textarea"
-	<field type="url"
+			name="export_copyright"
-               name="export_buy_link"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_LABEL"
-               label="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_LABEL"
+			rows="7"
-               size="60"
+			cols="10"
-               maxlength="150"
+			default="Copyright (C) 2015. All Rights Reserved"
-               description="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_DESCRIPTION"
-               class="text_area"
+			class="text_area span12"
-               required="false"
+			filter="HTML"
-               filter="url"
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_COPYRIGHT_HINT"
-               validated="url"
+			required="true"
-               message="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_MESSAGE"
+		/>
-               hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT" />
+		<!-- Export_buy_link Field. Type: Url. (joomla) -->
+		<field
+			type="url"
+			name="export_buy_link"
+			label="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION"
+			class="text_area"
+			required="false"
+			filter="url"
+			validated="url"
+			message="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_MESSAGE"
+			hint="COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT"
+		/>
 	</fieldset>
 	<fieldset
 		name="permissions"

admin/controller.php

@@ -34,6 +34,23 @@ jimport('joomla.application.component.controller');
  */
 class ComponentbuilderController extends JControllerLegacy
 {
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 * Recognized key values include 'name', 'default_task', 'model_path', and
+	 * 'view_path' (this list is not meant to be comprehensive).
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($config = array())
+	{
+		// set the default view
+		$config['default_view'] = 'componentbuilder';
+
+		parent::__construct($config);
+	}
+
 	/**
 	 * display task
 	 *
@@ -42,7 +59,7 @@ class ComponentbuilderController extends JControllerLegacy
 	function display($cachable = false, $urlparams = false)
 	{
 		// set default view if not set
-		$view   = $this->input->getCmd('view', 'Componentbuilder');
+		$view   = $this->input->getCmd('view', 'componentbuilder');
 		$data	= $this->getViewRelation($view);
 		$layout	= $this->input->get('layout', null, 'WORD');
 		$id    	= $this->input->getInt('id');
@@ -85,8 +102,10 @@ class ComponentbuilderController extends JControllerLegacy
 
 	protected function getViewRelation($view)
 	{
+		// check the we have a value
 		if (ComponentbuilderHelper::checkString($view))
 		{
+			// the view relationships
 			$views = array(
 				'joomla_component' => 'joomla_components',
 				'admin_view' => 'admin_views',
@@ -120,13 +139,15 @@ class ComponentbuilderController extends JControllerLegacy
 				'library_files_folders_urls' => 'libraries_files_folders_urls'
 					);
 			// check if this is a list view
-			if (in_array($view,$views))
+			if (in_array($view, $views))
 			{
+				// this is a list view
 				return array('edit' => false, 'view' => array_search($view,$views), 'views' => $view);
 			}
 			// check if it is an edit view
-			elseif (array_key_exists($view,$views))
+			elseif (array_key_exists($view, $views))
 			{
+				// this is a edit view
 				return array('edit' => true, 'view' => $view, 'views' => $views[$view]);
 			}
 		}

admin/helpers/compiler.php

@@ -183,7 +183,9 @@ class Compiler extends Infusion
 				// the correct string
 				$externalCodeString = ($externalCount == 1) ? JText::_('code/string') : JText::_('code/strings');
 				// the notice
+				$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Notice</h3>'), 'Notice');
 				$this->app->enqueueMessage(JText::sprintf('There has been <b>%s - %s</b> added to this component as EXTERNALCODE. To avoid shipping your component with malicious %s always make sure that the correct <b>code/string values</b> were used.', $externalCount, $externalCodeString, $externalCodeString), 'Notice');
+				$this->app->enqueueMessage('<hr />', 'Notice');
 			}
 			// end the timer here
 			$this->time_end = microtime(true);
@@ -699,4 +701,5 @@ class Compiler extends Infusion
 
 		// any help to improve this is welcome...
 	}
+
 }

admin/helpers/compiler/a_Get.php

@@ -11,7 +11,7 @@
                                                       |_|
   /-------------------------------------------------------------------------------------------------------------------------------/
 
-  @version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -247,10 +247,10 @@ class Get
 	 * @var      array
 	 */
 	public $langStringTargets = array(
-		'Joomla'.'.JText._(',
+		'Joomla' . '.JText._(',
-		'JText:'.':script(',
+		'JText:' . ':script(',
-		'JText:'.':_(',
+		'JText:' . ':_(',
-		'JText:'.':sprintf('
+		'JText:' . ':sprintf('
 	);
 
 	/**
@@ -428,6 +428,37 @@ class Get
 	 */
 	private $_fieldData = array();
 
+	/**
+	 * The field builder type
+	 * 
+	 * 1 = StringManipulation
+	 * 2 = SimpleXMLElement
+	 * 
+	 * @var     int
+	 */
+	public $fieldBuilderType;
+
+	/**
+	 * Set unique Names
+	 * 
+	 * @var    array
+	 */
+	public $uniqueNames = array();
+
+	/**
+	 * Set unique Names
+	 * 
+	 * @var    array
+	 */
+	protected $uniqueFieldNames = array();
+
+	/**
+	 * Category other name bucket
+	 * 
+	 * @var    array
+	 */
+	public $catOtherName = array();
+
 	/**
 	 * The linked admin view tabs
 	 * 
@@ -471,11 +502,18 @@ class Get
 	public $layoutData = array();
 
 	/**
-	 * The Advanced Encryption Switch
+	 * The Encryption Types
+	 * 
+	 * @var    array
+	 */
+	public $cryptionTypes = array('basic', 'medium', 'whmcs');
+
+	/**
+	 * The WHMCS Encryption Switch
 	 * 
 	 * @var    boolean
 	 */
-	public $advancedEncryption = false;
+	public $whmcsEncryption = false;
 
 	/**
 	 * The Basic Encryption Switch
@@ -484,6 +522,13 @@ class Get
 	 */
 	public $basicEncryption = false;
 
+	/**
+	 * The Medium Encryption Switch
+	 * 
+	 * @var    boolean
+	 */
+	public $mediumEncryption = false;
+
 	/**
 	 * The Custom field Switch per view
 	 * 
@@ -575,6 +620,16 @@ class Get
 			$this->tidy = extension_loaded('Tidy');
 			// Set the params
 			$this->params = JComponentHelper::getParams('com_componentbuilder');
+			// set the field type builder
+			$this->fieldBuilderType = $this->params->get('compiler_field_builder_type', 2);
+			// check the field builder type logic
+			if (!$this->tidy && $this->fieldBuilderType == 2)
+			{
+				// we do not have the tidy extention set fall back to StringManipulation
+				$this->fieldBuilderType = 1;
+				// load the sugestion to use string manipulation
+				$this->app->enqueueMessage(JText::_('Since you do not have <b>Tidy</b> extentsion setup on your system, we could not use the SimpleXMLElement class. We instead used <b>string manipulation</b> to build all your fields, this is a faster method, you must inspect the xml files in your component package to see if you are satisfied with the result.<br />You can make this method your default by opening the global options of JCB and under the <b>Global</b> tab set the <b>Field Builder Type</b> to string manipulation.<hr />'), 'Notice');
+			}
 			// load the compiler path
 			$this->compilerPath = $this->params->get('compiler_folder_path', JPATH_COMPONENT_ADMINISTRATOR . '/compiler');
 			// set the component ID
@@ -777,22 +832,22 @@ class Get
 		foreach ($addArrayF as $addTarget => $targetHere)
 		{
 			// set the add target data
-			$component->{'add'.$addTarget} = (isset($component->{'add'.$addTarget}) && ComponentbuilderHelper::checkJson($component->{'add'.$addTarget})) ? json_decode($component->{'add'.$addTarget}, true) : null;
+			$component->{'add' . $addTarget} = (isset($component->{'add' . $addTarget}) && ComponentbuilderHelper::checkJson($component->{'add' . $addTarget})) ? json_decode($component->{'add' . $addTarget}, true) : null;
-			if (ComponentbuilderHelper::checkArray($component->{'add'.$addTarget}))
+			if (ComponentbuilderHelper::checkArray($component->{'add' . $addTarget}))
 			{
 				if (isset($component->{$targetHere}) && ComponentbuilderHelper::checkArray($component->{$targetHere}))
 				{
-					foreach($component->{'add'.$addTarget} as $taget)
+					foreach ($component->{'add' . $addTarget} as $taget)
 					{
 						$component->{$targetHere}[] = $taget;
 					}
 				}
 				else
 				{
-					$component->{$targetHere} = array_values($component->{'add'.$addTarget});
+					$component->{$targetHere} = array_values($component->{'add' . $addTarget});
 				}
 			}
-			unset($component->{'add'.$addTarget});
+			unset($component->{'add' . $addTarget});
 		}
 
 		// set the uikit switch
@@ -938,13 +993,32 @@ class Get
 		$component->addconfig = (isset($component->addconfig) && ComponentbuilderHelper::checkJson($component->addconfig)) ? json_decode($component->addconfig, true) : null;
 		if (ComponentbuilderHelper::checkArray($component->addconfig))
 		{
-			$component->config = array_map(function($array)
+			$component->config = array_map(function($field)
 			{
-				$array['alias'] = 0;
+				// set hash 
-				$array['title'] = 0;
+				static $hash = 1;
-				$array['settings'] = $this->getFieldData($array['field']);
+				// load hash
-				return $array;
+				$field['hash'] = md5($field['field'] . $hash);
+				// increment hash
+				$hash++;
+				$field['alias'] = 0;
+				$field['title'] = 0;
+				// load the settings
+				$field['settings'] = $this->getFieldData($field['field']);
+				// set real field name
+				$field['base_name'] = $this->getFieldName($field);
+				// set unigue name keeper
+				$this->setUniqueNameCounter($this->getFieldName($field), 'configs');
+				// return field
+				return $field;
 			}, array_values($component->addconfig));
+
+			// do some house cleaning (for fields)
+			foreach ($component->config as $field)
+			{
+				// so first we lock the field name in
+				$this->getFieldName($field, 'configs');
+			}
 			// unset original value
 			unset($component->addconfig);
 		}
@@ -1012,15 +1086,15 @@ class Get
 		foreach ($addGlobalCss as $area)
 		{
 			// add_css if found
-			if (isset($component->{'add_css_'.$area}) && $component->{'add_css_'.$area} == 1 && isset($component->{'css_'.$area}) && ComponentbuilderHelper::checkString($component->{'css_'.$area}))
+			if (isset($component->{'add_css_' . $area}) && $component->{'add_css_' . $area} == 1 && isset($component->{'css_' . $area}) && ComponentbuilderHelper::checkString($component->{'css_' . $area}))
 			{
-				$this->customScriptBuilder['component_css_'.$area] = base64_decode($component->{'css_'.$area});
+				$this->customScriptBuilder['component_css_' . $area] = base64_decode($component->{'css_' . $area});
 			}
 			else
 			{
-				$this->customScriptBuilder['component_css_'.$area] = '';
+				$this->customScriptBuilder['component_css_' . $area] = '';
 			}
-			unset($component->{'css_'.$area});
+			unset($component->{'css_' . $area});
 		}
 		// set the lang target
 		$this->lang = 'admin';
@@ -1121,10 +1195,10 @@ class Get
 		{
 			$component->readme = '';
 		}
+
 		// set lang now
 		$nowLang = $this->lang;
 		$this->lang = 'admin';
-
 		// dashboard methods
 		$component->dashboard_tab = (isset($component->dashboard_tab) && ComponentbuilderHelper::checkJson($component->dashboard_tab)) ? json_decode($component->dashboard_tab, true) : null;
 		if (ComponentbuilderHelper::checkArray($component->dashboard_tab))
@@ -1153,13 +1227,13 @@ class Get
 		$this->lang = $nowLang;
 
 		// add the update/sales server FTP details if that is the expected protocol
-		$serverArray = array('update_server','sales_server');
+		$serverArray = array('update_server', 'sales_server');
-		foreach($serverArray as $server)
+		foreach ($serverArray as $server)
 		{
-			if ($component->{'add_'.$server} == 1 && is_numeric($component->{$server}) && $component->{$server} > 0)
+			if ($component->{'add_' . $server} == 1 && is_numeric($component->{$server}) && $component->{$server} > 0)
 			{
 				// get the server protocol
-				$component->{$server.'_protocol'} = ComponentbuilderHelper::getVar('server', (int) $component->{$server}, 'id', 'protocol');
+				$component->{$server . '_protocol'} = ComponentbuilderHelper::getVar('server', (int) $component->{$server}, 'id', 'protocol');
 			}
 			else
 			{
@@ -1167,9 +1241,9 @@ class Get
 				// only change this for sales server (update server can be added loacaly to the zip file)
 				if ('sales_server' === $server)
 				{
-					$component->{'add_'.$server} = 0;
+					$component->{'add_' . $server} = 0;
 				}
-				$component->{$server.'_protocol'} = 0;
+				$component->{$server . '_protocol'} = 0;
 			}
 		}
 		// set the ignore folders for repo if found
@@ -1343,11 +1417,24 @@ class Get
 				if (ComponentbuilderHelper::checkArray($view->addfields))
 				{
 					// load the field data
-					$view->fields = array_map(function($array) use($name_single, $name_list)
+					$view->fields = array_map(function($field) use($name_single, $name_list)
 					{
-						$array['settings'] = $this->getFieldData($array['field'], $name_single, $name_list);
+						// set hash 
-						return $array;
+						static $hash = 1;
+						// load hash
+						$field['hash'] = md5($field['field'] . $hash);
+						// increment hash
+						$hash++;
+						// set the settings
+						$field['settings'] = $this->getFieldData($field['field'], $name_single, $name_list);
+						// set real field name
+						$field['base_name'] = $this->getFieldName($field);
+						// set unigue name keeper
+						$this->setUniqueNameCounter($field['base_name'], $name_list);
+						// return field
+						return $field;
 					}, array_values($view->addfields));
+
 					// sort the fields acording to order
 					usort($view->fields, function($a, $b)
 					{
@@ -1369,6 +1456,62 @@ class Get
 						}
 						return 0;
 					});
+
+					// do some house cleaning (for fields)
+					foreach ($view->fields as $field)
+					{
+						// so first we lock the field name in
+						$field_name = $this->getFieldName($field, $name_list);
+						// check if the field changed since the last compilation
+						if (ComponentbuilderHelper::checkObject($field['settings']->history))
+						{
+							// check if the datatype changed
+							if (isset($field['settings']->history->datatype))
+							{
+								$this->setUpdateSQL($field['settings']->history->datatype, $field['settings']->datatype, 'field.datatype', $name_single . '.' . $field_name);
+							}
+							// check if the datatype lenght changed
+							if (isset($field['settings']->history->datalenght) && isset($field['settings']->history->datalenght_other))
+							{
+								$this->setUpdateSQL($field['settings']->history->datalenght . $field['settings']->history->datalenght_other, $field['settings']->datalenght . $field['settings']->datalenght_other, 'field.lenght', $name_single . '.' . $field_name);
+							}
+							// check if the name changed
+							if (isset($field['settings']->history->xml) && ComponentbuilderHelper::checkJson($field['settings']->history->xml))
+							{
+								// only run if this is not an alias or a tag
+								if ((!isset($field['alias']) || !$field['alias']) && 'tag' !== $field['settings']->type_name)
+								{
+									// build temp field bucket
+									$tmpfield = array();
+									$tmpfield['settings'] = new stdClass();
+									// convert the xml json string to normal string
+									$tmpfield['settings']->xml = $this->setDynamicValues(json_decode($field['settings']->history->xml));
+									// add properties from current field as it is generic
+									$tmpfield['settings']->properties = $field['settings']->properties;
+									// add the old name
+									$tmpfield['settings']->name = $field['settings']->history->name;
+									// add the field type from current field since it is generic
+									$tmpfield['settings']->type_name = $field['settings']->type_name;
+									// get the old name
+									$old_field_name = $this->getFieldName($tmpfield);
+
+									// only run this if not a multi field
+									if (!isset($this->uniqueNames[$name_list]['names'][$field_name]))
+									{
+										// this only works when the field is not multiple of the same field
+										$this->setUpdateSQL($old_field_name, $field_name, 'field.name', $name_single . '.' . $field_name);
+									}
+									elseif ($old_field_name !== $field_name)
+									{
+										// give a notice atleast that the multi fields could have changed and no DB update was done
+										$this->app->enqueueMessage(JText::sprintf('You have a field called <b>%s</b> that has been added multiple times to the <b>%s</b> view, the name of that field has changed to <b>%s</b>. Normaly we would automaticly add the update SQL to your component, but with multiple fields this does not work automaticly since it could be that noting changed and it just seems like it did. Therefore you will have to do this manualy if it actualy did change!', $field_name, $name_single, $old_field_name), 'Notice');
+									}
+									// remove tmp
+									unset($tmpfield);
+								}
+							}
+						}
+					}
 				}
 			}
 			unset($view->addfields);
@@ -1404,16 +1547,10 @@ class Get
 									$required = ($required == true) ? 'yes' : 'no';
 									$filter = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml, 'filter="', '"');
 									$filter = ComponentbuilderHelper::checkString($filter) ? $filter : 'none';
-									// get name
-									$name = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml, 'name="', '"');
-									$name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValues['settings']->name;
-									// get type
-									$type = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml, 'type="', '"');
-									$type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValues['settings']->type_name;
 									// set the field name
 									$conditionValue['target_field'][$fieldKey] = array(
-										'name' => ComponentbuilderHelper::safeString($name),
+										'name' => $this->getFieldName($fieldValues, $name_list),
-										'type' => ComponentbuilderHelper::safeString($type),
+										'type' => $this->getFieldType($fieldValues),
 										'required' => $required,
 										'filter' => $filter
 									);
@@ -1430,15 +1567,11 @@ class Get
 						{
 							if ((int) $fieldValue['field'] == (int) $conditionValue['match_field'])
 							{
-								// get name
+								// set the type
-								$name = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml, 'name="', '"');
+								$type = $this->getFieldType($fieldValue);
-								$name = ComponentbuilderHelper::checkString($name) ? $name : $fieldValue['settings']->name;
-								// get type
-								$type = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml, 'type="', '"');
-								$type = ComponentbuilderHelper::checkString($type) ? $type : $fieldValue['settings']->type_name;
 								// set the field details
-								$conditionValue['match_name'] = ComponentbuilderHelper::safeString($name);
+								$conditionValue['match_name'] = $this->getFieldName($fieldValue, $name_list);
-								$conditionValue['match_type'] = ComponentbuilderHelper::safeString($type);
+								$conditionValue['match_type'] = $type;
 								$conditionValue['match_xml'] = $fieldValue['settings']->xml;
 								// if custom field load field being extended
 								if (!ComponentbuilderHelper::typeField($type))
@@ -1486,7 +1619,7 @@ class Get
 						}
 						$this->customScriptBuilder[$scripter_target][$name_single] = '';
 					}
-					$this->customScriptBuilder[$scripter_target][$name_single] .= $view->$scripter;
+					$this->customScriptBuilder[$scripter_target][$name_single] .= PHP_EOL . $view->$scripter;
 					if (strpos($view->$scripter, "token") !== false || strpos($view->$scripter, "task=ajax") !== false)
 					{
 						if (!$this->customScriptBuilder['token'][$name_single])
@@ -1507,7 +1640,7 @@ class Get
 					{
 						$this->customScriptBuilder[$scripter][$name_single] = '';
 					}
-					$this->customScriptBuilder[$scripter][$name_single] .= base64_decode($view->$scripter);
+					$this->customScriptBuilder[$scripter][$name_single] .= PHP_EOL . base64_decode($view->$scripter);
 					unset($view->$scripter);
 				}
 			}
@@ -1956,16 +2089,21 @@ class Get
 				{
 					$field->properties = array_values($field->properties);
 				}
-				// check if we have advanced encryption
+				// check if we have WHMCS encryption
-				if (4 == $field->store && (!isset($this->advancedEncryption) || !$this->advancedEncryption))
+				if (4 == $field->store && (!isset($this->whmcsEncryption) || !$this->whmcsEncryption))
 				{
-					$this->advancedEncryption = true;
+					$this->whmcsEncryption = true;
 				}
 				// check if we have basic encryption
 				elseif (3 == $field->store && (!isset($this->basicEncryption) || !$this->basicEncryption))
 				{
 					$this->basicEncryption = true;
 				}
+				// check if we have better encryption
+				elseif (5 == $field->store && (!isset($this->mediumEncryption) || !$this->mediumEncryption))
+				{
+					$this->mediumEncryption = true;
+				}
 
 				// get the last used version
 				$field->history = $this->getHistoryWatch('field', $id);
@@ -2057,7 +2195,7 @@ class Get
 						$this->_fieldData[$id]->javascript_views_footer = $this->setDynamicValues(base64_decode($this->_fieldData[$id]->javascript_views_footer));
 						$this->_fieldData[$id]->javascript_views_footer_decoded = true;
 					}
-					$this->customScriptBuilder['views_footer'][$name_list] .= $this->_fieldData[$id]->javascript_views_footer;
+					$this->customScriptBuilder['views_footer'][$name_list] .= PHP_EOL . $this->_fieldData[$id]->javascript_views_footer;
 					if (strpos($this->_fieldData[$id]->javascript_views_footer, "token") !== false ||
 						strpos($this->_fieldData[$id]->javascript_views_footer, "task=ajax") !== false)
 					{
@@ -2089,7 +2227,7 @@ class Get
 						$this->setCustomCodeData($this->_fieldData[$id]->css_views);
 						$this->_fieldData[$id]->css_views_decoded = true;
 					}
-					$this->customScriptBuilder['css_views'][$name_list] .= $this->_fieldData[$id]->css_views;
+					$this->customScriptBuilder['css_views'][$name_list] .= PHP_EOL . $this->_fieldData[$id]->css_views;
 				}
 
 				// add this only once to view.
@@ -2104,6 +2242,213 @@ class Get
 		return false;
 	}
 
+	/**
+	 * Get the field's actual type
+	 * 
+	 * @param   object   $field   The field object
+	 * 
+	 * @return  string   Success returns field type
+	 * 
+	 */
+	public function getFieldType(&$field)
+	{
+		// set the type name
+		$type_name = ComponentbuilderHelper::safeString($field['settings']->type_name);
+		// check that we have the poperties
+		if (ComponentbuilderHelper::checkArray($field['settings']->properties))
+		{
+			foreach ($field['settings']->properties as $property)
+			{
+				if ($property['name'] === 'type')
+				{
+					if ($type_name === 'custom' || $type_name === 'customuser')
+					{
+						$type = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'type="', '"'));
+					}
+					// use field core type
+					elseif (ComponentbuilderHelper::checkString($type_name))
+					{
+						$type = $type_name;
+					}
+					// make sure none adjustable fields are set (should be same as above)
+					elseif (isset($property['example']) && ComponentbuilderHelper::checkString($property['example']) && $property['adjustable'] == 0)
+					{
+						$type = $property['example'];
+					}
+					// fall back on the xml settings (not ideal)
+					else
+					{
+						$type = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($xml, 'type="', '"'));
+					}
+
+					// check if the value is set
+					if (ComponentbuilderHelper::checkString($type))
+					{
+						// add the value
+						return $type;
+					}
+					// exit foreach loop
+					break;
+				}
+			}
+		}
+		// fall back to text
+		return 'text';
+	}
+
+	/**
+	 * Get the field's actual name
+	 * 
+	 * @param   object   $field         The field object
+	 * @param   string   $listViewName  The list view name
+	 * 
+	 * @return  string   Success returns field name
+	 * 
+	 */
+	public function getFieldName(&$field, $listViewName = null)
+	{
+		// return the unique name if already set
+		if (ComponentbuilderHelper::checkString($listViewName) && isset($field['hash']) && isset($this->uniqueFieldNames[$listViewName . $field['hash']]))
+		{
+			return $this->uniqueFieldNames[$listViewName . $field['hash']];
+		}
+		// set the type name
+		$type_name = ComponentbuilderHelper::safeString($field['settings']->type_name);
+		// set the name of the field
+		$name = ComponentbuilderHelper::safeString($field['settings']->name);
+		// check that we have the poperties
+		if (ComponentbuilderHelper::checkArray($field['settings']->properties))
+		{
+			foreach ($field['settings']->properties as $property)
+			{
+				if ($property['name'] === 'name')
+				{
+					// if category then name must be catid (only one per view)
+					if ($type_name === 'category')
+					{
+						// quick check if this is a category linked to view page
+						$requeSt_id = ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"');
+						if (strpos($requeSt_id, '_request_id') !== false || strpos($requeSt_id, '_request_catid') !== false)
+						{
+							// keep it then, don't change
+							$name = $requeSt_id;
+						}
+						else
+						{
+							$name = 'catid';
+						}
+						// if list view name is set
+						if (ComponentbuilderHelper::checkString($listViewName))
+						{
+							// check if we should use another Text Name as this views name
+							$otherName = ComponentbuilderHelper::getBetween($field['settings']->xml, 'othername="', '"');
+							$otherViews = ComponentbuilderHelper::getBetween($field['settings']->xml, 'views="', '"');
+							$otherView = ComponentbuilderHelper::getBetween($field['settings']->xml, 'view="', '"');
+							if (ComponentbuilderHelper::checkString($otherName) && ComponentbuilderHelper::checkString($otherViews) && ComponentbuilderHelper::checkString($otherView))
+							{
+								$this->catOtherName[$listViewName] = array(
+									'name' => ComponentbuilderHelper::safeString($otherName),
+									'views' => ComponentbuilderHelper::safeString($otherViews),
+									'view' => ComponentbuilderHelper::safeString($otherView)
+								);
+							}
+						}
+					}
+					// if tag is set then enable all tag options for this view (only one per view)
+					elseif ($type_name === 'tag')
+					{
+						$name = 'tags';
+					}
+					// if the field is set as alias it must be called alias
+					elseif (isset($field['alias']) && $field['alias'])
+					{
+						$name = 'alias';
+					}
+					else
+					{
+						// get value from xml
+						$xml = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'));
+						// check if a value was found
+						if (ComponentbuilderHelper::checkString($xml))
+						{
+							$name = $xml;
+						}
+					}
+					// exit foreach loop
+					break;
+				}
+			}
+		}
+		// return the value unique
+		if (ComponentbuilderHelper::checkString($listViewName) && isset($field['hash']))
+		{
+			$this->uniqueFieldNames[$listViewName . $field['hash']] = $this->uniqueName($name, $listViewName);
+			// now return the unique name
+			return $this->uniqueFieldNames[$listViewName . $field['hash']];
+		}
+		// fall back to global
+		return $name;
+	}
+
+	/**
+	 * Count how many times the same field is used per view
+	 *
+	 * @param   string   $name The name of the field
+	 * @param   string   $view The name of the view
+	 *
+	 * @return  void
+	 *
+	 */
+	protected function setUniqueNameCounter($name, $view)
+	{
+		if (!isset($this->uniqueNames[$view]))
+		{
+			$this->uniqueNames[$view] = array();
+			$this->uniqueNames[$view]['counter'] = array();
+			$this->uniqueNames[$view]['names'] = array();
+		}
+		if (!isset($this->uniqueNames[$view]['counter'][$name]))
+		{
+			$this->uniqueNames[$view]['counter'][$name] = 1;
+			return;
+		}
+		// count how many times the field is used
+		$this->uniqueNames[$view]['counter'][$name] ++;
+		return;
+	}
+
+	/**
+	 * Naming each field with an unique name
+	 *
+	 * @param   string   $name The name of the field
+	 * @param   string   $view The name of the view
+	 *
+	 * @return  string   the name
+	 *
+	 */
+	protected function uniqueName($name, $view)
+	{
+		// only increment if the field name is used multiple times
+		if (isset($this->uniqueNames[$view]['counter'][$name]) && $this->uniqueNames[$view]['counter'][$name] > 1)
+		{
+			$counter = 1;
+			// set the unique name
+			$uniqueName = ComponentbuilderHelper::safeString($name . '_' . $counter);
+			while (isset($this->uniqueNames[$view]['names'][$uniqueName]))
+			{
+				// increment the number
+				$counter++;
+				// try again
+				$uniqueName = ComponentbuilderHelper::safeString($name . '_' . $counter);
+			}
+			// set the new name number
+			$this->uniqueNames[$view]['names'][$uniqueName] = $counter;
+			// return the unique name
+			return $uniqueName;
+		}
+		return $name;
+	}
+
 	/**
 	 * Set get Data
 	 * 
@@ -2139,55 +2484,38 @@ class Get
 						{
 							$result->php_calculation = $this->setDynamicValues(base64_decode($result->php_calculation));
 						}
-						// add php custom scripting (php_before_getitem)
+						// The array of the php scripts that should be added to the script builder
-						if ($result->add_php_before_getitem == 1 && ComponentbuilderHelper::checkString($result->php_before_getitem))
+						$phpSripts = array('php_before_getitem', 'php_after_getitem', 'php_before_getitems', 'php_after_getitems', 'php_getlistquery');
+						// load the php scripts
+						foreach ($phpSripts as $script)
 						{
-							if (!isset($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view_code]))
+							// add php script to the script builder
+							if (isset($result->{'add_' . $script}) && $result->{'add_' . $script} == 1 && isset($result->{$script}) && ComponentbuilderHelper::checkString($result->{$script}))
 							{
-								$this->customScriptBuilder[$this->target . '_php_before_getitem'][$view_code] = '';
+								// move all main gets out to the customscript builder
+								if ($result->gettype <= 2)
+								{
+									if (!isset($this->customScriptBuilder[$this->target . '_' . $script][$view_code]))
+									{
+										$this->customScriptBuilder[$this->target . '_' . $script][$view_code] = '';
+									}
+									$this->customScriptBuilder[$this->target . '_' . $script][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->{$script}));
+									// remove from local item
+									unset($result->{$script});
+									unset($result->{'add_' . $script});
+								}
+								else
+								{
+									// only for custom gets
+									$result->{$script} = $this->setDynamicValues(PHP_EOL . base64_decode($result->{$script}));
+								}
 							}
-							$this->customScriptBuilder[$this->target . '_php_before_getitem'][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->php_before_getitem));
+							else
-							unset($result->php_before_getitem);
-						}
-						// add php custom scripting (php_after_getitem)
-						if ($result->add_php_after_getitem == 1 && ComponentbuilderHelper::checkString($result->php_after_getitem))
-						{
-							if (!isset($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view_code]))
 							{
-								$this->customScriptBuilder[$this->target . '_php_after_getitem'][$view_code] = '';
+								// remove from local item
+								unset($result->{$script});
+								unset($result->{'add_' . $script});
 							}
-							$this->customScriptBuilder[$this->target . '_php_after_getitem'][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->php_after_getitem));
-							unset($result->php_after_getitem);
-						}
-						// add php custom scripting (php_before_getitems)
-						if ($result->add_php_before_getitems == 1 && ComponentbuilderHelper::checkString($result->php_before_getitems))
-						{
-							if (!isset($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view_code]))
-							{
-								$this->customScriptBuilder[$this->target . '_php_before_getitems'][$view_code] = '';
-							}
-							$this->customScriptBuilder[$this->target . '_php_before_getitems'][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->php_before_getitems));
-							unset($result->php_before_getitems);
-						}
-						// add php custom scripting (php_after_getitems)
-						if ($result->add_php_after_getitems == 1 && ComponentbuilderHelper::checkString($result->php_after_getitems))
-						{
-							if (!isset($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view_code]))
-							{
-								$this->customScriptBuilder[$this->target . '_php_after_getitems'][$view_code] = '';
-							}
-							$this->customScriptBuilder[$this->target . '_php_after_getitems'][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->php_after_getitems));
-							unset($result->php_after_getitems);
-						}
-						// add php custom scripting (php_getlistquery)
-						if ($result->add_php_getlistquery == 1 && ComponentbuilderHelper::checkString($result->php_getlistquery))
-						{
-							if (!isset($this->customScriptBuilder[$this->target . '_php_getlistquery'][$view_code]))
-							{
-								$this->customScriptBuilder[$this->target . '_php_getlistquery'][$view_code] = '';
-							}
-							$this->customScriptBuilder[$this->target . '_php_getlistquery'][$view_code] .= $this->setDynamicValues(PHP_EOL . base64_decode($result->php_getlistquery));
-							unset($result->php_getlistquery);
 						}
 						// set the getmethod code name
 						$result->key = ComponentbuilderHelper::safeString($view_code . ' ' . $result->name . ' ' . $result->id);
@@ -3091,22 +3419,22 @@ class Get
 				foreach ($addArray as $addTarget => $targetHere)
 				{
 					// set the add target data
-					$library->{'add'.$addTarget} = (isset($library->{'add'.$addTarget}) && ComponentbuilderHelper::checkJson($library->{'add'.$addTarget})) ? json_decode($library->{'add'.$addTarget}, true) : null;
+					$library->{'add' . $addTarget} = (isset($library->{'add' . $addTarget}) && ComponentbuilderHelper::checkJson($library->{'add' . $addTarget})) ? json_decode($library->{'add' . $addTarget}, true) : null;
-					if (ComponentbuilderHelper::checkArray($library->{'add'.$addTarget}))
+					if (ComponentbuilderHelper::checkArray($library->{'add' . $addTarget}))
 					{
 						if (isset($library->{$targetHere}) && ComponentbuilderHelper::checkArray($library->{$targetHere}))
 						{
-							foreach($library->{'add'.$addTarget} as $taget)
+							foreach ($library->{'add' . $addTarget} as $taget)
 							{
 								$library->{$targetHere}[] = $taget;
 							}
 						}
 						else
 						{
-							$library->{$targetHere} = array_values($library->{'add'.$addTarget});
+							$library->{$targetHere} = array_values($library->{'add' . $addTarget});
 						}
 					}
-					unset($library->{'add'.$addTarget});
+					unset($library->{'add' . $addTarget});
 				}
 				// add config fields only if needed
 				if ($library->how > 1)
@@ -3188,10 +3516,10 @@ class Get
 			// insure string is not broken
 			$content = str_replace('COM_###COMPONENT###', $this->langPrefix, $content);
 			// first get the Joomla.JText._()
-			if (in_array('Joomla'.'.JText._(', $langStringTargets))
+			if (in_array('Joomla' . '.JText._(', $langStringTargets))
 			{
-				$jsTEXT[] = ComponentbuilderHelper::getAllBetween($content, "Joomla".".JText._('", "'");
+				$jsTEXT[] = ComponentbuilderHelper::getAllBetween($content, "Joomla" . ".JText._('", "'");
-				$jsTEXT[] = ComponentbuilderHelper::getAllBetween($content, 'Joomla.'.'JText._("', '"');
+				$jsTEXT[] = ComponentbuilderHelper::getAllBetween($content, 'Joomla.' . 'JText._("', '"');
 				// combine into one array
 				$jsTEXT = ComponentbuilderHelper::mergeArrays($jsTEXT);
 				// we need to add a check to insure these JavaScript lang matchup
@@ -3203,10 +3531,10 @@ class Get
 				}
 			}
 			// now get the JText: :script()
-			if (in_array('JText:'.':script(', $langStringTargets))
+			if (in_array('JText:' . ':script(', $langStringTargets))
 			{
-				$scTEXT[] = ComponentbuilderHelper::getAllBetween($content, "JText:".":script('", "'");
+				$scTEXT[] = ComponentbuilderHelper::getAllBetween($content, "JText:" . ":script('", "'");
-				$scTEXT[] = ComponentbuilderHelper::getAllBetween($content, 'JText:'.':script("', '"');
+				$scTEXT[] = ComponentbuilderHelper::getAllBetween($content, 'JText:' . ':script("', '"');
 				// combine into one array
 				$scTEXT = ComponentbuilderHelper::mergeArrays($scTEXT);
 				// we need to add a check to insure these JavaScript lang matchup
@@ -3221,7 +3549,7 @@ class Get
 			foreach ($langStringTargets as $langStringTarget)
 			{
 				// need some special treatment here
-				if ($langStringTarget === 'Joomla'.'.JText._(' || $langStringTarget === 'JText:'.':script(')
+				if ($langStringTarget === 'Joomla' . '.JText._(' || $langStringTarget === 'JText:' . ':script(')
 				{
 					continue;
 				}
@@ -3679,7 +4007,7 @@ class Get
 		}
 		return $string;
 	}
-	
+
 	/**
 	 * Set the external code string & load it in to string
 	 * 
@@ -3691,29 +4019,43 @@ class Get
 	public function setExternalCodeString($string)
 	{
 		// check if content has custom code place holder
-		if (strpos($string, '[EXTERNA'.'LCODE=') !== false)
+		if (strpos($string, '[EXTERNA' . 'LCODE=') !== false)
 		{
 			// target content
 			$bucket = array();
-			$found = ComponentbuilderHelper::getAllBetween($string, '[EXTERNA'.'LCODE=', ']');
+			$found = ComponentbuilderHelper::getAllBetween($string, '[EXTERNA' . 'LCODE=', ']');
 			if (ComponentbuilderHelper::checkArray($found))
 			{
 				// build local bucket
 				foreach ($found as $target)
 				{
-					// check if the target is valid URL or path
+					// check if user has permission to use EXTERNAL code (we may add a custom access switch - use ADMIN for now)
-					if ((!filter_var($target, FILTER_VALIDATE_URL) === false && ComponentbuilderHelper::urlExists($target))
+					if ($this->user->authorise('core.admin', 'com_componentbuilder'))
-						|| (JPath::clean($target) === $target && JFile::exists($target)))
 					{
-						$this->getExternalCodeString($target, $bucket);
+						// check if the target is valid URL or path
+						if ((!filter_var($target, FILTER_VALIDATE_URL) === false && ComponentbuilderHelper::urlExists($target)) || (JPath::clean($target) === $target && JFile::exists($target)))
+						{
+							$this->getExternalCodeString($target, $bucket);
+						}
+						// give notice that target is not a valid url/path
+						else
+						{
+							// set key
+							$key = '[EXTERNA' . 'LCODE=' . $target . ']';
+							// set the notice
+							$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Warning</h3>'), 'Warning');
+							$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> is not a valid url/path!', $key), 'Warning');
+							$this->app->enqueueMessage('<hr />', 'Warning');
+							// remove the placeholder
+							$bucket[$key] = '';
+						}
 					}
-					// give notice that target is not a valid url/path
 					else
 					{
 						// set key
-						$key = '[EXTERNA'.'LCODE='.$target.']';
+						$key = '[EXTERNA' . 'LCODE=' . $target . ']';
 						// set the notice
-						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> is not a valid url/path!', $key), 'Warning');
+						$this->app->enqueueMessage(JText::sprintf('%s, you do not have permission to use <b>EXTERNALCODE</b> feature (so it was removed from the compilation), please contact you system administrator for more info!<br /><small>(admin access required)</small>', $this->user->get('name')), 'Error');
 						// remove the placeholder
 						$bucket[$key] = '';
 					}
@@ -3727,7 +4069,7 @@ class Get
 		}
 		return $string;
 	}
-	
+
 	/**
 	 * Get the External Code/String
 	 * 
@@ -3740,7 +4082,7 @@ class Get
 	protected function getExternalCodeString($target, &$bucket)
 	{
 		// set key
-		$key = '[EXTERNA'.'LCODE=' . $target . ']';
+		$key = '[EXTERNA' . 'LCODE=' . $target . ']';
 		// set URL key
 		$targetKey = trim($target);
 		// check if we already fetched this
@@ -3765,7 +4107,9 @@ class Get
 						// update local hash
 						$this->db->updateObject('#__componentbuilder_external_code', $object, 'target');
 						// give notice of the change
+						$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Warning</h3>'), 'Warning');
 						$this->app->enqueueMessage(JText::sprintf('The code/string from <b>%s</b> has been <b>changed</b> since the last compilation, please investigate to insure the changes are safe!', $key), 'Warning');
+						$this->app->enqueueMessage('<hr />', 'Warning');
 					}
 				}
 				else
@@ -3777,13 +4121,17 @@ class Get
 					// insert local hash
 					$this->db->insertObject('#__componentbuilder_external_code', $object);
 					// give notice the first time this is added
+					$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Notice</h3>'), 'Notice');
 					$this->app->enqueueMessage(JText::sprintf('The code/string from <b>%s</b> has been added for the <b>first time</b>, please investigate to insure the correct code/string was used!', $key), 'Notice');
+					$this->app->enqueueMessage('<hr />', 'Notice');
 				}
 			}
 			else
 			{
 				// set notice that we could not get a valid string from the target
+				$this->app->enqueueMessage(JText::_('<hr /><h3>External Code Warning</h3>'), 'Warning');
 				$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> returned an invalid string!', $key), 'Warning');
+				$this->app->enqueueMessage('<hr />', 'Warning');
 			}
 		}
 		// add to local bucket
@@ -3792,7 +4140,7 @@ class Get
 			$bucket[$key] = $this->externalCodeString[$targetKey];
 		}
 	}
-	
+
 	/**
 	 * We start set the custom code data & can load it in to string
 	 * 
@@ -4151,12 +4499,12 @@ class Get
 						// add the new lang placeholder to the db
 						$this->newLangStrings[$counterInsert] = array();
 						$this->newLangStrings[$counterInsert][] = $this->db->quote(json_encode(array($this->componentID))); // 'components'
-						$this->newLangStrings[$counterInsert][] = $this->db->quote($string);	 // 'entranslation'
+						$this->newLangStrings[$counterInsert][] = $this->db->quote($string);  // 'entranslation'
-						$this->newLangStrings[$counterInsert][] = $this->db->quote(1);	  // 'published'
+						$this->newLangStrings[$counterInsert][] = $this->db->quote(1);   // 'published'
-						$this->newLangStrings[$counterInsert][] = $this->db->quote($today);	 // 'created'
+						$this->newLangStrings[$counterInsert][] = $this->db->quote($today);  // 'created'
 						$this->newLangStrings[$counterInsert][] = $this->db->quote((int) $this->user->id);   // 'created_by'
-						$this->newLangStrings[$counterInsert][] = $this->db->quote(1);	  // 'version'
+						$this->newLangStrings[$counterInsert][] = $this->db->quote(1);   // 'version'
-						$this->newLangStrings[$counterInsert][] = $this->db->quote(1);	  // 'access'
+						$this->newLangStrings[$counterInsert][] = $this->db->quote(1);   // 'access'
 
 						$counterInsert++;
 
@@ -4690,7 +5038,7 @@ class Get
 							if ($_type == 2)
 							{
 								// load the last value
-								$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(0);	// 'hashendtarget'
+								$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(0); // 'hashendtarget'
 							}
 						}
 						// the record already exist so we must update instead
@@ -4805,14 +5153,14 @@ class Get
 							$this->newCustomCode[$pointer[$targetKey]] = array();
 							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote($path);   // 'path'
 							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote((int) $_type);  // 'type'
-							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(1);	// 'target'
+							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(1); // 'target'
 							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote($commentType);  // 'comment_type'
 							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote((int) $this->componentID); // 'component'
-							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(1);	// 'published'
+							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(1); // 'published'
 							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote($today);   // 'created'
 							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote((int) $this->user->id); // 'created_by'
-							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(1);	// 'version'
+							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(1); // 'version'
-							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(1);	// 'access'
+							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote(1); // 'access'
 							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote($hashtarget);  // 'hashtarget'
 							$this->newCustomCode[$pointer[$targetKey]][] = $this->db->quote((int) $lineNumber);  // 'fromline'
 						}
@@ -5079,6 +5427,13 @@ class Get
 	 */
 	public function setPlaceholders(&$data, &$placeholder, $action = 1)
 	{
+		// make sure the placeholders is an array
+		if (!ComponentbuilderHelper::checkArray($placeholder))
+		{
+			// This is an error, (TODO) actualy we need to add a kind of log here to know that this happened
+			return $data;
+		}
+		// continue with the work of replacement
 		if (1 == $action) // <-- just replace (default)
 		{
 			return str_replace(array_keys($placeholder), array_values($placeholder), $data);

admin/helpers/compiler/b_Structure.php

@@ -306,6 +306,13 @@ class Structure extends Get
 	 */
 	public $addCheckin = false;
 
+	/**
+	 * The Move Folders Switch
+	 * 
+	 * @var     boolean
+	 */
+	public $setMoveFolders = false;
+
 	/**
 	 * The array of last modified dates
 	 * 
@@ -313,6 +320,13 @@ class Structure extends Get
 	 */
 	protected $lastModifiedDate = array();
 
+	/**
+	 * The default view switch
+	 * 
+	 * @var     bool/string
+	 */
+	public $dynamicDashboard = false;
+
 	/**
 	 * Constructor
 	 */
@@ -342,6 +356,8 @@ class Structure extends Get
 			$this->setLibaries();
 			// set the Joomla Version Data
 			$this->joomlaVersionData = $this->setJoomlaVersionData();
+			// set the dashboard
+			$this->setDynamicDashboard();
 			// set the new folders
 			if (!$this->setFolders())
 			{
@@ -517,6 +533,84 @@ class Structure extends Get
 		}
 	}
 
+	/**
+	 * set the dynamic dashboard if set
+	 * 
+	 * @return  void
+	 * 
+	 */
+	private function setDynamicDashboard()
+	{
+		// only add the dynamic dashboard if all checks out
+		if (isset($this->componentData->dashboard_type) && 2 == $this->componentData->dashboard_type && isset($this->componentData->dashboard) && ComponentbuilderHelper::checkString($this->componentData->dashboard) && strpos($this->componentData->dashboard, '_') !== false)
+		{
+			// set the default view
+			$getter = explode('_', $this->componentData->dashboard);
+			if (count($getter) == 2 && is_numeric($getter[1]))
+			{
+				// the pointers
+				$t = ComponentbuilderHelper::safeString($getter[0], 'U');
+				$id = (int) $getter[1];
+				// the dynamic stuff
+				$targets = array('A' => 'admin_views', 'C' => 'custom_admin_views');
+				$names = array('A' => 'admin view', 'C' => 'custom admin view');
+				$types = array('A' => 'adminview', 'C' => 'customadminview');
+				$keys = array('A' => 'name_list', 'C' => 'code');
+				// check the target values
+				if (isset($targets[$t]) && $id > 0)
+				{
+					// set the type name
+					$type_names = ComponentbuilderHelper::safeString($targets[$t], 'w');
+					// set the dynamic dash
+					if (isset($this->componentData->{$targets[$t]}) && ComponentbuilderHelper::checkArray($this->componentData->{$targets[$t]}))
+					{
+						// search the target views
+						$dashboard = (array) array_filter($this->componentData->{$targets[$t]}, function($view) use($id, $t, $types)
+							{
+								if (isset($view[$types[$t]]) && $id == $view[$types[$t]])
+								{
+									return true;
+								}
+								return false;
+							});
+						// check if view was found (this should be true)
+						if (count($dashboard) && isset($dashboard[0]['settings']) && isset($dashboard[0]['settings']->{$keys[$t]}))
+						{
+							$this->dynamicDashboard = ComponentbuilderHelper::safeString($dashboard[0]['settings']->{$keys[$t]});
+						}
+						else
+						{
+							// set massage that something is wrong
+							$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> (<b>%s</b>) is not available in your component! Please insure to only used %s, for a dynamic dashboard, that are still linked to your component.', $names[$t], $this->componentData->dashboard, $type_names), 'Error');
+						}
+					}
+					else
+					{
+						// set massage that something is wrong
+						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> (<b>%s</b>) is not available in your component! Please insure to only used %s, for a dynamic dashboard, that are still linked to your component.', $names[$t], $this->componentData->dashboard, $type_names), 'Error');
+					}
+				}
+				else
+				{
+					// the target value is wrong
+					$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> value for the dynamic dashboard is invalid.', $this->componentData->dashboard), 'Error');
+				}
+			}
+			else
+			{
+				// the target value is wrong
+				$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> value for the dynamic dashboard is invalid.', $this->componentData->dashboard), 'Error');
+			}
+			// if default was changed to dynamic dashboard the remove default tab and methods
+			if (ComponentbuilderHelper::checkString($this->dynamicDashboard))
+			{
+				// dynamic dashboard is used
+				$this->componentData->dashboard_tab = '';
+				$this->componentData->php_dashboard_methods = '';
+			}
+		}
+	}
+
 	/**
 	 * Write data to file
 	 * 
@@ -682,6 +776,8 @@ class Structure extends Get
 			{
 				$README = true;
 			}
+			// set the standard folders
+			$stdFolders = array('site', 'admin', 'media');
 			// start moving
 			foreach ($this->joomlaVersionData->move->static as $ftem => $details)
 			{
@@ -717,41 +813,59 @@ class Structure extends Get
 				$zipPath = str_replace('c0mp0n3nt/', '', $details->path);
 				$path = str_replace('c0mp0n3nt/', $this->componentPath . '/', $details->path);
 				// set the template folder path
-				$templatePath = (isset($details->custom) && $details->custom) ? (($details->custom !== 'full') ? $this->templatePathCustom.'/':'') : $this->templatePath.'/';
+				$templatePath = (isset($details->custom) && $details->custom) ? (($details->custom !== 'full') ? $this->templatePathCustom . '/' : '') : $this->templatePath . '/';
-				// now mov the file
+				// set the final paths
+				$currentFullPath = str_replace('//', '/', $templatePath . '/' . $item);
+				$packageFullPath = str_replace('//', '/', $path . '/' . $new);
+				$zipFullPath = str_replace('//', '/', $zipPath . '/' . $new);
+				// now move the file
 				if ($details->type === 'file')
 				{
-					if (!JFile::exists($templatePath . $item))
+					if (!JFile::exists($currentFullPath))
 					{
-						$this->app->enqueueMessage(JText::sprintf('The file path: <b>%s</b> does not exist, and was not added!', $templatePath . $item), 'Error');
+						$this->app->enqueueMessage(JText::sprintf('The file path: <b>%s</b> does not exist, and was not added!', $currentFullPath), 'Error');
 					}
 					else
 					{
 						// move the file to its place
-						JFile::copy($templatePath . $item, $path . '/' . $new);
+						JFile::copy($currentFullPath, $packageFullPath);
 						// count the file created
 						$this->fileCount++;
 						// store the new files
 						if (!in_array($ftem, $this->notNew))
 						{
-							$this->newFiles['static'][] = array('path' => $path . '/' . $new, 'name' => $new, 'zip' => $zipPath . '/' . $new);
+							$this->newFiles['static'][] = array('path' => $packageFullPath, 'name' => $new, 'zip' => $zipFullPath);
 						}
 					}
 				}
 				elseif ($details->type === 'folder')
 				{
-					if (!JFolder::exists($templatePath . $item))
+					if (!JFolder::exists($currentFullPath))
 					{
-						$this->app->enqueueMessage(JText::sprintf('The folder path: <b>%s</b> does not exist, and was not added!', $templatePath . $item), 'Error');
+						$this->app->enqueueMessage(JText::sprintf('The folder path: <b>%s</b> does not exist, and was not added!', $currentFullPath), 'Error');
 					}
 					else
 					{
 						// move the folder to its place
-						JFolder::copy($templatePath . $item, $path . '/' . $new);
+						JFolder::copy($currentFullPath, $packageFullPath);
 						// count the folder created
 						$this->folderCount++;
 					}
 				}
+				// check if we should add the dynamic folder moving script to the installer script
+				if (!$this->setMoveFolders)
+				{
+					$checker = explode('/', $zipFullPath);
+					// TODO <-- this may not be the best way, will keep an eye on this.
+					// We basicly only want to check if a folder is added that is not in the stdFolders array
+					if (isset($checker[0]) && ComponentbuilderHelper::checkString($checker[0]) && !in_array($checker[0], $stdFolders))
+					{
+						// add the setDynamicF0ld3rs() method to the install scipt.php file
+						$this->setMoveFolders = true;
+						// set message that this was done (will still add a tutorial link later)
+						$this->app->enqueueMessage(JText::sprintf('<p><b>Dynamic folder/s were detected.</b><br />A method (setDynamicF0ld3rs) was added to the install <b>script.php</b> of this package to insure that the folder/s are copied into the correct place when this componet is installed!</p>'), 'Notice');
+					}
+				}
 			}
 			return true;
 		}
@@ -770,9 +884,12 @@ class Structure extends Get
 		$front = false;
 		if ((isset($this->joomlaVersionData->move->dynamic) && ComponentbuilderHelper::checkObject($this->joomlaVersionData->move->dynamic)) && (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views)))
 		{
-			// setup dashboard
+			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
-			$target = array('admin' => $this->componentData->name_code);
+			{
-			$this->buildDynamique($target, 'dashboard');
+				// setup dashboard
+				$target = array('admin' => $this->componentData->name_code);
+				$this->buildDynamique($target, 'dashboard');
+			}
 			// now the rest of the views
 			foreach ($this->componentData->admin_views as $nr => $view)
 			{
@@ -1125,9 +1242,11 @@ class Structure extends Get
 					$custom['path'] = trim($custom['path'], '/');
 				}
 				// set full path if this is a full path folder
-				if(!isset($custom['folder']) && isset($custom['folderpath']))
+				if (!isset($custom['folder']) && isset($custom['folderpath']))
 				{
-					$custom['folder'] = '/'.trim($custom['folderpath'], '/');
+					$custom['folder'] = '/' . trim($custom['folderpath'], '/');
+					// update the dynamic path
+					$custom['folder'] = $this->updateDynamicPath($custom['folder']);
 					// remove the file path
 					unset($custom['folderpath']);
 					// triget fullpath
@@ -1234,9 +1353,11 @@ class Structure extends Get
 			{
 				$customPath = 'custom';
 				// set full path if this is a full path file
-				if(!isset($custom['file']) && isset($custom['filepath']))
+				if (!isset($custom['file']) && isset($custom['filepath']))
 				{
-					$custom['file'] = '/'.trim($custom['filepath'], '/');
+					$custom['file'] = '/' . trim($custom['filepath'], '/');
+					// update the dynamic path
+					$custom['file'] = $this->updateDynamicPath($custom['file']);
 					// remove the file path
 					unset($custom['filepath']);
 					// triget fullpath
@@ -1312,6 +1433,19 @@ class Structure extends Get
 		}
 	}
 
+	/**
+	 * Update paths with real value
+	 * 
+	 * @param   string   $path  The full path
+	 *
+	 * @return  string   The updated path
+	 * 
+	 */
+	protected function updateDynamicPath($path)
+	{
+		return $this->setPlaceholders($path, ComponentbuilderHelper::$constantPaths);
+	}
+
 	/**
 	 * Remove folders with files
 	 * 
@@ -1325,4 +1459,5 @@ class Structure extends Get
 	{
 		return ComponentbuilderHelper::removeFolder($dir, $ignore);
 	}
+
 }

admin/helpers/compiler/f_Infusion.php

@@ -753,20 +753,32 @@ class Infusion extends Interpretation
 			// ###UPDATE_VERSION_MYSQL###
 			$this->setVersionController();
 
-			// ###DASHBOARDICONS###
+			// only set these if default dashboard it used
-			$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONS###'] = $this->setDashboardIcons();
+			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
+			{
+				// ###DASHBOARDVIEW###
+				$this->fileContentStatic['###DASHBOARDVIEW###'] = $this->fileContentStatic['###component###'];
 
-			// ###DASHBOARDICONACCESS###
+				// ###DASHBOARDICONS###
-			$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONACCESS###'] = $this->setDashboardIconAccess();
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONS###'] = $this->setDashboardIcons();
 
-			// ###DASH_MODEL_METHODS###
+				// ###DASHBOARDICONACCESS###
-			$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_MODEL_METHODS###'] = $this->setDashboardModelMethods();
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASHBOARDICONACCESS###'] = $this->setDashboardIconAccess();
 
-			// ###DASH_GET_CUSTOM_DATA###
+				// ###DASH_MODEL_METHODS###
-			$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_GET_CUSTOM_DATA###'] = $this->setDashboardGetCustomData();
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_MODEL_METHODS###'] = $this->setDashboardModelMethods();
 
-			// ###DASH_DISPLAY_DATA###
+				// ###DASH_GET_CUSTOM_DATA###
-			$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_DISPLAY_DATA###'] = $this->setDashboardDisplayData();
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_GET_CUSTOM_DATA###'] = $this->setDashboardGetCustomData();
+
+				// ###DASH_DISPLAY_DATA###
+				$this->fileContentDynamic[$this->fileContentStatic['###component###']]['###DASH_DISPLAY_DATA###'] = $this->setDashboardDisplayData();
+			}
+			else
+			{
+				// ###DASHBOARDVIEW###
+				$this->fileContentStatic['###DASHBOARDVIEW###'] = $this->dynamicDashboard;
+			}
 
 			// add import
 			if (isset($this->addEximport) && $this->addEximport)
@@ -1026,6 +1038,12 @@ class Infusion extends Interpretation
 			// ###UNINSTALLSCRIPT###
 			$this->fileContentStatic['###UNINSTALLSCRIPT###'] = $this->setUninstallScript();
 
+			// ###MOVEFOLDERSSCRIPT###
+			$this->fileContentStatic['###MOVEFOLDERSSCRIPT###'] = $this->setMoveFolderScript();
+
+			// ###MOVEFOLDERSMETHOD###
+			$this->fileContentStatic['###MOVEFOLDERSMETHOD###'] = $this->setMoveFolderMethod();
+
 			// ###HELPER_UIKIT###
 			$this->fileContentStatic['###HELPER_UIKIT###'] = $this->setUikitHelperMethods();
 

admin/helpers/componentbuilder.php

@@ -986,6 +986,57 @@ abstract class ComponentbuilderHelper
 	**/
 	public static $snippetPath = 'https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder-Snippets/master/';
 	public static $snippetsPath = 'https://api.github.com/repos/vdm-io/Joomla-Component-Builder-Snippets/git/trees/master';
+	
+	/**
+	 * The array of constant paths
+	 * 
+	 * JPATH_SITE is meant to represent the root path of the JSite application,
+	 * just as JPATH_ADMINISTRATOR is mean to represent the root path of the JAdministrator application.
+	 * 
+	 *    JPATH_BASE is the root path for the current requested application.... so if you are in the administrator application:
+	 * 
+	 *    JPATH_BASE == JPATH_ADMINISTRATOR
+	 * 
+	 * If you are in the site application:
+	 * 
+	 *    JPATH_BASE == JPATH_SITE
+	 * 
+	 * If you are in the installation application:
+	 * 
+	 *    JPATH_BASE == JPATH_INSTALLATION.
+	 * 
+	 *    JPATH_ROOT is the root path for the Joomla install and does not depend upon any application.
+	 * 
+	 * @var     array
+	 */
+	public static $constantPaths = array(
+		// The path to the administrator folder.
+		'JPATH_ADMINISTRATOR' => JPATH_ADMINISTRATOR,
+		// The path to the installed Joomla! site, or JPATH_ROOT/administrator if executed from the backend.
+		'JPATH_BASE' => JPATH_BASE,
+		// The path to the cache folder.
+		'JPATH_CACHE' => JPATH_CACHE,
+		// The path to the administration folder of the current component being executed.
+		'JPATH_COMPONENT_ADMINISTRATOR' => JPATH_COMPONENT_ADMINISTRATOR,
+		// The path to the site folder of the current component being executed.
+		'JPATH_COMPONENT_SITE' => JPATH_COMPONENT_SITE,
+		// The path to the current component being executed.
+		'JPATH_COMPONENT' => JPATH_COMPONENT,
+		// The path to folder containing the configuration.php file.
+		'JPATH_CONFIGURATION' => JPATH_CONFIGURATION,
+		// The path to the installation folder.
+		'JPATH_INSTALLATION' => JPATH_INSTALLATION,
+		// The path to the libraries folder.
+		'JPATH_LIBRARIES' => JPATH_LIBRARIES,
+		// The path to the plugins folder.
+		'JPATH_PLUGINS' => JPATH_PLUGINS,
+		// The path to the installed Joomla! site.
+		'JPATH_ROOT' => JPATH_ROOT,
+		// The path to the installed Joomla! site.
+		'JPATH_SITE' => JPATH_SITE,
+		// The path to the templates folder.
+		'JPATH_THEMES' => JPATH_THEMES
+	);
 
 	/**
 	*	Get the snippet contributor details
@@ -1503,16 +1554,19 @@ abstract class ComponentbuilderHelper
 	}
 
 	/**
-	* 	get the localkey
+	* 	the basic localkey
 	**/
 	protected static $localkey = false;
-	
+
+	/**
+	* 	get the localkey
+	**/	
 	public static function getLocalKey()
 	{
 		if (!self::$localkey)
 		{
-			// get the main key
+			// get the basic key
-			self::$localkey = md5(JComponentHelper::getParams('com_componentbuilder')->get('basic_key', 'localKey34fdWEkl'));
+			self::$localkey = md5(self::getCryptKey('basic', 'localKey34fdWEkl'));
 		}
 		return self::$localkey;
 	}
@@ -1585,8 +1639,18 @@ abstract class ComponentbuilderHelper
 		}
 		return false;
 	}
-	
+
-	public static function getBetween($content,$start,$end)
+	/**
+	*	get between
+	* 
+	*	@param  string          $content    The content to search
+	*	@param  string          $start        The starting value
+	*	@param  string          $end         The ending value
+	*
+	*	@return  string          On success / empty string on failure 
+	* 
+	*/
+	public static function getBetween($content, $start, $end)
 	{
 		$r = explode($start, $content);
 		if (isset($r[1]))
@@ -1596,17 +1660,32 @@ abstract class ComponentbuilderHelper
 		}
 		return '';
 	}
-	
+
-	public static function getAllBetween($content,$start,$end)
+	/**
+	* 	get all between
+	* 
+	*	@param  string          $content    The content to search
+	*	@param  string          $start        The starting value
+	*	@param  string          $end         The ending value
+	*
+	*	@return  array          On success
+	* 
+	*/
+	public static function getAllBetween($content, $start, $end)
 	{
-		$buket = array();
+		// reset bucket
+		$bucket = array();
 		for ($i = 0; ; $i++)
 		{
+			// search for string
 			$found = self::getBetween($content,$start,$end);
 			if (self::checkString($found))
 			{
-				$buket[] = $found;
+				// add to bucket
+				$bucket[] = $found;
+				// build removal string
 				$remove = $start.$found.$end;
+				// remove from content
 				$content = str_replace($remove,'',$content);
 			}
 			else
@@ -1619,9 +1698,10 @@ abstract class ComponentbuilderHelper
 				break;
 			}
 		}
-		return  array_unique($buket);
+		// only return unique array of values
+		return  array_unique($bucket);
 	}
-	
+
 	public static function typeField($type,$option = 'default')
 	{
 		// list of default fields
@@ -1984,7 +2064,7 @@ abstract class ComponentbuilderHelper
 		if (!self::$composer)
 		{
 			// load the autoloader
-			require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/vendor/autoload.php';
+			require_once JPATH_SITE.'/libraries/vdm_io/vendor/autoload.php';
 			// do not load again
 			self::$composer = true;
 		}
@@ -2094,7 +2174,7 @@ abstract class ComponentbuilderHelper
 				if (!class_exists('\phpseclib\Net\SFTP'))
 				{
 					// class not in place so send out error
-					JFactory::getApplication()->enqueueMessage(JText::_('COM_COMPONENTBUILDER_THE_BPHPSECLIBNETSFTPB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_ADMINHELPERSVENDOR_FOLDER_OF_JCB_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO'), 'Error');
+					JFactory::getApplication()->enqueueMessage(JText::_('COM_COMPONENTBUILDER_THE_BPHPSECLIBNETSFTPB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO'), 'Error');
 					return false;
 				}
 				// insure the port is set
@@ -2409,6 +2489,41 @@ abstract class ComponentbuilderHelper
 		JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_THE_SERVER_DETAILS_FOR_BID_SB_COULD_NOT_BE_RETRIEVED', $serverID), 'Error');
 		return false;
 	}
+
+	/**
+	* 	the Crypt objects
+	**/
+	protected static $CRYPT = array();
+
+	/**
+	* 	get the Crypt object
+	* 	
+	* 	@return  object on success with Crypt power
+	**/
+	public static function crypt($TYPE)
+	{
+		// check if it was already set
+		if (isset(self::$CRYPT[$TYPE]) && self::checkObject(self::$CRYPT[$TYPE]))
+		{
+			return self::$CRYPT[$TYPE];
+		}
+		// make sure we have the composer classes loaded
+		self::composerAutoload();
+		// build class name
+		$CLASS = '\phpseclib\Crypt\\'.$TYPE;
+		// make sure we have the phpseclib classes
+		if (!class_exists($CLASS))
+		{
+			// class not in place so send out error
+			JFactory::getApplication()->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_THE_BSB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO', $CLASS), 'Error');
+			return false;
+		}
+		// set the 
+		self::$CRYPT[$TYPE] = new $CLASS();
+		// return the object
+		return self::$CRYPT[$TYPE];
+	}
+
 	/**
 	*	Load the Component xml manifest.
 	**/
@@ -2417,12 +2532,12 @@ abstract class ComponentbuilderHelper
 		$manifestUrl = JPATH_ADMINISTRATOR."/components/com_componentbuilder/componentbuilder.xml";
 		return simplexml_load_file($manifestUrl);
 	}
-	
+
 	/**
 	*	Joomla version object
 	**/	
 	protected static $JVersion;
-	
+
 	/**
 	*	set/get Joomla version
 	**/
@@ -3306,7 +3421,7 @@ abstract class ComponentbuilderHelper
 		}
 		return $model;
 	}
-	
+
 	/**
 	*	Add to asset Table
 	*/
@@ -3368,7 +3483,7 @@ abstract class ComponentbuilderHelper
 		}
 		return false;
 	}
-	
+
 	/**
 	 *	Gets the default asset Rules for a component/view.
 	 */
@@ -3444,7 +3559,14 @@ abstract class ComponentbuilderHelper
 		return $button->input;
 
 	}
-	
+
+	/**
+	*	Check if have an json string
+	*
+	*	@input	string   The json string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkJson($string)
 	{
 		if (self::checkString($string))
@@ -3455,15 +3577,29 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
+	/**
+	*	Check if have an object with a length
+	*
+	*	@input	object   The object to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkObject($object)
 	{
-		if (isset($object) && is_object($object) && count($object) > 0)
+		if (isset($object) && is_object($object))
 		{
-			return true;
+			return count((array)$object) > 0;
 		}
 		return false;
 	}
 
+	/**
+	*	Check if have an array with a length
+	*
+	*	@input	array   The array to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkArray($array, $removeEmptyString = false)
 	{
 		if (isset($array) && is_array($array) && count($array) > 0)
@@ -3485,6 +3621,13 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
+	/**
+	*	Check if have a string with a length
+	*
+	*	@input	string   The string to check
+	*
+	*	@returns bool true on success
+	**/
 	public static function checkString($string)
 	{
 		if (isset($string) && is_string($string) && strlen($string) > 0)
@@ -3493,7 +3636,7 @@ abstract class ComponentbuilderHelper
 		}
 		return false;
 	}
-	
+
 	/**
 	*	Check if we are connected
 	*	Thanks https://stackoverflow.com/a/4860432/1429677
@@ -3519,6 +3662,13 @@ abstract class ComponentbuilderHelper
 		return $is_conn;
 	}
 
+	/**
+	*	Merge an array of array's
+	*
+	*	@input	array   The arrays you would like to merge
+	*
+	*	@returns array on success
+	**/
 	public static function mergeArrays($arrays)
 	{
 		if(self::checkArray($arrays))
@@ -3542,6 +3692,13 @@ abstract class ComponentbuilderHelper
 		return self::shorten($string, $length, $addTip);
 	}
 
+	/**
+	*	Shorten a string
+	*
+	*	@input	string   The you would like to shorten
+	*
+	*	@returns string on success
+	**/
 	public static function shorten($string, $length = 40, $addTip = true)
 	{
 		if (self::checkString($string))
@@ -3576,6 +3733,13 @@ abstract class ComponentbuilderHelper
 		return $string;
 	}
 
+	/**
+	*	Making strings safe (various ways)
+	*
+	*	@input	string   The you would like to make safe
+	*
+	*	@returns string on success
+	**/
 	public static function safeString($string, $type = 'L', $spacer = '_', $replaceNumbers = true)
 	{
 		if ($replaceNumbers === true)
@@ -3703,7 +3867,7 @@ abstract class ComponentbuilderHelper
 		// return the string with no numbers remaining.
 		return $string;
 	}
-	
+
 	/**
 	*	Convert an integer into an English word string
 	*	Thanks to Tom Nicholson <http://php.net/manual/en/function.strval.php#41988>
@@ -3813,18 +3977,29 @@ abstract class ComponentbuilderHelper
 		return implode($key);
 	}
 
-	public static function getCryptKey($type, $default = null)
+	/**
+	 *	Get The Encryption Keys
+	 *
+	 *	@param  string        $type     The type of key
+	 *	@param  string/bool   $default  The return value if no key was found
+	 *
+	 *	@return  string   On success
+	 *
+	 **/
+	public static function getCryptKey($type, $default = false)
 	{
+		// Get the global params
+		$params = JComponentHelper::getParams('com_componentbuilder', true);
+		// Basic Encryption Type
 		if ('basic' === $type)
 		{
-			// Get the global params
-			$params = JComponentHelper::getParams('com_componentbuilder', true);
 			$basic_key = $params->get('basic_key', $default);
-			if ($basic_key)
+			if (self::checkString($basic_key))
 			{
 				return $basic_key;
 			}
 		}
-		return false;
+
+		return $default;
 	}
 }

admin/language/en-GB/en-GB.com_componentbuilder.ini

@@ -2001,13 +2001,50 @@ COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_DATE_DESC="The date this C
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NEW="A New Component Files & Folders"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_DESCRIPTION="You can add custom files to the component, simply add the files to the administrator/components/com_componentbuilder/custom folder and then select them here."
-COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION="You can add any files to the component, by using the full system path. Example: /home/user/folder/file.php (make sure that php has permission to read the file)"
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION="You can add any files to the component, by using the full system path. Example: /home/user/folder/file.php (make sure that php has permission to read the file)<br /><b>Please note</b> that you can also <b>use constant paths in your full path</b> (directly without quotes), this is highly recommended to insure portability.<br />To see a list of constant paths please read the notes below. Example: JPATH_ROOT/file.php or JPATH_ROOT/components/com_yourcomponentname/helpers/file.php"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_LABEL="Adding Files"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_LABEL="Adding Custom Files"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_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_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION="You can any folders to the component, by using the full system path. Example: /home/user/folder (make sure that php has permission to read the folder)"
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION="You can any folders to the component, by using the full system path. Example: /home/user/folder (make sure that php has permission to read the folder)<br /><b>Please note</b> that you can also <b>use constant paths in your full path</b> (directly without quotes), this is highly recommended to insure portability.<br />To see a list of constant paths please read the notes below. Example: JPATH_ROOT/folder or JPATH_ROOT/components/com_yourcomponentname/helpers/folder"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_LABEL="Adding Folders"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_LABEL="Adding Custom Folders"
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_DESCRIPTION="<p>// The path to the administrator folder.<br />
+<b>JPATH_ADMINISTRATOR</b><br />
+// The path to the installed Joomla! site, or JPATH_ROOT/administrator if executed from the backend.<br />
+<b>JPATH_BASE</b><br />
+// The path to the cache folder.<br />		
+<b>JPATH_CACHE</b><br />
+// The path to the administration folder of the current component being executed.<br />		
+<b>JPATH_COMPONENT_ADMINISTRATOR</b><br />
+// The path to the site folder of the current component being executed.<br />		
+<b>JPATH_COMPONENT_SITE</b><br />
+// The path to the current component being executed.<br />		
+<b>JPATH_COMPONENT</b><br />
+// The path to folder containing the configuration.php file.<br />		
+<b>JPATH_CONFIGURATION</b><br />
+// The path to the installation folder.<br />		
+<b>JPATH_INSTALLATION</b><br />
+// The path to the libraries folder.<br />		
+<b>JPATH_LIBRARIES</b><br />
+// The path to the plugins folder.<br />		
+<b>JPATH_PLUGINS</b><br />
+// The path to the installed Joomla! site.<br />		
+<b>JPATH_ROOT</b><br />
+// The path to the installed Joomla! site.<br />		
+<b>JPATH_SITE</b><br />
+// The path to the templates folder.<br />		
+<b>JPATH_THEMES</b></p>
+
+<p>JPATH_SITE is meant to represent the root path of the JSite application,<br />
+just as JPATH_ADMINISTRATOR is mean to represent the root path of the JAdministrator application.<br />
+JPATH_BASE is the root path for the current requested application.... so if you are in the administrator application:<br />
+JPATH_BASE == JPATH_ADMINISTRATOR<br />
+If you are in the site application:<br />
+JPATH_BASE == JPATH_SITE<br />
+If you are in the installation application:<br />
+JPATH_BASE == JPATH_INSTALLATION.<br />
+JPATH_ROOT is the root path for the Joomla install and does not depend upon any application.</p>"
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_LABEL="Constant Paths"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION="Should file be updated."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL="Update"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ORDERING_LABEL="Ordering"
@@ -2221,8 +2258,8 @@ COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_HINT="JCB_Backup_[YEAR]_[MONTH]_
 COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_LABEL="Package Name"
 COM_COMPONENTBUILDER_CONFIG_BACKUP_PACKAGE_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_DESC="Set the basic local key here."
-COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_LABEL="Basic Key <small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_LABEL="Basic Key"
-COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_NOTE_DESC="When using the basic encryption please use a 32 character passphrase.<br />Never change this passphrase once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>"
+COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_NOTE_DESC="When using the basic encryption please use set a 32 character passphrase.<br />Never change this passphrase once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>"
 COM_COMPONENTBUILDER_CONFIG_BASIC_KEY_NOTE_LABEL="Basic Encryption"
 COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_DESC="Set the intervals for the auto checkin fuction of tables that checks out the items to an user."
 COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_LABEL="Check in timer"
@@ -2233,6 +2270,8 @@ COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_SIX="Never"
 COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_THREE="Once a day"
 COM_COMPONENTBUILDER_CONFIG_CHECK_TIMER_OPTION_TWO="Every twelve hours"
 COM_COMPONENTBUILDER_CONFIG_COMPANY="Company"
+COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_DESCRIPTION="Select the method to use when building the xml fields in the compiler. The <b>SimpleXMLElement Class</b> is best practice, and <b>String Manipulation</b> is faster and works without special extensions."
+COM_COMPONENTBUILDER_CONFIG_COMPILER_FIELD_BUILDER_TYPE_LABEL="Field Builder Type<br /><small>(in compiler)</small>"
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_DESCRIPTION="Here you can set the path to the compiler folder"
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_HINT="/home/user/compiler"
 COM_COMPONENTBUILDER_CONFIG_COMPILER_FOLDER_PATH_LABEL="Compiler Folder Path"
@@ -2400,6 +2439,7 @@ COM_COMPONENTBUILDER_CONFIG_SENDMAIL_HINT="/usr/sbin/sendmail"
 COM_COMPONENTBUILDER_CONFIG_SENDMAIL_LABEL="Sendmail Path"
 COM_COMPONENTBUILDER_CONFIG_SET_BROWSER_STORAGE_DESCRIPTION="Select if browser storage should be used to save on Ajax calls and speed up this components site pages."
 COM_COMPONENTBUILDER_CONFIG_SET_BROWSER_STORAGE_LABEL="Browser Storage"
+COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS="SimpleXMLElement Class"
 COM_COMPONENTBUILDER_CONFIG_SMTP="SMTP"
 COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_DESCRIPTION="Select yes if your SMTP host requires SMTP Authentication."
 COM_COMPONENTBUILDER_CONFIG_SMTPAUTH_LABEL="SMTP Authentication"
@@ -2419,6 +2459,7 @@ COM_COMPONENTBUILDER_CONFIG_SMTPUSER_LABEL="SMTP Username"
 COM_COMPONENTBUILDER_CONFIG_SSL="SSL"
 COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_DESCRIPTION="How long should the data that is stored in the browser memory remain unchanged before it is removed and updated."
 COM_COMPONENTBUILDER_CONFIG_STORAGE_TIME_TO_LIVE_LABEL="Update Cycle"
+COM_COMPONENTBUILDER_CONFIG_STRING_MANIPULATION="String Manipulation"
 COM_COMPONENTBUILDER_CONFIG_TLS="TLS"
 COM_COMPONENTBUILDER_CONFIG_UIKIT_DESC="<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
 for developing fast and powerful web interfaces. For more info visit <a href="https://getuikit.com/v2/" target="_blank">https://getuikit.com/v2/</a>"
@@ -3144,6 +3185,7 @@ COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES="Fieldtypes<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPES_CATID="Category &nbsp;For<br />Fieldtypes"
 COM_COMPONENTBUILDER_DASHBOARD_FIELDTYPE_ADD="Add&nbsp;Fieldtype<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_FIELD_ADD="Add&nbsp;Field<br /><br />"
+COM_COMPONENTBUILDER_DASHBOARD_GETSNIPPETS="Get Snippets<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENTS="Help Documents<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_HELP_DOCUMENT_ADD="Add&nbsp;Help Document<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_JOOMLA_COMPONENTS="Joomla Components<br /><br />"
@@ -3681,9 +3723,8 @@ COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER="Add Javascript Views Foo
 COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL="Add JavaScript (views-footer)"
 COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER="Add Javascript View Footer"
 COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript (view-footer)"
-COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_WHMCSKEY="Advance Encryption (WHMCS-key)"
 COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR="base64"
-COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALKEY="Basic Encryption (local-key)"
+COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY="Basic Encryption (local-DB-key)"
 COM_COMPONENTBUILDER_FIELD_BIGINT="BIGINT"
 COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELD_CATID_LABEL="Category"
@@ -3752,6 +3793,7 @@ COM_COMPONENTBUILDER_FIELD_JSON="JSON"
 COM_COMPONENTBUILDER_FIELD_KEY="KEY"
 COM_COMPONENTBUILDER_FIELD_LONGTEXT="LONGTEXT"
 COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT="MEDIUMTEXT"
+COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY="Medium Encryption (local-file-key)"
 COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC="The last user that modified this Field."
 COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_DESC="The date this Field was modified."
@@ -3792,8 +3834,10 @@ COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="<div class='form
 <div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>
 </div>
 </div>"
-COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_DESCRIPTION="When using the VDM encryption you need to get a VDM public key from https://www.vdm.io/ "
+COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION="<p>When using the WHMCS encryption you need to get a WHMCS key from:<br /><a href='https://www.vdm.io/support' target='_blank'>https://www.vdm.io</a>, or your own WHMCS install.</p><p>Please note that you will need to <b>enable the add-on</b> in the Joomla Component area (Add WHMCS)->Yes.</p><p>You can get more info about the WHMCS licensing add-on at the following links.</p><p><b>Helpful Links:</b><br />
-COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_LABEL="The VDM Encryption"
+<a href='https://www.whmcs.com/addons/licensing-addon/' target='_blank'>https://www.whmcs.com/addons/licensing-addon/</a><br />
+<a href='http://docs.whmcs.com/Licensing_Addon/' target='_blank'>http://docs.whmcs.com/Licensing_Addon/</a></p>"
+COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL="The WHMCS Encryption"
 COM_COMPONENTBUILDER_FIELD_NOT_NULL="NOT NULL"
 COM_COMPONENTBUILDER_FIELD_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_FIELD_NULL="NULL"
@@ -3824,6 +3868,7 @@ COM_COMPONENTBUILDER_FIELD_UNIQUE_KEY="UNIQUE KEY"
 COM_COMPONENTBUILDER_FIELD_VARCHAR="VARCHAR"
 COM_COMPONENTBUILDER_FIELD_VERSION_DESC="A count of the number of times this Field has been revised."
 COM_COMPONENTBUILDER_FIELD_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION="WHMCS-key Encryption"
 COM_COMPONENTBUILDER_FIELD_XML="Xml"
 COM_COMPONENTBUILDER_FIELD_XML_DESCRIPTION="Text Area"
 COM_COMPONENTBUILDER_FIELD_XML_HINT="Field XML Go Here"
@@ -3831,8 +3876,10 @@ COM_COMPONENTBUILDER_FIELD_XML_LABEL="XML field definition (Please set the field
 COM_COMPONENTBUILDER_FIELD_YES="Yes"
 COM_COMPONENTBUILDER_FIELD_ZERO="0"
 COM_COMPONENTBUILDER_FILE="File"
+COM_COMPONENTBUILDER_FILE_BSB_WAS_NOT_MOVE_TO_S="File <b>%s</b> was not move to (%s)!"
 COM_COMPONENTBUILDER_FILTER="Filter"
 COM_COMPONENTBUILDER_FOLDER="Folder"
+COM_COMPONENTBUILDER_FOLDER_BSB_WAS_NOT_MOVE_TO_S="Folder <b>%s</b> was not move to (%s)!"
 COM_COMPONENTBUILDER_FORCE_LOCAL_UPDATE="Force Local Update"
 COM_COMPONENTBUILDER_FULL_WIDTH_IN_TAB="Full Width in Tab"
 COM_COMPONENTBUILDER_GENERAL_OVERVIEW_OF_HOW_THINGS_WORK_BSB="General overview of how things work: <b>%s</b>"
@@ -4111,8 +4158,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTWO="Add FooTable V2"
 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_DESCRIPTION="Add the option to use the whmcs license add-on in the component."
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_LABEL="Add License (whmcs)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_LICENSE_LABEL="Add WHMCS<br /><small>(license add-on)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_ADMIN="Add Php Helper Admin"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_ADMIN_LABEL="Add PHP (helper_admin Class)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_HELPER_BOTH="Add Php Helper Both"
@@ -4143,7 +4190,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UIKIT_VTWO="Add Uikit v2"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER="Add Update Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL="Add Update Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADMIN_VIEWS="Admin Views"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADVANCED_ENCRYPTION_ONLY_TO_LOCK_DATA="Advanced encryption (only to lock data)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR="Author"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_DESCRIPTION="The Author's Name &amp; Surname."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT="Author Name &amp; Surname Here"
@@ -4194,9 +4240,17 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_HINT="// CSS for the entire front
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL="CSS (site)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE="Custom (used in custom code)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD="Dashboard"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_DESCRIPTION="Select a custom admin view that is already linked to this component as a dynamic dashboard."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_LABEL="Dynamic Dashboard<br /><small>(admin or custom admin view)</small>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE="Dashboard Type"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_DESCRIPTION="Select the type of dashboard you would like to use."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASHBOARD_TYPE_LABEL="Dashboard Type"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DASH_INSTALL="Dash & Install"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR="Debug Linenr"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR_DESCRIPTION="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_JOOMLA_COMPONENT_DEBUG_LINENR_LABEL="Debug (line numbers)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEFAULT="Default"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_HINT="Add Description Here"
@@ -4269,9 +4323,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_HINT="codename"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL="Name in Code"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_MESSAGE="Error! Please add name in code here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_DESCRIPTION="Enter Name Here"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Name Here"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Component Name"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_LABEL="Name"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add name here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add component name here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NEW="A New Joomla Component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO="No"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NONE="None"
@@ -4279,8 +4333,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CONFIG_DESCRIPTION="You can add c
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CONFIG_LABEL="Adding Custom Config Fields"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CUSTOM_MENUS_DESCRIPTION="You can add custom menus to the component here. The normal Menus are already being added so only add custom Menus that you would like to use for custom scripts.<span id='jform_button_add_custom_menus'></span>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ADD_CUSTOM_MENUS_LABEL="Adding Custom Menus"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION="<p>You can add more tabs to the component dashboard.</p><span id='jform_button_component_dashboard'></span>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION="<p>The default dashboard has all the icons of the views you have selected as <b>Dashboard (add record)</b> or <b>Dashboard (list of records)</b>, to expand it you can add more tabs.</p><span id='jform_button_component_dashboard'></span>"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL="Customize the Component Dashboard"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL="Default Dashboard 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_COMPONENT_FILES_FOLDERS_DESCRIPTION="You can add custom files and folders to the component, simply add the files to the administrator/components/com_componentbuilder/custom folder and then select them here.<span id='jform_button_component_files_folders'></span>"
@@ -4288,6 +4342,8 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_LABEL="Adding
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_ADMIN_VIEWS_DESCRIPTION="<h4>Linked Admin Views <span id='header_component_admin_views_buttons'></span></h4><div id='display_component_admin_views' >Display of the admin views will load here!</div>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_CUSTOM_ADMIN_VIEWS_DESCRIPTION="<h4>Linked Custom Admin Views <span id='header_component_custom_admin_views_buttons'></span></h4><div id='display_component_custom_admin_views' >Display of the custom admin views will load here!</div>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_SITE_VIEWS_DESCRIPTION="<h4>Linked Site Views <span id='header_component_site_views_buttons'></span></h4><div id='display_component_site_views' >Display of the site views will load here!</div>"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_DESCRIPTION="The dynamic dashboard is basically the option of taking an <b>Admin View</b> or <b>Custom Admin View</b> that is already linked to this component, and making it the dashboard."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_LABEL="Dynamic Dashboard Option"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_DESCRIPTION="We have moved the views in to their own tabs for your convenience.<span id='jform_button_create_edit_views'></span>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_LABEL="To add views, please open the corresponding tab."
 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.<span id='jform_button_mysql_tweak_options'></span>"
@@ -4373,7 +4429,6 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NUMBER_LABEL="Number"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER="Other"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PERMISSION="Permissions"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP="PHP"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT="Php Admin Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_DESCRIPTION="PHP script for the global helper admin event method."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_ADMIN_EVENT_HINT="// add custom PHP script to the global helper admin event method."
@@ -4451,8 +4506,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_HINT="Coma separated names of fol
 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_UPDATES_NOT_READY="Updates (NOT READY!)"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATES_USED_IN_JOOMLA_UPDATER="Updates (used in Joomla updater)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER="Update Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_DESCRIPTION="Select your update server for this component."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_LABEL="Update Server"
@@ -4477,6 +4531,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE="Error! Please add website here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_ENCRYPTION_ONLY_TO_LOCK_DATAFIELDS="WHMCS encryption (only to lock data/fields)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY="Whmcs Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT="Secret Key"
@@ -5002,15 +5057,52 @@ COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_DATE_DESC="The date thi
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NEW="A New Library Files, Folders & URLs"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_DESCRIPTION="You can add custom files to the component, simply add the files to the administrator/components/com_componentbuilder/custom folder and then select them here."
-COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION="You can add any files to the component, by using the full system path. Example: /home/user/folder/file.php (make sure that php has permission to read the file)"
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION="You can add any files to the component, by using the full system path. Example: /home/user/folder/file.php (make sure that php has permission to read the file)<br /><b>Please note</b> that you can also <b>use constant paths in your full path</b> (directly without quotes), this is highly recommended to insure portability.<br />To see a list of constant paths please read the notes below. Example: JPATH_ROOT/file.php or JPATH_ROOT/components/com_yourcomponentname/helpers/file.php"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_LABEL="Adding Files"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_LABEL="Adding Custom Files"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_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_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION="You can any folders to the component, by using the full system path. Example: /home/user/folder (make sure that php has permission to read the folder)"
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION="You can any folders to the component, by using the full system path. Example: /home/user/folder (make sure that php has permission to read the folder)<br /><b>Please note</b> that you can also <b>use constant paths in your full path</b> (directly without quotes), this is highly recommended to insure portability.<br />To see a list of constant paths please read the notes below. Example: JPATH_ROOT/folder or JPATH_ROOT/components/com_yourcomponentname/helpers/folder"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_LABEL="Adding Folders"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_LABEL="Adding Custom Folders"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_DESCRIPTION="You can add urls here, and it can be used in three ways. As a direct link <b>(default)</b> or to get the file content and add it to the component <b>(get)</b> or as both local and link <b>(dynamic)</b>"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_LABEL="Adding Urls"
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_DESCRIPTION="<p>// The path to the administrator folder.<br />
+<b>JPATH_ADMINISTRATOR</b><br />
+// The path to the installed Joomla! site, or JPATH_ROOT/administrator if executed from the backend.<br />
+<b>JPATH_BASE</b><br />
+// The path to the cache folder.<br />		
+<b>JPATH_CACHE</b><br />
+// The path to the administration folder of the current component being executed.<br />		
+<b>JPATH_COMPONENT_ADMINISTRATOR</b><br />
+// The path to the site folder of the current component being executed.<br />		
+<b>JPATH_COMPONENT_SITE</b><br />
+// The path to the current component being executed.<br />		
+<b>JPATH_COMPONENT</b><br />
+// The path to folder containing the configuration.php file.<br />		
+<b>JPATH_CONFIGURATION</b><br />
+// The path to the installation folder.<br />		
+<b>JPATH_INSTALLATION</b><br />
+// The path to the libraries folder.<br />		
+<b>JPATH_LIBRARIES</b><br />
+// The path to the plugins folder.<br />		
+<b>JPATH_PLUGINS</b><br />
+// The path to the installed Joomla! site.<br />		
+<b>JPATH_ROOT</b><br />
+// The path to the installed Joomla! site.<br />		
+<b>JPATH_SITE</b><br />
+// The path to the templates folder.<br />		
+<b>JPATH_THEMES</b></p>
+
+<p>JPATH_SITE is meant to represent the root path of the JSite application,<br />
+just as JPATH_ADMINISTRATOR is mean to represent the root path of the JAdministrator application.<br />
+JPATH_BASE is the root path for the current requested application.... so if you are in the administrator application:<br />
+JPATH_BASE == JPATH_ADMINISTRATOR<br />
+If you are in the site application:<br />
+JPATH_BASE == JPATH_SITE<br />
+If you are in the installation application:<br />
+JPATH_BASE == JPATH_INSTALLATION.<br />
+JPATH_ROOT is the root path for the Joomla install and does not depend upon any application.</p>"
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_LABEL="Constant Paths"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION="Should file be updated."
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL="Update"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ORDERING_LABEL="Ordering"
@@ -5192,6 +5284,7 @@ COM_COMPONENTBUILDER_RIGHT_OF_TABS="Right of Tabs"
 COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
 COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another."
 COM_COMPONENTBUILDER_SEARCHABLE="Searchable"
+COM_COMPONENTBUILDER_SELECT_AN_OPTION="Select an option"
 COM_COMPONENTBUILDER_SELECT_A_SNIPPET="select a snippet"
 COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to compile"
 COM_COMPONENTBUILDER_SERVER="Server"
@@ -5259,7 +5352,7 @@ COM_COMPONENTBUILDER_SERVER_FTP="FTP"
 COM_COMPONENTBUILDER_SERVER_HOST="Host"
 COM_COMPONENTBUILDER_SERVER_HOST_DESCRIPTION="Add the server host name/IP here"
 COM_COMPONENTBUILDER_SERVER_HOST_HINT="yourhost.com"
-COM_COMPONENTBUILDER_SERVER_HOST_LABEL="Host/IP<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_HOST_LABEL="Host/IP<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_HOST_MESSAGE="Error! Please add server host name here."
 COM_COMPONENTBUILDER_SERVER_ID="Id"
 COM_COMPONENTBUILDER_SERVER_LINKED_COMPONENTS="Linked Components"
@@ -5281,23 +5374,23 @@ COM_COMPONENTBUILDER_SERVER_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_SERVER_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_SERVER_PASSWORD="Password"
 COM_COMPONENTBUILDER_SERVER_PASSWORD_DESCRIPTION="Enter the password."
-COM_COMPONENTBUILDER_SERVER_PASSWORD_LABEL="Password<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PASSWORD_LABEL="Password<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PATH="Path"
 COM_COMPONENTBUILDER_SERVER_PATH_DESCRIPTION="Set the path to the remote destination folder. The user must have write permissions to this folder."
 COM_COMPONENTBUILDER_SERVER_PATH_HINT="/home/username/folder/"
-COM_COMPONENTBUILDER_SERVER_PATH_LABEL="Remote Destination Folder Path<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PATH_LABEL="Remote Destination Folder Path<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PATH_MESSAGE="Error! Please add destination path."
 COM_COMPONENTBUILDER_SERVER_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_SERVER_PORT="Port"
 COM_COMPONENTBUILDER_SERVER_PORT_DESCRIPTION="The port number"
 COM_COMPONENTBUILDER_SERVER_PORT_HINT="22"
-COM_COMPONENTBUILDER_SERVER_PORT_LABEL="Port Number<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PORT_LABEL="Port Number<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PORT_MESSAGE="Error! Please add port number here."
 COM_COMPONENTBUILDER_SERVER_PRIVATE="Private"
 COM_COMPONENTBUILDER_SERVER_PRIVATE_DESCRIPTION="Set the path to the private key."
 COM_COMPONENTBUILDER_SERVER_PRIVATE_HINT="/home/username/.ssh/id_rsa"
 COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY="Private Key"
-COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_DESCRIPTION="Add your private key here! Yes this field in encrypted in the DB, but if your DB gets compromised this key must also be considered compromised. The system path option is considered more secure and seen as best practice."
+COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_DESCRIPTION="Add your private key here! Yes this field is encrypted in the DB, but if your DB gets compromised this key must also be considered compromised! The system path option is considered more secure and seen as best practice."
 COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_FILE_PATH="Private Key - File Path"
 COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_HINT="-----BEGIN RSA PRIVATE KEY-----
 MIICXQIBAAKBgQDPF9uyDuHtD+sCYBaEIV34uAc+eRa62souVUcmsVwKUUBbk7sY
@@ -5314,9 +5407,9 @@ MD4pm2tpMRV52YIRi07J70ex/PbLULd5cCTh6jgXAwz71AVSiBY/jTtKqV3YkzJo
 09oGIZIcI/wzk1zLloqNAkB8qHxAtmUZFdo5sssaUDTOB82QAPfiHUqIFPaYuc0f
 4NqtXZm+fv4liR3QJEo8zkiBs3NjBnm7Hh3BMSqGh3d+
 -----END RSA PRIVATE KEY-----"
-COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL="PRIVATE KEY<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL="PRIVATE KEY<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_TEXT_FIELD="Private Key - Text Field"
-COM_COMPONENTBUILDER_SERVER_PRIVATE_LABEL="Private Key Path<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_PRIVATE_LABEL="Private Key Path<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_PRIVATE_MESSAGE="Error! Please add private key path."
 COM_COMPONENTBUILDER_SERVER_PROTOCOL="Protocol"
 COM_COMPONENTBUILDER_SERVER_PROTOCOL_DESCRIPTION="Select the protocol used to connect to this server."
@@ -5325,7 +5418,7 @@ COM_COMPONENTBUILDER_SERVER_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_SERVER_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Server to customise the alias."
 COM_COMPONENTBUILDER_SERVER_SECRET="Secret"
 COM_COMPONENTBUILDER_SERVER_SECRET_DESCRIPTION="If private key file is encrypted (which it should be), the passphrase must be provided."
-COM_COMPONENTBUILDER_SERVER_SECRET_LABEL="Passphrase<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_SECRET_LABEL="Passphrase<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_SELECT_AN_OPTION="Select an option"
 COM_COMPONENTBUILDER_SERVER_SFTP="SFTP"
 COM_COMPONENTBUILDER_SERVER_SIGNATURE="Signature"
@@ -5337,7 +5430,7 @@ COM_COMPONENTBUILDER_SERVER_STATUS="Status"
 COM_COMPONENTBUILDER_SERVER_USERNAME="Username"
 COM_COMPONENTBUILDER_SERVER_USERNAME_DESCRIPTION="Enter the username."
 COM_COMPONENTBUILDER_SERVER_USERNAME_HINT="root"
-COM_COMPONENTBUILDER_SERVER_USERNAME_LABEL="Username<br /><small>(basic encryption)</small>"
+COM_COMPONENTBUILDER_SERVER_USERNAME_LABEL="Username<br /><small>(encrypted field)</small>"
 COM_COMPONENTBUILDER_SERVER_USERNAME_MESSAGE="Error! Please add the username here."
 COM_COMPONENTBUILDER_SERVER_VERSION_DESC="A count of the number of times this Server has been revised."
 COM_COMPONENTBUILDER_SERVER_VERSION_LABEL="Revision"
@@ -6160,9 +6253,10 @@ COM_COMPONENTBUILDER_THERE_ARE_NO_OUT_OF_DATE_SNIPPETS_AT_THIS_TIME="There are n
 COM_COMPONENTBUILDER_THERE_ARE_NO_SNIPPETS_TO_UPDATE_AT_THIS_TIME="There are no snippets to update at this time"
 COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR_OF_A_TYPE_ERROR_IN_THE_FIELDS_DISPLAY_REQUEST="There has been an error, if this continues please inform your system administrator of a type error in the fields display request!"
 COM_COMPONENTBUILDER_THERE_WAS_A_PROBLEM_BNO_VIEW_OR_ID_FOUND_IN_SESSION_OR_VIEW_NOT_ALLOWED_TO_ACCESS_AREAB_WE_COULD_NOT_LOAD_ANY_LINKED_TO_VALUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR="There was a problem, <b>no view or id found in session or view not allowed to access area</b>, we could not load any linked to values. Please inform your system administrator!"
-COM_COMPONENTBUILDER_THE_BPHPSECLIBNETSFTPB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_ADMINHELPERSVENDOR_FOLDER_OF_JCB_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>phpseclib\NET\SFTP</b> library\class is not available! This library\class should have been added to your admin/helpers/vendor folder of JCB. Please contact your system administrator for more info"
+COM_COMPONENTBUILDER_THE_BPHPSECLIBNETSFTPB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>phpseclib\NET\SFTP</b> library\class is not available! This library\class should have been added to your <b>libraries/vdm_io/vendor</b> folder. Please contact your system administrator for more info"
 COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_PATH_ON_BSB_SERVER="The <b>%s</b> file could not be moved to <b>%s</b> path on <b>%s</b> server."
 COM_COMPONENTBUILDER_THE_BSB_FILE_COULD_NOT_BE_MOVED_TO_BSB_SERVER="The <b>%s</b> file could not be moved to <b>%s</b> server."
+COM_COMPONENTBUILDER_THE_BSB_LIBRARYCLASS_IS_NOT_AVAILABLE_THIS_LIBRARYCLASS_SHOULD_HAVE_BEEN_ADDED_TO_YOUR_BLIBRARIESVDM_IOVENDORB_FOLDER_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_INFO="The <b>%s</b> library\class is not available! This library\class should have been added to your <b>libraries/vdm_io/vendor</b> folder. Please contact your system administrator for more info!"
 COM_COMPONENTBUILDER_THE_BSB_LIBRARY_CAN_NOT_BE_DELETED_OR_THINGS_WILL_BREAK="The <b>%s</b> library can not be deleted, or things will break."
 COM_COMPONENTBUILDER_THE_COMPONENT_ADMIN_VIEWS="The component admin views"
 COM_COMPONENTBUILDER_THE_COMPONENT_CONFIG="The component config"
@@ -6243,6 +6337,7 @@ COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_IMPORT_A_COMPONENT_PLEASE_CON
 COM_COMPONENTBUILDER_YOU_DO_NOT_HAVE_PERMISSION_TO_SHARE_THE_SNIPPETS_PLEASE_CONTACT_YOUR_SYSTEM_ADMINISTRATOR_FOR_MORE_HELP="You do not have permission to share the snippets, please contact your system administrator for more help."
 COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE="You have %s %s. Adding more then 50 %s is considered bad practice."
 COM_COMPONENTBUILDER_YOU_HAVE_S_S_ADDING_MORE_THEN_FIFTY_S_IS_CONSIDERED_BAD_PRACTICE_YOUR_S_PAGE_LOAD_IN_JCB_WILL_SLOWDOWN_YOU_SHOULD_CONSIDER_DECOUPLING_SOME_OF_THESE_S="You have %s %s. Adding more then 50 %s is considered bad practice. Your %s page load in JCB will slowdown. You should consider decoupling some of these %s."
+COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE="You must first link an admin or a custom admin view to this component, then you can select it here"
 COM_COMPONENTBUILDER_YOU_MUST_SELECT_A_COMPONENT="You must select a component!"
 COM_COMPONENTBUILDER_YOU_SHOULD_ADD_THE_CORRECT_OWNER_DETAILS="You should add the correct owner details."
 COM_COMPONENTBUILDER_YOU_SHOULD_ONLY_CONTINUE_THIS_IMPORT_IF_YOU_HAVE_BACKUP_YOUR_COMPONENTS_AND_INSURED_THAT_THE_PACKAGE_OWNER_IS_REPUTABLE="You should only continue this import if you have backup your components, and insured that the package owner is reputable."

admin/layouts/component_files_folders/advance_fullwidth.php

@@ -33,7 +33,8 @@ $fields = $displayData->get('fields') ?: array(
 	'note_add_files_fullpath',
 	'addfilesfullpath',
 	'note_add_folders_fullpath',
-	'addfoldersfullpath'
+	'addfoldersfullpath',
+	'note_constant_paths'
 );
 
 ?>

admin/layouts/field/details_left.php

@@ -41,7 +41,7 @@ $fields = $displayData->get('fields') ?: array(
 	'indexes',
 	'null_switch',
 	'store',
-	'note_vdm_encryption'
+	'note_whmcs_encryption'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/fieldtype/fields_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->wadfields;
+$items	= $displayData->wacfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";

admin/layouts/joomla_component/dash_install_fullwidth.php

@@ -13,7 +13,7 @@
 	@version		2.6.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		php_fullwidth.php
+	@subpackage		dash_install_fullwidth.php
 	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
 	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
 	@copyright		Copyright (C) 2015. All Rights Reserved

admin/layouts/joomla_component/dash_install_left.php

@@ -13,7 +13,7 @@
 	@version		2.6.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		php_left.php
+	@subpackage		dash_install_left.php
 	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
 	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
 	@copyright		Copyright (C) 2015. All Rights Reserved
@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
-	'note_botton_component_dashboard'
+	'dashboard_type'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/joomla_component/dash_install_right.php

@@ -0,0 +1,56 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		dash_install_right.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-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 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'note_dynamic_dashboard',
+	'dashboard',
+	'note_botton_component_dashboard'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+foreach ($fields as $field)
+{
+	$field = is_array($field) ? $field : array($field);
+	foreach ($field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			echo $form->renderField($f);
+			break;
+		}
+	}
+}

admin/layouts/joomla_component/settings_fullwidth.php

@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
-	'spacer_hr_f',
+	'spacer_hr_six',
 	'note_on_contributors',
 	'addcontributors',
 	'emptycontributors',

admin/layouts/joomla_component/settings_left.php

@@ -31,11 +31,11 @@ $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
 	'note_moved_views',
-	'spacer_hr_a',
+	'spacer_hr_one',
 	'note_mysql_tweak_options',
-	'spacer_hr_b',
+	'spacer_hr_two',
 	'note_add_custom_menus',
-	'spacer_hr_c',
+	'spacer_hr_three',
 	'note_add_config'
 );
 

admin/layouts/joomla_component/settings_right.php

@@ -31,10 +31,10 @@ $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
 	'note_component_files_folders',
-	'spacer_hr_d',
+	'spacer_hr_four',
 	'to_ignore_note',
 	'toignore',
-	'spacer_hr_e',
+	'spacer_hr_five',
 	'jcb_export_package_note',
 	'export_key',
 	'export_package_link',

admin/layouts/joomla_component/translation_fullwidth.php

@@ -1,108 +0,0 @@
-<?php
-/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
-    __      __       _     _____                 _                                  _     __  __      _   _               _
-    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
-     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
-      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
-       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
-        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
-                                                        |_| 				
-/-------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		2.6.x
-	@created		30th April, 2015
-	@package		Component Builder
-	@subpackage		translation_fullwidth.php
-	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
-	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-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 
-                                                             
-/-----------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-
-defined('_JEXEC') or die('Restricted access');
-
-// set the defaults
-$items	= $displayData->vwntranslation;
-$user	= JFactory::getUser();
-$id	= $displayData->item->id;
-$edit = "index.php?option=com_componentbuilder&view=language_translations&task=language_translation.edit";
-
-?>
-<div class="form-vertical">
-<?php if (ComponentbuilderHelper::checkArray($items)): ?>
-<table class="footable table data language_translations" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
-<thead>
-	<tr>
-		<th data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL'); ?>
-		</th>
-		<th width="10" data-breakpoints="xs sm md">
-			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_STATUS'); ?>
-		</th>
-		<th width="5" data-type="number" data-breakpoints="xs sm md">
-			<?php echo JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ID'); ?>
-		</th>
-	</tr>
-</thead>
-<tbody>
-<?php foreach ($items as $i => $item): ?>
-	<?php
-		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
-		$canDo = ComponentbuilderHelper::getActions('language_translation',$item,'language_translations');
-	?>
-	<tr>
-		<td class="nowrap">
-			<?php if ($canDo->get('language_translation.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=joomla_component&refid=<?php echo $id; ?>"><?php echo $item->entranslation; ?></a>
-					<?php if ($item->checked_out): ?>
-						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'language_translations.', $canCheckin); ?>
-					<?php endif; ?>
-			<?php else: ?>
-				<div class="name"><?php echo $item->entranslation; ?></div>
-			<?php endif; ?>
-		</td>
-		<?php if ($item->published == 1):?>
-			<td class="center"  data-sort-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED');  ?>">
-					<?php echo JText::_('COM_COMPONENTBUILDER_PUBLISHED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 0):?>
-			<td class="center"  data-sort-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE');  ?>">
-					<?php echo JText::_('COM_COMPONENTBUILDER_INACTIVE'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 2):?>
-			<td class="center"  data-sort-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED');  ?>">
-					<?php echo JText::_('COM_COMPONENTBUILDER_ARCHIVED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == -2):?>
-			<td class="center"  data-sort-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED');  ?>">
-					<?php echo JText::_('COM_COMPONENTBUILDER_TRASHED'); ?>
-				</span>
-			</td>
-		<?php endif; ?>
-		<td class="nowrap center hidden-phone">
-			<?php echo $item->id; ?>
-		</td>
-	</tr>
-<?php endforeach; ?>
-</tbody>
-</table>
-<?php else: ?>
-	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-	</div>
-<?php endif; ?>
-</div>

admin/layouts/library_files_folders_urls/advance_fullwidth.php

@@ -33,7 +33,8 @@ $fields = $displayData->get('fields') ?: array(
 	'note_add_files_fullpath',
 	'addfilesfullpath',
 	'note_add_folders_fullpath',
-	'addfoldersfullpath'
+	'addfoldersfullpath',
+	'note_constant_paths'
 );
 
 ?>

admin/layouts/template/details_right.php

@@ -31,8 +31,8 @@ $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
 	'snippet',
-	'note_uikit_snippet',
+	'note_snippet_usage',
-	'note_snippet_usage'
+	'note_uikit_snippet'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/models/admin_view.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->addtables))
-			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
-			}
-
 			if (!empty($item->addpermissions))
 			{
 				// Convert the addpermissions field to an array.
@@ -132,6 +124,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->addlinked_views = $addlinked_views->toArray();
 			}
 
+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->custom_button))
 			{
 				// Convert the custom_button field to an array.
@@ -148,10 +148,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}
 
-			if (!empty($item->php_import_headers))
+			if (!empty($item->php_import_save))
 			{
-				// base64 Decode php_import_headers.
+				// base64 Decode php_import_save.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
+				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
 			if (!empty($item->html_import_view))
@@ -160,16 +160,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->html_import_view = base64_decode($item->html_import_view);
 			}
 
-			if (!empty($item->php_import_save))
+			if (!empty($item->php_import_headers))
 			{
-				// base64 Decode php_import_save.
+				// base64 Decode php_import_headers.
-				$item->php_import_save = base64_decode($item->php_import_save);
+				$item->php_import_headers = base64_decode($item->php_import_headers);
-			}
-
-			if (!empty($item->php_getitem))
-			{
-				// base64 Decode php_getitem.
-				$item->php_getitem = base64_decode($item->php_getitem);
 			}
 
 			if (!empty($item->css_view))
@@ -352,6 +346,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_ext = base64_decode($item->php_import_ext);
 			}
 
+			if (!empty($item->php_getitem))
+			{
+				// base64 Decode php_getitem.
+				$item->php_getitem = base64_decode($item->php_getitem);
+			}
+
 
 			if (empty($item->id))
 			{
@@ -1184,19 +1184,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['system_name'] = $data['name_single'];
 		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@@ -1236,6 +1223,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['addlinked_views'] = '';
 		}
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the custom_button items to data.
 		if (isset($data['custom_button']) && is_array($data['custom_button']))
 		{
@@ -1262,10 +1262,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
-		// Set the php_import_headers string to base64 string.
+		// Set the php_import_save string to base64 string.
-		if (isset($data['php_import_headers']))
+		if (isset($data['php_import_save']))
 		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
+			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
 		// Set the html_import_view string to base64 string.
@@ -1274,16 +1274,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['html_import_view'] = base64_encode($data['html_import_view']);
 		}
 
-		// Set the php_import_save string to base64 string.
+		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_import_save']))
+		if (isset($data['php_import_headers']))
 		{
-			$data['php_import_save'] = base64_encode($data['php_import_save']);
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
-		}
-
-		// Set the php_getitem string to base64 string.
-		if (isset($data['php_getitem']))
-		{
-			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
 
 		// Set the css_view string to base64 string.
@@ -1464,6 +1458,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 		if (isset($data['php_import_ext']))
 		{
 			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
+		}
+
+		// Set the php_getitem string to base64 string.
+		if (isset($data['php_getitem']))
+		{
+			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
         
 		// Set the Params Items to data

admin/models/admin_views.php

@@ -262,14 +262,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
-						// decode html_import_view
-						$item->html_import_view = base64_decode($item->html_import_view);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_getitem
+						// decode html_import_view
-						$item->php_getitem = base64_decode($item->php_getitem);
+						$item->html_import_view = base64_decode($item->html_import_view);
+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode css_view
 						$item->css_view = base64_decode($item->css_view);
 						// decode php_getitems
@@ -330,6 +328,8 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_import_ext
 						$item->php_import_ext = base64_decode($item->php_import_ext);
+						// decode php_getitem
+						$item->php_getitem = base64_decode($item->php_getitem);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/ajax.php

@@ -274,11 +274,13 @@ class ComponentbuilderModelAjax extends JModelList
 			{
 				// get the view name & id
 				$values = $this->getViewID();
+				// set the button ID
+				$css_class = 'control-group-'.ComponentbuilderHelper::safeString($type. '-' . $size, 'L', '-');
 				// check if new item
 				$ref = '';
 				if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']))
 				{
-					// only load referal if not new item.
+					// only load referral if not new item.
 					$ref = '&ref=' . $values['a_view'] . '&refid=' . $values['a_id'];
 					// get item id
 					if ($id = ComponentbuilderHelper::getVar($type, $values['a_id'], $values['a_view'], 'id'))
@@ -299,7 +301,7 @@ class ComponentbuilderModelAjax extends JModelList
 					$button = array();
 					if (1 == $size)
 					{
-						$button[] = '<div class="control-group">';
+						$button[] = '<div class="control-group '.$css_class.'">';
 						$button[] = '<div class="control-label">';
 						$button[] = '<label>' . ComponentbuilderHelper::safeString($type, 'Ww') . '</label>';
 						$button[] = '</div>';
@@ -326,7 +328,7 @@ class ComponentbuilderModelAjax extends JModelList
 				// only return notice if big button
 				if (1 == $size)
 				{
-					return '<div class="control-group"><div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')) . '</div></div>';
+					return '<div class="control-group '.$css_class.'"><div class="alert alert-info">' . JText::sprintf('COM_COMPONENTBUILDER_BUTTON_TO_CREATE_S_WILL_SHOW_ONCE_S_IS_SAVED_FOR_THE_FIRST_TIME', ComponentbuilderHelper::safeString($type, 'w'), ComponentbuilderHelper::safeString($values['a_view'], 'w')) . '</div></div>';
 				}
 			}
 		}

admin/models/compiler.php

@@ -124,7 +124,7 @@ class ComponentbuilderModelCompiler extends JModelList
 				$_copyright = new stdClass();
 				$_copyright->text =& $item->copyright; // value must be in text
 				// Since all values are now in text (Joomla Limitation), we also add the field name (copyright) to context
-				$this->_dispatcher->trigger("onContentPrepare",array('com_componentbuilder.compiler.copyright',&$_copyright,&$this->params));
+				$this->_dispatcher->trigger("onContentPrepare", array('com_componentbuilder.compiler.copyright', &$_copyright, &$this->params, 0));
 				// Checking if copyright has uikit components that must be loaded.
 				$this->uikitComp = ComponentbuilderHelper::getUikitComp($item->copyright,$this->uikitComp);
 			}
@@ -228,6 +228,8 @@ class ComponentbuilderModelCompiler extends JModelList
 	
 	public function install($p_file)
 	{
+		$this->setState('action', 'install');
+
 		// Set FTP credentials, if given.
 		JClientHelper::setCredentialsFromRequest('ftp');
 		$app = JFactory::getApplication();
@@ -235,7 +237,7 @@ class ComponentbuilderModelCompiler extends JModelList
 		// Load installer plugins for assistance if required:
 		JPluginHelper::importPlugin('installer');
 		$dispatcher = JEventDispatcher::getInstance();
-		
+
 		$package = null;
 
 		// This event allows an input pre-treatment, a custom pre-packing or custom installation.
@@ -246,7 +248,8 @@ class ComponentbuilderModelCompiler extends JModelList
 		{
 			return true;
 		}
-		elseif (in_array(false, $results, true))
+
+		if (in_array(false, $results, true))
 		{
 			return false;
 		}
@@ -256,8 +259,10 @@ class ComponentbuilderModelCompiler extends JModelList
 
 		// Unpack the downloaded package file.
 		$package = JInstallerHelper::unpack($tmp_dest . '/' . $p_file, true);
-		// insure the install type is folder
+
+		// insure the install type is folder (JCB zip file is in the folder)
 		$installType = 'folder';
+
 		// This event allows a custom installation of the package or a customization of the package:
 		$results = $dispatcher->trigger('onInstallerBeforeInstaller', array($this, &$package));
 
@@ -300,7 +305,7 @@ class ComponentbuilderModelCompiler extends JModelList
 		$dispatcher->trigger('onInstallerAfterInstaller', array($this, &$package, $installer, &$result, &$msg));
 
 		// Set some model state values.
-		$app	= JFactory::getApplication();
+		$app = JFactory::getApplication();
 		$app->enqueueMessage($msg, $msgType);
 		$this->setState('name', $installer->get('name'));
 		$this->setState('result', $result);
@@ -317,6 +322,16 @@ class ComponentbuilderModelCompiler extends JModelList
 
 		JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']);
 
+		// Clear the cached extension data and menu cache
+		$this->cleanCache('_system', 0);
+		$this->cleanCache('_system', 1);
+		$this->cleanCache('com_modules', 0);
+		$this->cleanCache('com_modules', 1);
+		$this->cleanCache('com_plugins', 0);
+		$this->cleanCache('com_plugins', 1);
+		$this->cleanCache('mod_menu', 0);
+		$this->cleanCache('mod_menu', 1);
+
 		return $result;
 	}
 }

admin/models/component_files_folders.php

@@ -95,20 +95,12 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->addfiles))
+			if (!empty($item->addfoldersfullpath))
 			{
-				// Convert the addfiles field to an array.
+				// Convert the addfoldersfullpath field to an array.
-				$addfiles = new Registry;
+				$addfoldersfullpath = new Registry;
-				$addfiles->loadString($item->addfiles);
+				$addfoldersfullpath->loadString($item->addfoldersfullpath);
-				$item->addfiles = $addfiles->toArray();
+				$item->addfoldersfullpath = $addfoldersfullpath->toArray();
-			}
-
-			if (!empty($item->addfolders))
-			{
-				// Convert the addfolders field to an array.
-				$addfolders = new Registry;
-				$addfolders->loadString($item->addfolders);
-				$item->addfolders = $addfolders->toArray();
 			}
 
 			if (!empty($item->addfilesfullpath))
@@ -119,12 +111,20 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 				$item->addfilesfullpath = $addfilesfullpath->toArray();
 			}
 
-			if (!empty($item->addfoldersfullpath))
+			if (!empty($item->addfolders))
 			{
-				// Convert the addfoldersfullpath field to an array.
+				// Convert the addfolders field to an array.
-				$addfoldersfullpath = new Registry;
+				$addfolders = new Registry;
-				$addfoldersfullpath->loadString($item->addfoldersfullpath);
+				$addfolders->loadString($item->addfolders);
-				$item->addfoldersfullpath = $addfoldersfullpath->toArray();
+				$item->addfolders = $addfolders->toArray();
+			}
+
+			if (!empty($item->addfiles))
+			{
+				// Convert the addfiles field to an array.
+				$addfiles = new Registry;
+				$addfiles->loadString($item->addfiles);
+				$item->addfiles = $addfiles->toArray();
 			}
 
 			// update the fields
@@ -838,30 +838,17 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// Set the addfiles items to data.
+		// Set the addfoldersfullpath items to data.
-		if (isset($data['addfiles']) && is_array($data['addfiles']))
+		if (isset($data['addfoldersfullpath']) && is_array($data['addfoldersfullpath']))
 		{
-			$addfiles = new JRegistry;
+			$addfoldersfullpath = new JRegistry;
-			$addfiles->loadArray($data['addfiles']);
+			$addfoldersfullpath->loadArray($data['addfoldersfullpath']);
-			$data['addfiles'] = (string) $addfiles;
+			$data['addfoldersfullpath'] = (string) $addfoldersfullpath;
 		}
-		elseif (!isset($data['addfiles']))
+		elseif (!isset($data['addfoldersfullpath']))
 		{
-			// Set the empty addfiles to data
+			// Set the empty addfoldersfullpath to data
-			$data['addfiles'] = '';
+			$data['addfoldersfullpath'] = '';
-		}
-
-		// Set the addfolders items to data.
-		if (isset($data['addfolders']) && is_array($data['addfolders']))
-		{
-			$addfolders = new JRegistry;
-			$addfolders->loadArray($data['addfolders']);
-			$data['addfolders'] = (string) $addfolders;
-		}
-		elseif (!isset($data['addfolders']))
-		{
-			// Set the empty addfolders to data
-			$data['addfolders'] = '';
 		}
 
 		// Set the addfilesfullpath items to data.
@@ -877,17 +864,30 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 			$data['addfilesfullpath'] = '';
 		}
 
-		// Set the addfoldersfullpath items to data.
+		// Set the addfolders items to data.
-		if (isset($data['addfoldersfullpath']) && is_array($data['addfoldersfullpath']))
+		if (isset($data['addfolders']) && is_array($data['addfolders']))
 		{
-			$addfoldersfullpath = new JRegistry;
+			$addfolders = new JRegistry;
-			$addfoldersfullpath->loadArray($data['addfoldersfullpath']);
+			$addfolders->loadArray($data['addfolders']);
-			$data['addfoldersfullpath'] = (string) $addfoldersfullpath;
+			$data['addfolders'] = (string) $addfolders;
 		}
-		elseif (!isset($data['addfoldersfullpath']))
+		elseif (!isset($data['addfolders']))
 		{
-			// Set the empty addfoldersfullpath to data
+			// Set the empty addfolders to data
-			$data['addfoldersfullpath'] = '';
+			$data['addfolders'] = '';
+		}
+
+		// Set the addfiles items to data.
+		if (isset($data['addfiles']) && is_array($data['addfiles']))
+		{
+			$addfiles = new JRegistry;
+			$addfiles->loadArray($data['addfiles']);
+			$data['addfiles'] = (string) $addfiles;
+		}
+		elseif (!isset($data['addfiles']))
+		{
+			// Set the empty addfiles to data
+			$data['addfiles'] = '';
 		}
         
 		// Set the Params Items to data

admin/models/componentbuilder.php

@@ -43,7 +43,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 		$icons  = array();
 		// view groups array
 		$viewGroups = array(
-			'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.libraries', 'png.snippet.add', 'png.snippets', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.servers', 'png.help_document.add', 'png.help_documents')
+			'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png.custom_admin_view.add', 'png.custom_admin_views', 'png.site_view.add', 'png.site_views', 'png.template.add', 'png.templates', 'png.layout.add', 'png.layouts', 'png.dynamic_get.add', 'png.dynamic_gets', 'png.custom_codes', 'png.libraries', 'png.snippet.add', 'png.snippets', 'png||getsnippets||index.php?option=com_componentbuilder&view=get_snippets', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.servers', 'png.help_document.add', 'png.help_documents')
 		);
 		// view access array
 		$viewAccess = array(
@@ -176,6 +176,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 			'library_files_folders_urls.create' => 'library_files_folders_urls.create',
 			'libraries_files_folders_urls.access' => 'library_files_folders_urls.access',
 			'library_files_folders_urls.access' => 'library_files_folders_urls.access');
+		// loop over the $views
 		foreach($viewGroups as $group => $views)
 		{
 			$i = 0;
@@ -184,47 +185,62 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 				foreach($views as $view)
 				{
 					$add = false;
-					if (strpos($view,'.') !== false)
+					// external views (links)
+					if (strpos($view,'||') !== false)
 					{
-							$dwd = explode('.', $view);
+						$dwd = explode('||', $view);
-							if (count($dwd) == 3)
+						if (count($dwd) == 3)
+						{
+							list($type, $name, $url) = $dwd;
+							$viewName 	= $name;
+							$alt 		= $name;
+							$url 		= $url;
+							$image 		= $name.'.'.$type;
+							$name 		= 'COM_COMPONENTBUILDER_DASHBOARD_'.ComponentbuilderHelper::safeString($name,'U');
+						}
+					}
+					// internal views
+					elseif (strpos($view,'.') !== false)
+					{
+						$dwd = explode('.', $view);
+						if (count($dwd) == 3)
+						{
+							list($type, $name, $action) = $dwd;
+						}
+						elseif (count($dwd) == 2)
+						{
+							list($type, $name) = $dwd;
+							$action = false;
+						}
+						if ($action)
+						{
+							$viewName = $name;
+							switch($action)
 							{
-								list($type, $name, $action) = $dwd;
+								case 'add':
-							}
+									$url 	= 'index.php?option=com_componentbuilder&view='.$name.'&layout=edit';
-							elseif (count($dwd) == 2)
+									$image 	= $name.'_'.$action.'.'.$type;
-							{
+									$alt 	= $name.' '.$action;
-								list($type, $name) = $dwd;
+									$name	= 'COM_COMPONENTBUILDER_DASHBOARD_'.ComponentbuilderHelper::safeString($name,'U').'_ADD';
-								$action = false;
+									$add	= true;
-							}
+								break;
-							if ($action)
+								default:
-							{
+									$url 	= 'index.php?option=com_categories&view=categories&extension=com_componentbuilder.'.$name;
-								$viewName = $name;
+									$image 	= $name.'_'.$action.'.'.$type;
-								switch($action)
+									$alt 	= $name.' '.$action;
-								{
+									$name	= 'COM_COMPONENTBUILDER_DASHBOARD_'.ComponentbuilderHelper::safeString($name,'U').'_'.ComponentbuilderHelper::safeString($action,'U');
-									case 'add':
+								break;
-										$url 	='index.php?option=com_componentbuilder&view='.$name.'&layout=edit';
-										$image 	= $name.'_'.$action.'.'.$type;
-										$alt 	= $name.' '.$action;
-										$name	= 'COM_COMPONENTBUILDER_DASHBOARD_'.ComponentbuilderHelper::safeString($name,'U').'_ADD';
-										$add	= true;
-									break;
-									default:
-										$url 	= 'index.php?option=com_categories&view=categories&extension=com_componentbuilder.'.$name;
-										$image 	= $name.'_'.$action.'.'.$type;
-										$alt 	= $name.' '.$action;
-										$name	= 'COM_COMPONENTBUILDER_DASHBOARD_'.ComponentbuilderHelper::safeString($name,'U').'_'.ComponentbuilderHelper::safeString($action,'U');
-									break;
-								}
-							}
-							else
-							{
-								$viewName 	= $name;
-								$alt 		= $name;
-								$url 		= 'index.php?option=com_componentbuilder&view='.$name;
-								$image 		= $name.'.'.$type;
-								$name 		= 'COM_COMPONENTBUILDER_DASHBOARD_'.ComponentbuilderHelper::safeString($name,'U');
-								$hover		= false;
 							}
+						}
+						else
+						{
+							$viewName 	= $name;
+							$alt 		= $name;
+							$url 		= 'index.php?option=com_componentbuilder&view='.$name;
+							$image 		= $name.'.'.$type;
+							$name 		= 'COM_COMPONENTBUILDER_DASHBOARD_'.ComponentbuilderHelper::safeString($name,'U');
+							$hover		= false;
+						}
 					}
 					else
 					{
@@ -277,7 +293,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 							// check access
 							if($user->authorise($accessAdd, 'com_componentbuilder') && $user->authorise($accessTo, 'com_componentbuilder') && $dashboard_add)
 							{
-								$icons[$group][$i]              = new StdClass;
+								$icons[$group][$i]			= new StdClass;
 								$icons[$group][$i]->url 	= $url;
 								$icons[$group][$i]->name 	= $name;
 								$icons[$group][$i]->image 	= $image;
@@ -289,7 +305,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 							// check access
 							if($user->authorise($accessTo, 'com_componentbuilder') && $dashboard_list)
 							{
-								$icons[$group][$i]              = new StdClass;
+								$icons[$group][$i]			= new StdClass;
 								$icons[$group][$i]->url 	= $url;
 								$icons[$group][$i]->name 	= $name;
 								$icons[$group][$i]->image 	= $image;
@@ -301,7 +317,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 							// check access
 							if($user->authorise($accessAdd, 'com_componentbuilder') && $dashboard_add)
 							{
-								$icons[$group][$i]              = new StdClass;
+								$icons[$group][$i]			= new StdClass;
 								$icons[$group][$i]->url 	= $url;
 								$icons[$group][$i]->name 	= $name;
 								$icons[$group][$i]->image 	= $image;
@@ -310,7 +326,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 						}
 						else
 						{
-							$icons[$group][$i]              = new StdClass;
+							$icons[$group][$i]			= new StdClass;
 							$icons[$group][$i]->url 	= $url;
 							$icons[$group][$i]->name 	= $name;
 							$icons[$group][$i]->image 	= $image;
@@ -319,7 +335,7 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 					}
 					else
 					{
-						$icons[$group][$i]              = new StdClass;
+						$icons[$group][$i]			= new StdClass;
 						$icons[$group][$i]->url 	= $url;
 						$icons[$group][$i]->name 	= $name;
 						$icons[$group][$i]->image 	= $image;

admin/models/custom_admin_view.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->libraries))
-			{
-				// Convert the libraries field to an array.
-				$libraries = new Registry;
-				$libraries->loadString($item->libraries);
-				$item->libraries = $libraries->toArray();
-			}
-
 			if (!empty($item->ajax_input))
 			{
 				// Convert the ajax_input field to an array.
@@ -116,6 +108,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}
 
+			if (!empty($item->libraries))
+			{
+				// Convert the libraries field to an array.
+				$libraries = new Registry;
+				$libraries->loadString($item->libraries);
+				$item->libraries = $libraries->toArray();
+			}
+
 			if (!empty($item->custom_get))
 			{
 				// Convert the custom_get field to an array.
@@ -132,12 +132,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}
 
-			if (!empty($item->php_document))
-			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
-			}
-
 			if (!empty($item->php_jview_display))
 			{
 				// base64 Decode php_jview_display.
@@ -150,10 +144,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->php_view = base64_decode($item->php_view);
 			}
 
-			if (!empty($item->php_jview))
+			if (!empty($item->php_document))
 			{
-				// base64 Decode php_jview.
+				// base64 Decode php_document.
-				$item->php_jview = base64_decode($item->php_jview);
+				$item->php_document = base64_decode($item->php_document);
 			}
 
 			if (!empty($item->default))
@@ -162,6 +156,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->default = base64_decode($item->default);
 			}
 
+			if (!empty($item->php_jview))
+			{
+				// base64 Decode php_jview.
+				$item->php_jview = base64_decode($item->php_jview);
+			}
+
 			if (!empty($item->js_document))
 			{
 				// base64 Decode js_document.
@@ -962,19 +962,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		// always reset the snippets
 		$data['snippet'] = 0;
 
-		// Set the libraries items to data.
-		if (isset($data['libraries']) && is_array($data['libraries']))
-		{
-			$libraries = new JRegistry;
-			$libraries->loadArray($data['libraries']);
-			$data['libraries'] = (string) $libraries;
-		}
-		elseif (!isset($data['libraries']))
-		{
-			// Set the empty libraries to data
-			$data['libraries'] = '';
-		}
-
 		// Set the ajax_input items to data.
 		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
 		{
@@ -988,6 +975,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
+		// Set the libraries items to data.
+		if (isset($data['libraries']) && is_array($data['libraries']))
+		{
+			$libraries = new JRegistry;
+			$libraries->loadArray($data['libraries']);
+			$data['libraries'] = (string) $libraries;
+		}
+		elseif (!isset($data['libraries']))
+		{
+			// Set the empty libraries to data
+			$data['libraries'] = '';
+		}
+
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
 		{
@@ -1014,12 +1014,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
-		{
-			$data['php_document'] = base64_encode($data['php_document']);
-		}
-
 		// Set the php_jview_display string to base64 string.
 		if (isset($data['php_jview_display']))
 		{
@@ -1032,10 +1026,10 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['php_view'] = base64_encode($data['php_view']);
 		}
 
-		// Set the php_jview string to base64 string.
+		// Set the php_document string to base64 string.
-		if (isset($data['php_jview']))
+		if (isset($data['php_document']))
 		{
-			$data['php_jview'] = base64_encode($data['php_jview']);
+			$data['php_document'] = base64_encode($data['php_document']);
 		}
 
 		// Set the default string to base64 string.
@@ -1044,6 +1038,12 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['default'] = base64_encode($data['default']);
 		}
 
+		// Set the php_jview string to base64 string.
+		if (isset($data['php_jview']))
+		{
+			$data['php_jview'] = base64_encode($data['php_jview']);
+		}
+
 		// Set the js_document string to base64 string.
 		if (isset($data['js_document']))
 		{

admin/models/custom_admin_views.php

@@ -266,16 +266,16 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 							continue;
 						}
 
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
 						// decode php_jview_display
 						$item->php_jview_display = base64_decode($item->php_jview_display);
 						// decode php_view
 						$item->php_view = base64_decode($item->php_view);
-						// decode php_jview
+						// decode php_document
-						$item->php_jview = base64_decode($item->php_jview);
+						$item->php_document = base64_decode($item->php_document);
 						// decode default
 						$item->default = base64_decode($item->default);
+						// decode php_jview
+						$item->php_jview = base64_decode($item->php_jview);
 						// decode js_document
 						$item->js_document = base64_decode($item->js_document);
 						// decode javascript_file

admin/models/dynamic_get.php

@@ -100,14 +100,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->join_db_table))
-			{
-				// Convert the join_db_table field to an array.
-				$join_db_table = new Registry;
-				$join_db_table->loadString($item->join_db_table);
-				$item->join_db_table = $join_db_table->toArray();
-			}
-
 			if (!empty($item->filter))
 			{
 				// Convert the filter field to an array.
@@ -148,6 +140,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->join_view_table = $join_view_table->toArray();
 			}
 
+			if (!empty($item->join_db_table))
+			{
+				// Convert the join_db_table field to an array.
+				$join_db_table = new Registry;
+				$join_db_table->loadString($item->join_db_table);
+				$item->join_db_table = $join_db_table->toArray();
+			}
+
 			if (!empty($item->php_custom_get))
 			{
 				// base64 Decode php_custom_get.
@@ -966,19 +966,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// Set the join_db_table items to data.
-		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
-		{
-			$join_db_table = new JRegistry;
-			$join_db_table->loadArray($data['join_db_table']);
-			$data['join_db_table'] = (string) $join_db_table;
-		}
-		elseif (!isset($data['join_db_table']))
-		{
-			// Set the empty join_db_table to data
-			$data['join_db_table'] = '';
-		}
-
 		// Set the filter items to data.
 		if (isset($data['filter']) && is_array($data['filter']))
 		{
@@ -1044,6 +1031,19 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['join_view_table'] = '';
 		}
 
+		// Set the join_db_table items to data.
+		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
+		{
+			$join_db_table = new JRegistry;
+			$join_db_table->loadArray($data['join_db_table']);
+			$data['join_db_table'] = (string) $join_db_table;
+		}
+		elseif (!isset($data['join_db_table']))
+		{
+			// Set the empty join_db_table to data
+			$data['join_db_table'] = '';
+		}
+
 		// Set the php_custom_get string to base64 string.
 		if (isset($data['php_custom_get']))
 		{

admin/models/fields.php

@@ -239,8 +239,9 @@ class ComponentbuilderModelFields extends JModelList
 				0 => 'COM_COMPONENTBUILDER_FIELD_DEFAULT',
 				1 => 'COM_COMPONENTBUILDER_FIELD_JSON',
 				2 => 'COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR',
-				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALKEY',
+				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
-				4 => 'COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_WHMCSKEY'
+				5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
+				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION'
 			);
 			// Now check if value is found in this array
 			if (isset($storeArray[$value]) && ComponentbuilderHelper::checkString($storeArray[$value]))
@@ -312,7 +313,7 @@ class ComponentbuilderModelFields extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.store LIKE '.$search.')');
+				$query->where('(a.name LIKE '.$search.' OR a.fieldtype LIKE '.$search.' OR g.name LIKE '.$search.' OR a.datatype LIKE '.$search.' OR a.indexes LIKE '.$search.' OR a.null_switch LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.xml LIKE '.$search.' OR a.store LIKE '.$search.')');
 			}
 		}
 

admin/models/fields/dynamicdashboard.php

@@ -0,0 +1,217 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		dynamicdashboard.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-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 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Dynamicdashboard Form Field class for the Componentbuilder component
+ */
+class JFormFieldDynamicdashboard extends JFormFieldList
+{
+	/**
+	 * The dynamicdashboard field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'dynamicdashboard'; 
+	/**
+	 * Override to add new button
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   3.2
+	 */
+	protected function getInput()
+	{
+		// see if we should add buttons
+		$setButton = $this->getAttribute('button');
+		// get html
+		$html = parent::getInput();
+		// if true set button
+		if ($setButton === 'true')
+		{
+			$button = array();
+			$script = array();
+			$buttonName = $this->getAttribute('name');
+			// get the input from url
+			$app = JFactory::getApplication();
+			$jinput = $app->input;
+			// get the view name & id
+			$values = $jinput->getArray(array(
+				'id' => 'int',
+				'view' => 'word'
+			));
+			// check if new item
+			$ref = '';
+			$refJ = '';
+			if (!is_null($values['id']) && strlen($values['view']))
+			{
+				// only load referal if not new item.
+				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
+				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
+			}
+			$user = JFactory::getUser();
+			// only add if user allowed to create custom_admin_view
+			if ($user->authorise('core.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			{
+				// build Create button
+				$buttonNamee = trim($buttonName);
+				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
+				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
+				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
+				$buttonNamee = ucfirst(strtolower($buttonNamee));
+				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
+					href="index.php?option=com_componentbuilder&amp;view=custom_admin_view&amp;layout=edit'.$ref.'" >
+					<span class="icon-new icon-white"></span></a>';
+			}
+			// only add if user allowed to edit custom_admin_view
+			if (($buttonName === 'custom_admin_view' || $buttonName === 'custom_admin_views')  && $user->authorise('core.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
+			{
+				// build edit button
+				$buttonNamee = trim($buttonName);
+				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
+				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
+				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
+				$buttonNamee = ucfirst(strtolower($buttonNamee));
+				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
+					<span class="icon-edit"></span></a>';
+				// build script
+				$script[] = "
+					jQuery(document).ready(function() {
+						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
+							e.preventDefault();
+							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
+							".$buttonName."Button(".$buttonName."Value);
+						});
+						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
+						".$buttonName."Button(".$buttonName."Value);
+					});
+					function ".$buttonName."Button(value) {
+						if (value > 0) {
+							// hide the create button
+							jQuery('#".$buttonName."Create').hide();
+							// show edit button
+							jQuery('#".$buttonName."Edit').show();
+							var url = 'index.php?option=com_componentbuilder&view=custom_admin_views&task=custom_admin_view.edit&id='+value+'".$refJ."';
+							jQuery('#".$buttonName."Edit').attr('href', url);
+						} else {
+							// show the create button
+							jQuery('#".$buttonName."Create').show();
+							// hide edit button
+							jQuery('#".$buttonName."Edit').hide();
+						}
+					}";
+			}
+			// check if button was created for custom_admin_view field.
+			if (is_array($button) && count($button) > 0)
+			{
+				// Load the needed script.
+				$document = JFactory::getDocument();
+				$document->addScriptDeclaration(implode(' ',$script));
+				// return the button attached to input field.
+				return '<div class="input-append">' .$html . implode('',$button).'</div>';
+			}
+		}
+		return $html;
+	}
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array		An array of JHtml options.
+	 */
+	public function getOptions()
+	{
+		// load the db opbject
+		$db = JFactory::getDBO();		
+		// get the input from url
+		$jinput = JFactory::getApplication()->input;
+		// get the id
+		$ID = $jinput->getInt('id', 0);
+		// set the targets
+		$targets = array('adminview' => 'admin_view', 'customadminview' => 'custom_admin_view');
+		$t = array('adminview' => 'A', 'customadminview' => 'C');
+		// rest the options
+		$options = array();
+		// reset the custom admin views array
+		$views = false;
+		if (is_numeric($ID) && $ID >= 1)
+		{
+			// get the linked back-end views
+			foreach ($targets as $target => $view)
+			{
+				if ($result = ComponentbuilderHelper::getVar('component_'.$view.'s', (int) $ID, 'joomla_component', 'add'.$view.'s'))
+				{
+					$views[$target] = $result;
+				}
+			}
+		}
+		else
+		{
+			// not linked so there is none available
+			return array(JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE')));
+		}
+		// check if we found any values
+		if (ComponentbuilderHelper::checkArray($views))
+		{
+			foreach ($targets as $target => $view)
+			{
+				if (isset($views[$target]) && ComponentbuilderHelper::checkJson($views[$target]))
+				{
+					// convert to an array
+					$value = json_decode($views[$target], true);
+					$type = ComponentbuilderHelper::safeString($view, 'w');
+					if (ComponentbuilderHelper::checkArray($value))
+					{
+						foreach ($value as $_view)
+						{
+							if (isset($_view[$target]) && is_numeric($_view[$target]))
+							{
+								// set the view to the selections if found
+								if ($name = ComponentbuilderHelper::getVar($view, (int) $_view[$target], 'id', 'system_name'))
+								{
+									$options[] = JHtml::_('select.option', $t[$target].'_'.$_view[$target], $name.'  ['.$type.']');
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		// return found options
+		if (ComponentbuilderHelper::checkArray($options))
+		{
+			array_unshift($options , JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_SELECT_AN_OPTION')));
+			return $options;
+		}
+		// not linked so there is none available
+		return array(JHtml::_('select.option', '', JText::_('COM_COMPONENTBUILDER_YOU_MUST_FIRST_LINK_AN_ADMIN_OR_A_CUSTOM_ADMIN_VIEW_TO_THIS_COMPONENT_THEN_YOU_CAN_SELECT_IT_HERE')));
+	}
+}

admin/models/fieldtype.php

@@ -129,7 +129,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.fieldtype');
 			}
 		}
-		$this->fieldtypevvvw = $item->id;
+		$this->fieldtypevvvv = $item->id;
 
 		return $item;
 	}
@@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getWadfields()
+	public function getWacfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -159,15 +159,15 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		$query->select($db->quoteName('g.name','fieldtype_name'));
 		$query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'g') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('g.id') . ')');
 
-		// Filter by fieldtypevvvw global.
+		// Filter by fieldtypevvvv global.
-		$fieldtypevvvw = $this->fieldtypevvvw;
+		$fieldtypevvvv = $this->fieldtypevvvv;
-		if (is_numeric($fieldtypevvvw ))
+		if (is_numeric($fieldtypevvvv ))
 		{
-			$query->where('a.fieldtype = ' . (int) $fieldtypevvvw );
+			$query->where('a.fieldtype = ' . (int) $fieldtypevvvv );
 		}
-		elseif (is_string($fieldtypevvvw))
+		elseif (is_string($fieldtypevvvv))
 		{
-			$query->where('a.fieldtype = ' . $db->quote($fieldtypevvvw));
+			$query->where('a.fieldtype = ' . $db->quote($fieldtypevvvv));
 		}
 		else
 		{
@@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWadfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWacfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWadfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWacfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWadfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWacfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWadfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWacfields($item->store, 'store');
 				}
 			}
 
@@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationWadfields($value,$name)
+	public function selectionTranslationWacfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
@@ -304,8 +304,9 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				0 => 'COM_COMPONENTBUILDER_FIELD_DEFAULT',
 				1 => 'COM_COMPONENTBUILDER_FIELD_JSON',
 				2 => 'COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR',
-				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALKEY',
+				3 => 'COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY',
-				4 => 'COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_WHMCSKEY'
+				5 => 'COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY',
+				4 => 'COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION'
 			);
 			// Now check if value is found in this array
 			if (isset($storeArray[$value]) && ComponentbuilderHelper::checkString($storeArray[$value]))
@@ -403,6 +404,22 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$form->setFieldAttribute('name', 'required', 'false');
 			}
 		}
+		// Modify the form based on Edit Properties access controls.
+		if ($id != 0 && (!$user->authorise('fieldtype.edit.properties', 'com_componentbuilder.fieldtype.' . (int) $id))
+			|| ($id == 0 && !$user->authorise('fieldtype.edit.properties', 'com_componentbuilder')))
+		{
+			// Disable fields for display.
+			$form->setFieldAttribute('properties', 'disabled', 'true');
+			// Disable fields for display.
+			$form->setFieldAttribute('properties', 'readonly', 'true');
+			if (!$form->getValue('properties'))
+			{
+				// Disable fields while saving.
+				$form->setFieldAttribute('properties', 'filter', 'unset');
+				// Disable fields while saving.
+				$form->setFieldAttribute('properties', 'required', 'false');
+			}
+		}
 		// Modify the form based on Edit Description access controls.
 		if ($id != 0 && (!$user->authorise('fieldtype.edit.description', 'com_componentbuilder.fieldtype.' . (int) $id))
 			|| ($id == 0 && !$user->authorise('fieldtype.edit.description', 'com_componentbuilder')))
@@ -435,22 +452,6 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				$form->setFieldAttribute('short_description', 'required', 'false');
 			}
 		}
-		// Modify the form based on Edit Properties access controls.
-		if ($id != 0 && (!$user->authorise('fieldtype.edit.properties', 'com_componentbuilder.fieldtype.' . (int) $id))
-			|| ($id == 0 && !$user->authorise('fieldtype.edit.properties', 'com_componentbuilder')))
-		{
-			// Disable fields for display.
-			$form->setFieldAttribute('properties', 'disabled', 'true');
-			// Disable fields for display.
-			$form->setFieldAttribute('properties', 'readonly', 'true');
-			if (!$form->getValue('properties'))
-			{
-				// Disable fields while saving.
-				$form->setFieldAttribute('properties', 'filter', 'unset');
-				// Disable fields while saving.
-				$form->setFieldAttribute('properties', 'required', 'false');
-			}
-		}
 		// Only load these values if no id is found
 		if (0 == $id)
 		{

admin/models/fieldtypes.php

@@ -45,10 +45,10 @@ class ComponentbuilderModelFieldtypes extends JModelList
 				'a.created_by','created_by',
 				'a.modified_by','modified_by',
 				'a.name','name',
+				'a.short_description','short_description',
 				'c.title','category_title',
 				'c.id', 'category_id',
-				'a.catid', 'catid',
+				'a.catid', 'catid'
-				'a.short_description','short_description'
 			);
 		}
 
@@ -72,6 +72,9 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		$name = $this->getUserStateFromRequest($this->context . '.filter.name', 'filter_name');
 		$this->setState('filter.name', $name);
 
+		$short_description = $this->getUserStateFromRequest($this->context . '.filter.short_description', 'filter_short_description');
+		$this->setState('filter.short_description', $short_description);
+
 		$category = $app->getUserStateFromRequest($this->context . '.filter.category', 'filter_category');
 		$this->setState('filter.category', $category);
 
@@ -79,10 +82,7 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		$this->setState('filter.category_id', $categoryId);
 
 		$catid = $app->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid');
-		$this->setState('filter.catid', $catid);
+		$this->setState('filter.catid', $catid);
-
-		$short_description = $this->getUserStateFromRequest($this->context . '.filter.short_description', 'filter_short_description');
-		$this->setState('filter.short_description', $short_description);
         
 		$sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
 		$this->setState('filter.sorting', $sorting);
@@ -197,7 +197,7 @@ class ComponentbuilderModelFieldtypes extends JModelList
 			else
 			{
 				$search = $db->quote('%' . $db->escape($search) . '%');
-				$query->where('(a.name LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.description LIKE '.$search.' OR a.short_description LIKE '.$search.')');
+				$query->where('(a.name LIKE '.$search.' OR a.description LIKE '.$search.' OR a.short_description LIKE '.$search.' OR a.catid LIKE '.$search.')');
 			}
 		}
 
@@ -351,10 +351,10 @@ class ComponentbuilderModelFieldtypes extends JModelList
 		$id .= ':' . $this->getState('filter.created_by');
 		$id .= ':' . $this->getState('filter.modified_by');
 		$id .= ':' . $this->getState('filter.name');
+		$id .= ':' . $this->getState('filter.short_description');
 		$id .= ':' . $this->getState('filter.category');
 		$id .= ':' . $this->getState('filter.category_id');
-		$id .= ':' . $this->getState('filter.catid');
+		$id .= ':' . $this->getState('filter.catid');
-		$id .= ':' . $this->getState('filter.short_description');
 
 		return parent::getStoreId($id);
 	}

admin/models/forms/admin_fields.xml

@@ -4,242 +4,277 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL"
-                <!-- Admin_view Field. Type: Adminviewsreadonly. (custom)-->
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_DESC"
-                <field type="adminviewsreadonly"
+			size="6"
-                       name="admin_view"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADMIN_VIEW_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADMIN_VIEW_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Admin_view Field. Type: Adminviewsreadonly. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="adminviewsreadonly"
-                       button="false" />
+			name="admin_view"
-                <!-- Note_on_views Field. Type: Note. A None Database Field. (joomla)-->
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADMIN_VIEW_LABEL"
-                <field type="note"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADMIN_VIEW_DESCRIPTION"
-                       name="note_on_views"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_LABEL"
+			multiple="false"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_DESCRIPTION"
+			required="true"
-                       heading="h4"
+			readonly="true"
-                       class="alert alert-info note_on_views" />
+			button="false"
-                <!-- Addfields Field. Type: Subform. (joomla)-->
+		/>
-                <field type="subform"
+		<!-- Addfields Field. Type: Subform. (joomla) -->
-                       name="addfields"
+		<field
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_LABEL"
+			type="subform"
-                       layout="joomla.form.field.subform.repeatable-table"
+			name="addfields"
-                       multiple="true"
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION"
+			layout="joomla.form.field.subform.repeatable-table"
-                       icon="list"
+			multiple="true"
-                       maximum="800">
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION"
-                        <form hidden="true"
+			icon="list"
-                              name="list_addfields_modal"
+			maximum="800">
-                              repeat="true">
+			<form hidden="true" name="list_addfields_modal" repeat="true">
-                                <!-- Field Field. Type: Fields. (custom)-->
+				<!-- Field Field. Type: Fields. (custom) -->
-                                <field type="fields"
+				<field
-                                       name="field"
+					type="fields"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL"
+					name="field"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL"
-                                       class="list_class"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
-                                       multiple="false"
+					class="list_class"
-                                       required="false"
+					multiple="false"
-                                       button="false" />
+					required="false"
-                                <!-- List Field. Type: Checkbox. (joomla)-->
+					button="false"
-                                <field type="checkbox"
+				/>
-                                       name="list"
+				<!-- List Field. Type: Checkbox. (joomla) -->
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_LABEL"
+				<field
-                                       value="1"
+					type="checkbox"
-                                       required="false"
+					name="list"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_DESCRIPTION"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_LABEL"
-                                       class="inputbox" />
+					value="1"
-                                <!-- Order_list Field. Type: Integer. (joomla)-->
+					required="false"
-                                <field type="integer"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_DESCRIPTION"
-                                       name="order_list"
+					class="inputbox"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_LIST_LABEL"
+				/>
-                                       default="0"
+				<!-- Order_list Field. Type: Integer. (joomla) -->
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_LIST_DESCRIPTION"
+				<field
-                                       class="fieldSmall"
+					type="integer"
-                                       required="false"
+					name="order_list"
-                                       first="0"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_LIST_LABEL"
-                                       last="20"
+					default="0"
-                                       step="1" />
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_LIST_DESCRIPTION"
-                                <!-- Title Field. Type: Checkbox. (joomla)-->
+					class="fieldSmall"
-                                <field type="checkbox"
+					required="false"
-                                       name="title"
+					first="0"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_LABEL"
+					last="20"
-                                       value="1"
+					step="1"
-                                       required="false"
+				/>
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_DESCRIPTION"
+				<!-- Title Field. Type: Checkbox. (joomla) -->
-                                       class="inputbox" />
+				<field
-                                <!-- Alias Field. Type: Checkbox. (joomla)-->
+					type="checkbox"
-                                <field type="checkbox"
+					name="title"
-                                       name="alias"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_LABEL"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIAS_LABEL"
+					value="1"
-                                       value="1"
+					required="false"
-                                       required="false"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIAS_DESCRIPTION"
+					class="inputbox"
-                                       class="inputbox" />
+				/>
-                                <!-- Sort Field. Type: Checkbox. (joomla)-->
+				<!-- Alias Field. Type: Checkbox. (joomla) -->
-                                <field type="checkbox"
+				<field
-                                       name="sort"
+					type="checkbox"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL"
+					name="alias"
-                                       value="1"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIAS_LABEL"
-                                       required="false"
+					value="1"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION"
+					required="false"
-                                       class="inputbox" />
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIAS_DESCRIPTION"
-                                <!-- Search Field. Type: Checkbox. (joomla)-->
+					class="inputbox"
-                                <field type="checkbox"
+				/>
-                                       name="search"
+				<!-- Sort Field. Type: Checkbox. (joomla) -->
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL"
+				<field
-                                       value="1"
+					type="checkbox"
-                                       required="false"
+					name="sort"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_DESCRIPTION"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL"
-                                       class="inputbox" />
+					value="1"
-                                <!-- Filter Field. Type: Checkbox. (joomla)-->
+					required="false"
-                                <field type="checkbox"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION"
-                                       name="filter"
+					class="inputbox"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_LABEL"
+				/>
-                                       value="1"
+				<!-- Search Field. Type: Checkbox. (joomla) -->
-                                       required="false"
+				<field
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_DESCRIPTION"
+					type="checkbox"
-                                       class="inputbox" />
+					name="search"
-                                <!-- Link Field. Type: Checkbox. (joomla)-->
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL"
-                                <field type="checkbox"
+					value="1"
-                                       name="link"
+					required="false"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_DESCRIPTION"
-                                       value="1"
+					class="inputbox"
-                                       required="false"
+				/>
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_DESCRIPTION"
+				<!-- Filter Field. Type: Checkbox. (joomla) -->
-                                       class="inputbox" />
+				<field
-                                <!-- Tab Field. Type: Viewtabs. (custom)-->
+					type="checkbox"
-                                <field type="viewtabs"
+					name="filter"
-                                       name="tab"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_LABEL"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_LABEL"
+					value="1"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_DESCRIPTION"
+					required="false"
-                                       class="fieldMedium"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FILTER_DESCRIPTION"
-                                       multiple="false"
+					class="inputbox"
-                                       default="1"
+				/>
-                                       required="false"
+				<!-- Link Field. Type: Checkbox. (joomla) -->
-                                       button="false" />
+				<field
-                                <!-- Alignment Field. Type: List. (joomla)-->
+					type="checkbox"
-                                <field type="list"
+					name="link"
-                                       name="alignment"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_LABEL"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIGNMENT_LABEL"
+					value="1"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIGNMENT_DESCRIPTION"
+					required="false"
-                                       class="fieldMedium"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_DESCRIPTION"
-                                       multiple="false"
+					class="inputbox"
-                                       filter="INT"
+				/>
-                                       required="false"
+				<!-- Tab Field. Type: Viewtabs. (custom) -->
-                                       default="1">
+				<field
-                                        <!-- Option Set.-->
+					type="viewtabs"
-                                        <option value="1">COM_COMPONENTBUILDER_ADMIN_FIELDS_LEFT_IN_TAB</option>
+					name="tab"
-                                        <option value="2">COM_COMPONENTBUILDER_ADMIN_FIELDS_RIGHT_IN_TAB</option>
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_LABEL"
-                                        <option value="3">COM_COMPONENTBUILDER_ADMIN_FIELDS_FULL_WIDTH_IN_TAB</option>
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_DESCRIPTION"
-                                        <option value="4">COM_COMPONENTBUILDER_ADMIN_FIELDS_ABOVE_TABS</option>
+					class="fieldMedium"
-                                        <option value="5">COM_COMPONENTBUILDER_ADMIN_FIELDS_UNDERNEATH_TABS</option>
+					multiple="false"
-                                        <option value="6">COM_COMPONENTBUILDER_ADMIN_FIELDS_LEFT_OF_TABS</option>
+					default="1"
-                                        <option value="7">COM_COMPONENTBUILDER_ADMIN_FIELDS_RIGHT_OF_TABS</option>
+					required="false"
-                                </field>
+					button="false"
-                                <!-- Order_edit Field. Type: Integer. (joomla)-->
+				/>
-                                <field type="integer"
+				<!-- Alignment Field. Type: List. (joomla) -->
-                                       name="order_edit"
+				<field
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_EDIT_LABEL"
+					type="list"
-                                       default="0"
+					name="alignment"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_EDIT_DESCRIPTION"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIGNMENT_LABEL"
-                                       class="fieldSmall"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ALIGNMENT_DESCRIPTION"
-                                       required="false"
+					class="fieldMedium"
-                                       first="0"
+					multiple="false"
-                                       last="100"
+					filter="INT"
-                                       step="1" />
+					required="false"
-                                <!-- Permission Field. Type: List. (joomla)-->
+					default="1">
-                                <field type="list"
+					<!-- Option Set. -->
-                                       name="permission"
+					<option value="1">
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_LABEL"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_LEFT_IN_TAB</option>
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_DESCRIPTION"
+					<option value="2">
-                                       class="fieldMedium"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_RIGHT_IN_TAB</option>
-                                       multiple="false"
+					<option value="3">
-                                       required="false"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_FULL_WIDTH_IN_TAB</option>
-                                       default="0">
+					<option value="4">
-                                        <!-- Option Set.-->
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_ABOVE_TABS</option>
-                                        <option value="0">COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE</option>
+					<option value="5">
-                                        <option value=" 1">COM_COMPONENTBUILDER_ADMIN_FIELDS_EDITING</option>
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_UNDERNEATH_TABS</option>
-                                </field>
+					<option value="6">
-                        </form>
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_LEFT_OF_TABS</option>
-                </field>
+					<option value="7">
-        </fieldset>
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_RIGHT_OF_TABS</option>
+				</field>
+				<!-- Order_edit Field. Type: Integer. (joomla) -->
+				<field
+					type="integer"
+					name="order_edit"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_EDIT_LABEL"
+					default="0"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_EDIT_DESCRIPTION"
+					class="fieldSmall"
+					required="false"
+					first="0"
+					last="100"
+					step="1"
+				/>
+				<!-- Permission Field. Type: List. (joomla) -->
+				<field
+					type="list"
+					name="permission"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_LABEL"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_DESCRIPTION"
+					class="fieldMedium"
+					multiple="false"
+					required="false"
+					default="0">
+					<!-- Option Set. -->
+					<option value="0">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE</option>
+					<option value=" 1">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_EDITING</option>
+				</field>
+			</form>
+		</field>
+		<!-- Note_on_views Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_views" label="COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_views" />
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/admin_fields_conditions.js

@@ -24,6 +24,7 @@
 
 
 
+
 function getFieldSelectOptions_server(fieldId){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldSelectOptions&format=json";
 	if(token.length > 0 && fieldId > 0){

admin/models/forms/admin_fields_conditions.xml

@@ -4,193 +4,219 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_VERSION_LABEL"
-                <!-- Admin_view Field. Type: Adminviewsreadonly. (custom)-->
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_VERSION_DESC"
-                <field type="adminviewsreadonly"
+			size="6"
-                       name="admin_view"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADMIN_VIEW_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADMIN_VIEW_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Admin_view Field. Type: Adminviewsreadonly. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="adminviewsreadonly"
-                       button="false" />
+			name="admin_view"
-                <!-- Note_on_conditions Field. Type: Note. A None Database Field. (joomla)-->
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADMIN_VIEW_LABEL"
-                <field type="note"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADMIN_VIEW_DESCRIPTION"
-                       name="note_on_conditions"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NOTE_ON_CONDITIONS_LABEL"
+			multiple="false"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NOTE_ON_CONDITIONS_DESCRIPTION"
+			required="true"
-                       heading="h4"
+			readonly="true"
-                       class="alert alert-info note_on_conditions"
+			button="false"
-                       close="true" />
+		/>
-                <!-- Addconditions Field. Type: Subform. (joomla)-->
+		<!-- Addconditions Field. Type: Subform. (joomla) -->
-                <field type="subform"
+		<field
-                       name="addconditions"
+			type="subform"
-                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS_LABEL"
+			name="addconditions"
-                       layout="joomla.form.field.subform.repeatable-table"
+			label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS_LABEL"
-                       multiple="true"
+			layout="joomla.form.field.subform.repeatable-table"
-                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS_DESCRIPTION"
+			multiple="true"
-                       icon="list"
+			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS_DESCRIPTION"
-                       maximum="500">
+			icon="list"
-                        <form hidden="true"
+			maximum="500">
-                              name="list_addconditions_modal"
+			<form hidden="true" name="list_addconditions_modal" repeat="true">
-                              repeat="true">
+				<!-- Target_field Field. Type: Targetfields. (custom) -->
-                                <!-- Target_field Field. Type: Targetfields. (custom)-->
+				<field
-                                <field type="targetfields"
+					type="targetfields"
-                                       name="target_field"
+					name="target_field"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_LABEL"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_LABEL"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_DESCRIPTION"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_FIELD_DESCRIPTION"
-                                       class="fieldMedium"
+					class="fieldMedium"
-                                       multiple="true"
+					multiple="true"
-                                       required="false"
+					required="false"
-                                       button="false" />
+					button="false"
-                                <!-- Target_behavior Field. Type: List. (joomla)-->
+				/>
-                                <field type="list"
+				<!-- Target_behavior Field. Type: List. (joomla) -->
-                                       name="target_behavior"
+				<field
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_BEHAVIOR_LABEL"
+					type="list"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_BEHAVIOR_DESCRIPTION"
+					name="target_behavior"
-                                       class="list_class"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_BEHAVIOR_LABEL"
-                                       multiple="false"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_BEHAVIOR_DESCRIPTION"
-                                       filter="INT"
+					class="list_class"
-                                       required="false"
+					multiple="false"
-                                       default="1">
+					filter="INT"
-                                        <!-- Option Set.-->
+					required="false"
-                                        <option value="1">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_SHOW</option>
+					default="1">
-                                        <option value="2">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_HIDE</option>
+					<!-- Option Set. -->
-                                </field>
+					<option value="1">
-                                <!-- Target_relation Field. Type: List. (joomla)-->
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_SHOW</option>
-                                <field type="list"
+					<option value="2">
-                                       name="target_relation"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_HIDE</option>
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_RELATION_LABEL"
+				</field>
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_RELATION_DESCRIPTION"
+				<!-- Target_relation Field. Type: List. (joomla) -->
-                                       class="list_class"
+				<field
-                                       multiple="false"
+					type="list"
-                                       filter="INT"
+					name="target_relation"
-                                       required="false"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_RELATION_LABEL"
-                                       default="0">
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_TARGET_RELATION_DESCRIPTION"
-                                        <!-- Option Set.-->
+					class="list_class"
-                                        <option value="0">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ISOLATE</option>
+					multiple="false"
-                                        <option value="1">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CHAIN</option>
+					filter="INT"
-                                </field>
+					required="false"
-                                <!-- Match_field Field. Type: Matchfield. (custom)-->
+					default="0">
-                                <field type="matchfield"
+					<!-- Option Set. -->
-                                       name="match_field"
+					<option value="0">
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_LABEL"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ISOLATE</option>
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_DESCRIPTION"
+					<option value="1">
-                                       multiple="false"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_CHAIN</option>
-                                       required="false"
+				</field>
-                                       button="false" />
+				<!-- Match_field Field. Type: Matchfield. (custom) -->
-                                <!-- Match_behavior Field. Type: List. (joomla)-->
+				<field
-                                <field type="list"
+					type="matchfield"
-                                       name="match_behavior"
+					name="match_field"
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_BEHAVIOR_LABEL"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_LABEL"
-                                       description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_BEHAVIOR_DESCRIPTION"
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_FIELD_DESCRIPTION"
-                                       class="list_class"
+					multiple="false"
-                                       multiple="false"
+					required="false"
-                                       filter="INT"
+					button="false"
-                                       required="false"
+				/>
-                                       default="1">
+				<!-- Match_behavior Field. Type: List. (joomla) -->
-                                        <!-- Option Set.-->
+				<field
-                                        <option value="1">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_IS_ONLY_FOUR_LISTRADIOCHECKBOXES</option>
+					type="list"
-                                        <option value="2">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_IS_NOT_ONLY_FOUR_LISTRADIOCHECKBOXES</option>
+					name="match_behavior"
-                                        <option value="3">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST</option>
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_BEHAVIOR_LABEL"
-                                        <option value="4">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ACTIVE_ONLY_FOUR_TEXT_FIELD</option>
+					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_BEHAVIOR_DESCRIPTION"
-                                        <option value="5">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_UNACTIVE_ONLY_FOUR_TEXT_FIELD</option>
+					class="list_class"
-                                        <option value="6">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_KEY_WORD_ALL_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+					multiple="false"
-                                        <option value="7">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+					filter="INT"
-                                        <option value="8">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_KEY_WORD_ALL_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+					required="false"
-                                        <option value="9">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+					default="1">
-                                        <option value="10">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+					<!-- Option Set. -->
-                                        <option value="11">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+					<option value="1">
-                                        <option value="12">COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_IS_ONLY_FOUR_LISTRADIOCHECKBOXES</option>
-                                </field>
+					<option value="2">
-                                <!-- Match_options Field. Type: Textarea. (joomla)-->
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_IS_NOT_ONLY_FOUR_LISTRADIOCHECKBOXES</option>
-                                <field type="textarea"
+					<option value="3">
-                                       name="match_options"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST</option>
-                                       label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_OPTIONS_LABEL"
+					<option value="4">
-                                       rows="10"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ACTIVE_ONLY_FOUR_TEXT_FIELD</option>
-                                       cols="5"
+					<option value="5">
-                                       class="text_area"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_UNACTIVE_ONLY_FOUR_TEXT_FIELD</option>
-                                       filter="STRING"
+					<option value="6">
-                                       hint="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_OPTIONS_HINT"
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_KEY_WORD_ALL_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
-                                       required="false" />
+					<option value="7">
-                        </form>
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
-                </field>
+					<option value="8">
-        </fieldset>
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_KEY_WORD_ALL_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+					<option value="9">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+					<option value="10">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+					<option value="11">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+					<option value="12">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+				</field>
+				<!-- Match_options Field. Type: Textarea. (joomla) -->
+				<field
+					type="textarea"
+					name="match_options"
+					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_OPTIONS_LABEL"
+					rows="10"
+					cols="5"
+					class="text_area"
+					filter="STRING"
+					hint="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_MATCH_OPTIONS_HINT"
+					required="false"
+				/>
+			</form>
+		</field>
+		<!-- Note_on_conditions Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_conditions" label="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NOTE_ON_CONDITIONS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NOTE_ON_CONDITIONS_DESCRIPTION" heading="h4" class="alert alert-info note_on_conditions" close="true" />
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/component_config.xml

@@ -4,142 +4,155 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_VERSION_LABEL"
-                <!-- Joomla_component Field. Type: Joomlacomponents. (custom)-->
+			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_VERSION_DESC"
-                <field type="joomlacomponents"
+			size="6"
-                       name="joomla_component"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Joomla_component Field. Type: Joomlacomponents. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="joomlacomponents"
-                       button="false" />
+			name="joomla_component"
-                <!-- Addconfig Field. Type: Subform. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_LABEL"
-                <field type="subform"
+			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_JOOMLA_COMPONENT_DESCRIPTION"
-                       name="addconfig"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ADDCONFIG_LABEL"
+			multiple="false"
-                       layout="joomla.form.field.subform.repeatable-table"
+			required="true"
-                       multiple="true"
+			readonly="true"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ADDCONFIG_DESCRIPTION"
+			button="false"
-                       icon="list"
+		/>
-                       maximum="500">
+		<!-- Addconfig Field. Type: Subform. (joomla) -->
-                        <form hidden="true"
+		<field
-                              name="list_addconfig_modal"
+			type="subform"
-                              repeat="true">
+			name="addconfig"
-                                <!-- Field Field. Type: Fields. (custom)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ADDCONFIG_LABEL"
-                                <field type="fields"
+			layout="joomla.form.field.subform.repeatable-table"
-                                       name="field"
+			multiple="true"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_LABEL"
+			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ADDCONFIG_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
+			icon="list"
-                                       class="list_class"
+			maximum="500">
-                                       multiple="false"
+			<form hidden="true" name="list_addconfig_modal" repeat="true">
-                                       required="false"
+				<!-- Field Field. Type: Fields. (custom) -->
-                                       button="false" />
+				<field
-                                <!-- Custom_value Field. Type: Textarea. (joomla)-->
+					type="fields"
-                                <field type="textarea"
+					name="field"
-                                       name="custom_value"
+					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_LABEL"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
-                                       rows="2"
+					class="list_class"
-                                       cols="4"
+					multiple="false"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_DESCRIPTION"
+					required="false"
-                                       class="text_area"
+					button="false"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_HINT"
+				/>
-                                       required="false"
+				<!-- Custom_value Field. Type: Textarea. (joomla) -->
-                                       readonly="false"
+				<field
-                                       disabled="false" />
+					type="textarea"
-                                <!-- Tabname Field. Type: Text. (joomla)-->
+					name="custom_value"
-                                <field type="text"
+					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_LABEL"
-                                       name="tabname"
+					rows="2"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_LABEL"
+					cols="4"
-                                       size="40"
+					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_DESCRIPTION"
-                                       maxlength="150"
+					class="text_area"
-                                       default="Global"
+					hint="COM_COMPONENTBUILDER_COMPONENT_CONFIG_CUSTOM_VALUE_HINT"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_DESCRIPTION"
+					required="false"
-                                       class="text_area"
+					readonly="false"
-                                       readonly="false"
+					disabled="false"
-                                       disabled="false"
+				/>
-                                       required="false"
+				<!-- Tabname Field. Type: Text. (joomla) -->
-                                       filter="STRING"
+				<field
-                                       message="COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_MESSAGE"
+					type="text"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_HINT" />
+					name="tabname"
-                        </form>
+					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_LABEL"
-                </field>
+					size="40"
-        </fieldset>
+					maxlength="150"
+					default="Global"
+					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="false"
+					filter="STRING"
+					message="COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_MESSAGE"
+					hint="COM_COMPONENTBUILDER_COMPONENT_CONFIG_TABNAME_HINT"
+				/>
+			</form>
+		</field>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/component_custom_admin_menus.xml

@@ -4,188 +4,211 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_VERSION_LABEL"
-                <!-- Joomla_component Field. Type: Joomlacomponents. (custom)-->
+			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_VERSION_DESC"
-                <field type="joomlacomponents"
+			size="6"
-                       name="joomla_component"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Joomla_component Field. Type: Joomlacomponents. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="joomlacomponents"
-                       button="false" />
+			name="joomla_component"
-                <!-- Addcustommenus Field. Type: Subform. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_LABEL"
-                <field type="subform"
+			description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_JOOMLA_COMPONENT_DESCRIPTION"
-                       name="addcustommenus"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ADDCUSTOMMENUS_LABEL"
+			multiple="false"
-                       layout="joomla.form.field.subform.repeatable-table"
+			required="true"
-                       multiple="true"
+			readonly="true"
-                       icon="list"
+			button="false"
-                       maximum="50">
+		/>
-                        <form hidden="true"
+		<!-- Addcustommenus Field. Type: Subform. (joomla) -->
-                              name="list_addcustommenus_modal"
+		<field
-                              repeat="true">
+			type="subform"
-                                <!-- Name Field. Type: Text. (joomla)-->
+			name="addcustommenus"
-                                <field type="text"
+			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ADDCUSTOMMENUS_LABEL"
-                                       name="name"
+			layout="joomla.form.field.subform.repeatable-table"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_LABEL"
+			multiple="true"
-                                       size="40"
+			icon="list"
-                                       maxlength="150"
+			maximum="50">
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_DESCRIPTION"
+			<form hidden="true" name="list_addcustommenus_modal" repeat="true">
-                                       class="text_area"
+				<!-- Name Field. Type: Text. (joomla) -->
-                                       readonly="false"
+				<field
-                                       disabled="false"
+					type="text"
-                                       required="false"
+					name="name"
-                                       filter="STRING"
+					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_LABEL"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_MESSAGE"
+					size="40"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_HINT" />
+					maxlength="150"
-                                <!-- Name_code Field. Type: Text. (joomla)-->
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_DESCRIPTION"
-                                <field type="text"
+					class="text_area"
-                                       name="name_code"
+					readonly="false"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_LABEL"
+					disabled="false"
-                                       size="40"
+					required="false"
-                                       maxlength="50"
+					filter="STRING"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_DESCRIPTION"
+					message="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_MESSAGE"
-                                       class="text_area"
+					hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_HINT"
-                                       required="false"
+				/>
-                                       filter="CMD"
+				<!-- Name_code Field. Type: Text. (joomla) -->
-                                       message="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_MESSAGE"
+				<field
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_HINT" />
+					type="text"
-                                <!-- Link Field. Type: Text. (joomla)-->
+					name="name_code"
-                                <field type="text"
+					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_LABEL"
-                                       name="link"
+					size="40"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_LINK_LABEL"
+					maxlength="50"
-                                       size="50"
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_DESCRIPTION"
-                                       maxlength="150"
+					class="text_area"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_LINK_DESCRIPTION"
+					required="false"
-                                       class="text_area"
+					filter="CMD"
-                                       readonly="false"
+					message="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_MESSAGE"
-                                       disabled="false"
+					hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NAME_CODE_HINT"
-                                       required="false"
+				/>
-                                       filter="STRING"
+				<!-- Link Field. Type: Text. (joomla) -->
-                                       message="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_LINK_MESSAGE"
+				<field
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_LINK_HINT" />
+					type="text"
-                                <!-- Icon Field. Type: Filelist. (joomla)-->
+					name="link"
-                                <field type="filelist"
+					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_LINK_LABEL"
-                                       name="icon"
+					size="50"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ICON_LABEL"
+					maxlength="150"
-                                       directory="images"
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_LINK_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ICON_DESCRIPTION"
+					class="text_area"
-                                       hide_default="true" />
+					readonly="false"
-                                <!-- Mainmenu Field. Type: Checkbox. (joomla)-->
+					disabled="false"
-                                <field type="checkbox"
+					required="false"
-                                       name="mainmenu"
+					filter="STRING"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_LABEL"
+					message="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_LINK_MESSAGE"
-                                       value="1"
+					hint="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_LINK_HINT"
-                                       default="1"
+				/>
-                                       required="false"
+				<!-- Icon Field. Type: Filelist. (joomla) -->
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_DESCRIPTION"
+				<field
-                                       class="inputbox" />
+					type="filelist"
-                                <!-- Dashboard_list Field. Type: Checkbox. (joomla)-->
+					name="icon"
-                                <field type="checkbox"
+					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ICON_LABEL"
-                                       name="dashboard_list"
+					directory="images"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ICON_DESCRIPTION"
-                                       value="1"
+					hide_default="true"
-                                       default="1"
+				/>
-                                       required="false"
+				<!-- Mainmenu Field. Type: Checkbox. (joomla) -->
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_DESCRIPTION"
+				<field
-                                       class="inputbox" />
+					type="checkbox"
-                                <!-- Submenu Field. Type: Checkbox. (joomla)-->
+					name="mainmenu"
-                                <field type="checkbox"
+					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_LABEL"
-                                       name="submenu"
+					value="1"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_LABEL"
+					default="1"
-                                       value="1"
+					required="false"
-                                       default="1"
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_MAINMENU_DESCRIPTION"
-                                       required="false"
+					class="inputbox"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_DESCRIPTION"
+				/>
-                                       class="inputbox" />
+				<!-- Dashboard_list Field. Type: Checkbox. (joomla) -->
-                                <!-- Before Field. Type: Componentadminmenus. (custom)-->
+				<field
-                                <field type="componentadminmenus"
+					type="checkbox"
-                                       name="before"
+					name="dashboard_list"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_LABEL"
+					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_LABEL"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_DESCRIPTION"
+					value="1"
-                                       class="list_class fieldMedium"
+					default="1"
-                                       multiple="false"
+					required="false"
-                                       required="false"
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_DASHBOARD_LIST_DESCRIPTION"
-                                       button="false" />
+					class="inputbox"
-                        </form>
+				/>
-                </field>
+				<!-- Submenu Field. Type: Checkbox. (joomla) -->
-        </fieldset>
+				<field
+					type="checkbox"
+					name="submenu"
+					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_LABEL"
+					value="1"
+					default="1"
+					required="false"
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_SUBMENU_DESCRIPTION"
+					class="inputbox"
+				/>
+				<!-- Before Field. Type: Componentadminmenus. (custom) -->
+				<field
+					type="componentadminmenus"
+					name="before"
+					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_BEFORE_DESCRIPTION"
+					class="list_class fieldMedium"
+					multiple="false"
+					required="false"
+					button="false"
+				/>
+			</form>
+		</field>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/component_dashboard.xml

@@ -4,155 +4,170 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_VERSION_LABEL"
-                <!-- Joomla_component Field. Type: Joomlacomponents. (custom)-->
+			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_VERSION_DESC"
-                <field type="joomlacomponents"
+			size="6"
-                       name="joomla_component"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Joomla_component Field. Type: Joomlacomponents. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="joomlacomponents"
-                       button="false" />
+			name="joomla_component"
-                <!-- Php_dashboard_methods Field. Type: Textarea. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_LABEL"
-                <field type="textarea"
+			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_JOOMLA_COMPONENT_DESCRIPTION"
-                       name="php_dashboard_methods"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_LABEL"
+			multiple="false"
-                       rows="17"
+			required="true"
-                       cols="5"
+			readonly="true"
-                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_DESCRIPTION"
+			button="false"
-                       class="text_area span12"
+		/>
-                       filter="raw"
+		<!-- Dashboard_tab Field. Type: Subform. (joomla) -->
-                       hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_HINT"
+		<field
-                       required="false" />
+			type="subform"
-                <!-- Dashboard_tab Field. Type: Subform. (joomla)-->
+			name="dashboard_tab"
-                <field type="subform"
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_DASHBOARD_TAB_LABEL"
-                       name="dashboard_tab"
+			layout="joomla.form.field.subform.repeatable-table"
-                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_DASHBOARD_TAB_LABEL"
+			multiple="true"
-                       layout="joomla.form.field.subform.repeatable-table"
+			icon="list"
-                       multiple="true"
+			maximum="10"
-                       icon="list"
+			filter="raw">
-                       maximum="10"
+			<form hidden="true" name="list_dashboard_tab_modal" repeat="true">
-                       filter="raw">
+				<!-- Name Field. Type: Text. (joomla) -->
-                        <form hidden="true"
+				<field
-                              name="list_dashboard_tab_modal"
+					type="text"
-                              repeat="true">
+					name="name"
-                                <!-- Name Field. Type: Text. (joomla)-->
+					label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_LABEL"
-                                <field type="text"
+					size="40"
-                                       name="name"
+					maxlength="150"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_DESCRIPTION"
-                                       size="40"
+					class="text_area"
-                                       maxlength="150"
+					readonly="false"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_DESCRIPTION"
+					disabled="false"
-                                       class="text_area"
+					required="false"
-                                       readonly="false"
+					filter="STRING"
-                                       disabled="false"
+					message="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_MESSAGE"
-                                       required="false"
+					hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_HINT"
-                                       filter="STRING"
+				/>
-                                       message="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_MESSAGE"
+				<!-- Header Field. Type: Text. (joomla) -->
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NAME_HINT" />
+				<field
-                                <!-- Header Field. Type: Text. (joomla)-->
+					type="text"
-                                <field type="text"
+					name="header"
-                                       name="header"
+					label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_LABEL"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_LABEL"
+					size="40"
-                                       size="40"
+					maxlength="150"
-                                       maxlength="150"
+					description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_DESCRIPTION"
+					class="text_area"
-                                       class="text_area"
+					readonly="false"
-                                       readonly="false"
+					disabled="false"
-                                       disabled="false"
+					required="false"
-                                       required="false"
+					filter="STRING"
-                                       filter="STRING"
+					message="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_MESSAGE"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_MESSAGE"
+					hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_HINT"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HEADER_HINT" />
+				/>
-                                <!-- Html Field. Type: Textarea. (joomla)-->
+				<!-- Html Field. Type: Textarea. (joomla) -->
-                                <field type="textarea"
+				<field
-                                       name="html"
+					type="textarea"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_LABEL"
+					name="html"
-                                       rows="20"
+					label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_LABEL"
-                                       cols="30"
+					rows="20"
-                                       class="text_area tab_html"
+					cols="30"
-                                       filter="raw"
+					class="text_area tab_html"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_HINT"
+					filter="raw"
-                                       required="false" />
+					hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_HTML_HINT"
-                        </form>
+					required="false"
-                </field>
+				/>
-        </fieldset>
+			</form>
+		</field>
+		<!-- Php_dashboard_methods Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_dashboard_methods"
+			label="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_LABEL"
+			rows="17"
+			cols="5"
+			description="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_PHP_DASHBOARD_METHODS_HINT"
+			required="false"
+		/>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/component_files_folders.xml

@@ -4,306 +4,316 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_VERSION_LABEL"
-                <!-- Joomla_component Field. Type: Joomlacomponents. (custom)-->
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_VERSION_DESC"
-                <field type="joomlacomponents"
+			size="6"
-                       name="joomla_component"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Joomla_component Field. Type: Joomlacomponents. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="joomlacomponents"
-                       button="false" />
+			name="joomla_component"
-                <!-- Note_add_folders_fullpath Field. Type: Note. A None Database Field. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_LABEL"
-                <field type="note"
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_JOOMLA_COMPONENT_DESCRIPTION"
-                       name="note_add_folders_fullpath"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_LABEL"
+			multiple="false"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION"
+			required="true"
-                       heading="h4"
+			readonly="true"
-                       class="alert alert-info note_add_folders_fullpath" />
+			button="false"
-                <!-- Note_add_files_fullpath Field. Type: Note. A None Database Field. (joomla)-->
+		/>
-                <field type="note"
+		<!-- Note_constant_paths Field. Type: Note. A None Database Field. (joomla) -->
-                       name="note_add_files_fullpath"
+		<field type="note" name="note_constant_paths" label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_DESCRIPTION" heading="h4" class="alert alert-info note_constant_paths" />
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_LABEL"
+		<!-- Addfoldersfullpath Field. Type: Subform. (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION"
+		<field
-                       heading="h4"
+			type="subform"
-                       class="alert alert-info note_add_files_fullpath" />
+			name="addfoldersfullpath"
-                <!-- Note_add_folders Field. Type: Note. A None Database Field. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERSFULLPATH_LABEL"
-                <field type="note"
+			layout="joomla.form.field.subform.repeatable-table"
-                       name="note_add_folders"
+			multiple="true"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_LABEL"
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERSFULLPATH_DESCRIPTION"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_DESCRIPTION"
+			icon="list"
-                       heading="h4"
+			maximum="500">
-                       class="alert alert-info note_add_folders" />
+			<form hidden="true" name="list_addfoldersfullpath_modal" repeat="true">
-                <!-- Addfiles Field. Type: Subform. (joomla)-->
+				<!-- Folderpath Field. Type: Text. (joomla) -->
-                <field type="subform"
+				<field
-                       name="addfiles"
+					type="text"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILES_LABEL"
+					name="folderpath"
-                       layout="joomla.form.field.subform.repeatable-table"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_LABEL"
-                       multiple="true"
+					size="70"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILES_DESCRIPTION"
+					maxlength="300"
-                       icon="list"
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_DESCRIPTION"
-                       maximum="500">
+					class="text_area"
-                        <form hidden="true"
+					required="false"
-                              name="list_addfiles_modal"
+					filter="PATH"
-                              repeat="true">
+					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_MESSAGE"
-                                <!-- File Field. Type: Customfilelist. (custom)-->
+					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_HINT"
-                                <field type="customfilelist"
+				/>
-                                       name="file"
+				<!-- Path Field. Type: Text. (joomla) -->
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILE_LABEL"
+				<field
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILE_DESCRIPTION"
+					type="text"
-                                       class="list_class"
+					name="path"
-                                       multiple="false"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL"
-                                       default="0"
+					size="40"
-                                       required="false"
+					maxlength="150"
-                                       button="false" />
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION"
-                                <!-- Path Field. Type: Text. (joomla)-->
+					class="text_area"
-                                <field type="text"
+					readonly="false"
-                                       name="path"
+					disabled="false"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL"
+					required="false"
-                                       size="40"
+					filter="PATH"
-                                       maxlength="150"
+					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT"
-                                       class="text_area"
+				/>
-                                       readonly="false"
+				<!-- Rename Field. Type: Checkbox. (joomla) -->
-                                       disabled="false"
+				<field
-                                       required="false"
+					type="checkbox"
-                                       filter="PATH"
+					name="rename"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT" />
+					value="1"
-                                <!-- Notnew Field. Type: Checkbox. (joomla)-->
+					required="false"
-                                <field type="checkbox"
+					class="inputbox"
-                                       name="notnew"
+				/>
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
+			</form>
-                                       value="1"
+		</field>
-                                       required="false"
+		<!-- Note_add_folders_fullpath Field. Type: Note. A None Database Field. (joomla) -->
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
+		<field type="note" name="note_add_folders_fullpath" label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION" heading="h4" class="alert alert-info note_add_folders_fullpath" />
-                                       class="inputbox" />
+		<!-- Addfilesfullpath Field. Type: Subform. (joomla) -->
-                        </form>
+		<field
-                </field>
+			type="subform"
-                <!-- Addfolders Field. Type: Subform. (joomla)-->
+			name="addfilesfullpath"
-                <field type="subform"
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILESFULLPATH_LABEL"
-                       name="addfolders"
+			layout="joomla.form.field.subform.repeatable-table"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERS_LABEL"
+			multiple="true"
-                       layout="joomla.form.field.subform.repeatable-table"
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILESFULLPATH_DESCRIPTION"
-                       multiple="true"
+			icon="list"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERS_DESCRIPTION"
+			maximum="500">
-                       icon="list"
+			<form hidden="true" name="list_addfilesfullpath_modal" repeat="true">
-                       maximum="500">
+				<!-- Filepath Field. Type: Text. (joomla) -->
-                        <form hidden="true"
+				<field
-                              name="list_addfolders_modal"
+					type="text"
-                              repeat="true">
+					name="filepath"
-                                <!-- Folder Field. Type: Customfolderlist. (custom)-->
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_LABEL"
-                                <field type="customfolderlist"
+					size="70"
-                                       name="folder"
+					maxlength="300"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDER_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDER_DESCRIPTION"
+					class="text_area"
-                                       class="list_class"
+					required="false"
-                                       multiple="false"
+					filter="PATH"
-                                       default="0"
+					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_MESSAGE"
-                                       required="false"
+					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_HINT"
-                                       button="false" />
+				/>
-                                <!-- Path Field. Type: Text. (joomla)-->
+				<!-- Path Field. Type: Text. (joomla) -->
-                                <field type="text"
+				<field
-                                       name="path"
+					type="text"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL"
+					name="path"
-                                       size="40"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL"
-                                       maxlength="150"
+					size="40"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION"
+					maxlength="150"
-                                       class="text_area"
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION"
-                                       readonly="false"
+					class="text_area"
-                                       disabled="false"
+					readonly="false"
-                                       required="false"
+					disabled="false"
-                                       filter="PATH"
+					required="false"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
+					filter="PATH"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT" />
+					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
-                                <!-- Rename Field. Type: Checkbox. (joomla)-->
+					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT"
-                                <field type="checkbox"
+				/>
-                                       name="rename"
+				<!-- Notnew Field. Type: Checkbox. (joomla) -->
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
+				<field
-                                       value="1"
+					type="checkbox"
-                                       required="false"
+					name="notnew"
-                                       class="inputbox" />
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
-                        </form>
+					value="1"
-                </field>
+					required="false"
-                <!-- Addfilesfullpath Field. Type: Subform. (joomla)-->
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
-                <field type="subform"
+					class="inputbox"
-                       name="addfilesfullpath"
+				/>
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILESFULLPATH_LABEL"
+			</form>
-                       layout="joomla.form.field.subform.repeatable-table"
+		</field>
-                       multiple="true"
+		<!-- Note_add_files_fullpath Field. Type: Note. A None Database Field. (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILESFULLPATH_DESCRIPTION"
+		<field type="note" name="note_add_files_fullpath" label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION" heading="h4" class="alert alert-info note_add_files_fullpath" />
-                       icon="list"
+		<!-- Addfolders Field. Type: Subform. (joomla) -->
-                       maximum="500">
+		<field
-                        <form hidden="true"
+			type="subform"
-                              name="list_addfilesfullpath_modal"
+			name="addfolders"
-                              repeat="true">
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERS_LABEL"
-                                <!-- Filepath Field. Type: Text. (joomla)-->
+			layout="joomla.form.field.subform.repeatable-table"
-                                <field type="text"
+			multiple="true"
-                                       name="filepath"
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERS_DESCRIPTION"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_LABEL"
+			icon="list"
-                                       size="70"
+			maximum="500">
-                                       maxlength="300"
+			<form hidden="true" name="list_addfolders_modal" repeat="true">
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_DESCRIPTION"
+				<!-- Folder Field. Type: Customfolderlist. (custom) -->
-                                       class="text_area"
+				<field
-                                       required="false"
+					type="customfolderlist"
-                                       filter="PATH"
+					name="folder"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_MESSAGE"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDER_LABEL"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILEPATH_HINT" />
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDER_DESCRIPTION"
-                                <!-- Path Field. Type: Text. (joomla)-->
+					class="list_class"
-                                <field type="text"
+					multiple="false"
-                                       name="path"
+					default="0"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL"
+					required="false"
-                                       size="40"
+					button="false"
-                                       maxlength="150"
+				/>
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION"
+				<!-- Path Field. Type: Text. (joomla) -->
-                                       class="text_area"
+				<field
-                                       readonly="false"
+					type="text"
-                                       disabled="false"
+					name="path"
-                                       required="false"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL"
-                                       filter="PATH"
+					size="40"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
+					maxlength="150"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT" />
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION"
-                                <!-- Notnew Field. Type: Checkbox. (joomla)-->
+					class="text_area"
-                                <field type="checkbox"
+					readonly="false"
-                                       name="notnew"
+					disabled="false"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
+					required="false"
-                                       value="1"
+					filter="PATH"
-                                       required="false"
+					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
+					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT"
-                                       class="inputbox" />
+				/>
-                        </form>
+				<!-- Rename Field. Type: Checkbox. (joomla) -->
-                </field>
+				<field
-                <!-- Note_add_files Field. Type: Note. A None Database Field. (joomla)-->
+					type="checkbox"
-                <field type="note"
+					name="rename"
-                       name="note_add_files"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_LABEL"
+					value="1"
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_DESCRIPTION"
+					required="false"
-                       heading="h4"
+					class="inputbox"
-                       class="alert alert-info note_add_files" />
+				/>
-                <!-- Addfoldersfullpath Field. Type: Subform. (joomla)-->
+			</form>
-                <field type="subform"
+		</field>
-                       name="addfoldersfullpath"
+		<!-- Note_add_folders Field. Type: Note. A None Database Field. (joomla) -->
-                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERSFULLPATH_LABEL"
+		<field type="note" name="note_add_folders" label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FOLDERS_DESCRIPTION" heading="h4" class="alert alert-info note_add_folders" />
-                       layout="joomla.form.field.subform.repeatable-table"
+		<!-- Addfiles Field. Type: Subform. (joomla) -->
-                       multiple="true"
+		<field
-                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERSFULLPATH_DESCRIPTION"
+			type="subform"
-                       icon="list"
+			name="addfiles"
-                       maximum="500">
+			label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILES_LABEL"
-                        <form hidden="true"
+			layout="joomla.form.field.subform.repeatable-table"
-                              name="list_addfoldersfullpath_modal"
+			multiple="true"
-                              repeat="true">
+			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILES_DESCRIPTION"
-                                <!-- Folderpath Field. Type: Text. (joomla)-->
+			icon="list"
-                                <field type="text"
+			maximum="500">
-                                       name="folderpath"
+			<form hidden="true" name="list_addfiles_modal" repeat="true">
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_LABEL"
+				<!-- File Field. Type: Customfilelist. (custom) -->
-                                       size="70"
+				<field
-                                       maxlength="300"
+					type="customfilelist"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_DESCRIPTION"
+					name="file"
-                                       class="text_area"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILE_LABEL"
-                                       required="false"
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FILE_DESCRIPTION"
-                                       filter="PATH"
+					class="list_class"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_MESSAGE"
+					multiple="false"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_FOLDERPATH_HINT" />
+					default="0"
-                                <!-- Path Field. Type: Text. (joomla)-->
+					required="false"
-                                <field type="text"
+					button="false"
-                                       name="path"
+				/>
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL"
+				<!-- Path Field. Type: Text. (joomla) -->
-                                       size="40"
+				<field
-                                       maxlength="150"
+					type="text"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION"
+					name="path"
-                                       class="text_area"
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL"
-                                       readonly="false"
+					size="40"
-                                       disabled="false"
+					maxlength="150"
-                                       required="false"
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION"
-                                       filter="PATH"
+					class="text_area"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
+					readonly="false"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT" />
+					disabled="false"
-                                <!-- Rename Field. Type: Checkbox. (joomla)-->
+					required="false"
-                                <field type="checkbox"
+					filter="PATH"
-                                       name="rename"
+					message="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_RENAME_LABEL"
+					hint="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT"
-                                       value="1"
+				/>
-                                       required="false"
+				<!-- Notnew Field. Type: Checkbox. (joomla) -->
-                                       class="inputbox" />
+				<field
-                        </form>
+					type="checkbox"
-                </field>
+					name="notnew"
-        </fieldset>
+					label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL"
+					value="1"
+					required="false"
+					description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION"
+					class="inputbox"
+				/>
+			</form>
+		</field>
+		<!-- Note_add_files Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_add_files" label="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_ADD_FILES_DESCRIPTION" heading="h4" class="alert alert-info note_add_files" />
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/component_mysql_tweaks.xml

@@ -4,154 +4,172 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_VERSION_LABEL"
-                <!-- Joomla_component Field. Type: Joomlacomponents. (custom)-->
+			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_VERSION_DESC"
-                <field type="joomlacomponents"
+			size="6"
-                       name="joomla_component"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Joomla_component Field. Type: Joomlacomponents. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="joomlacomponents"
-                       button="false" />
+			name="joomla_component"
-                <!-- Sql_tweak Field. Type: Subform. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_LABEL"
-                <field type="subform"
+			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_JOOMLA_COMPONENT_DESCRIPTION"
-                       name="sql_tweak"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SQL_TWEAK_LABEL"
+			multiple="false"
-                       layout="joomla.form.field.subform.repeatable-table"
+			required="true"
-                       multiple="true"
+			readonly="true"
-                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SQL_TWEAK_DESCRIPTION"
+			button="false"
-                       icon="list"
+		/>
-                       maximum="50">
+		<!-- Sql_tweak Field. Type: Subform. (joomla) -->
-                        <form hidden="true"
+		<field
-                              name="list_sql_tweak_modal"
+			type="subform"
-                              repeat="true">
+			name="sql_tweak"
-                                <!-- Adminview Field. Type: Componentadminviews. (custom)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SQL_TWEAK_LABEL"
-                                <field type="componentadminviews"
+			layout="joomla.form.field.subform.repeatable-table"
-                                       name="adminview"
+			multiple="true"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADMINVIEW_LABEL"
+			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SQL_TWEAK_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADMINVIEW_DESCRIPTION"
+			icon="list"
-                                       class="list_class fieldMedium"
+			maximum="50">
-                                       multiple="false"
+			<form hidden="true" name="list_sql_tweak_modal" repeat="true">
-                                       required="false"
+				<!-- Adminview Field. Type: Componentadminviews. (custom) -->
-                                       button="false" />
+				<field
-                                <!-- Add_sql Field. Type: List. (joomla)-->
+					type="componentadminviews"
-                                <field type="list"
+					name="adminview"
-                                       name="add_sql"
+					label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADMINVIEW_LABEL"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADMINVIEW_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_DESCRIPTION"
+					class="list_class fieldMedium"
-                                       class="list_class"
+					multiple="false"
-                                       multiple="false"
+					required="false"
-                                       filter="INT"
+					button="false"
-                                       required="false"
+				/>
-                                       default="0">
+				<!-- Add_sql Field. Type: List. (joomla) -->
-                                        <!-- Option Set.-->
+				<field
-                                        <option value="0">COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_NO_DONT_ADD_ANY</option>
+					type="list"
-                                        <option value="1">COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_YES_INCLUDE_BASED_ON_OPTIONS</option>
+					name="add_sql"
-                                </field>
+					label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_LABEL"
-                                <!-- Add_sql_options Field. Type: List. (joomla)-->
+					description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_DESCRIPTION"
-                                <field type="list"
+					class="list_class"
-                                       name="add_sql_options"
+					multiple="false"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_OPTIONS_LABEL"
+					filter="INT"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_OPTIONS_DESCRIPTION"
+					required="false"
-                                       class="list_class"
+					default="0">
-                                       multiple="false"
+					<!-- Option Set. -->
-                                       filter="INT"
+					<option value="0">
-                                       required="false">
+						COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_NO_DONT_ADD_ANY</option>
-                                        <!-- Option Set.-->
+					<option value="1">
-                                        <option value="">COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SELECT_AN_OPTION</option>
+						COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_YES_INCLUDE_BASED_ON_OPTIONS</option>
-                                        <option value="1">COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ALL</option>
+				</field>
-                                        <option value="2">COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ID_BASED</option>
+				<!-- Add_sql_options Field. Type: List. (joomla) -->
-                                </field>
+				<field
-                                <!-- Ids Field. Type: Textarea. (joomla)-->
+					type="list"
-                                <field type="textarea"
+					name="add_sql_options"
-                                       name="ids"
+					label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_OPTIONS_LABEL"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ADD_SQL_OPTIONS_DESCRIPTION"
-                                       rows="20"
+					class="list_class"
-                                       cols="40"
+					multiple="false"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_DESCRIPTION"
+					filter="INT"
-                                       class="text_area ids_selection"
+					required="false">
-                                       filter="raw"
+					<!-- Option Set. -->
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_HINT"
+					<option value="">
-                                       required="false" />
+						COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SELECT_AN_OPTION</option>
-                        </form>
+					<option value="1">
-                </field>
+						COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ALL</option>
-        </fieldset>
+					<option value="2">
+						COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_ID_BASED</option>
+				</field>
+				<!-- Ids Field. Type: Textarea. (joomla) -->
+				<field
+					type="textarea"
+					name="ids"
+					label="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_LABEL"
+					rows="20"
+					cols="40"
+					description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_DESCRIPTION"
+					class="text_area ids_selection"
+					filter="raw"
+					hint="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_IDS_HINT"
+					required="false"
+				/>
+			</form>
+		</field>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/component_site_views.xml

@@ -4,165 +4,179 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_LABEL"
-                <!-- Joomla_component Field. Type: Joomlacomponents. (custom)-->
+			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_VERSION_DESC"
-                <field type="joomlacomponents"
+			size="6"
-                       name="joomla_component"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Joomla_component Field. Type: Joomlacomponents. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="joomlacomponents"
-                       button="false" />
+			name="joomla_component"
-                <!-- Note_on_site_views Field. Type: Note. A None Database Field. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_LABEL"
-                <field type="note"
+			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_JOOMLA_COMPONENT_DESCRIPTION"
-                       name="note_on_site_views"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NOTE_ON_SITE_VIEWS_LABEL"
+			multiple="false"
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NOTE_ON_SITE_VIEWS_DESCRIPTION"
+			required="true"
-                       heading="h4"
+			readonly="true"
-                       class="alert alert-info note_on_site_views" />
+			button="false"
-                <!-- Addsite_views Field. Type: Subform. (joomla)-->
+		/>
-                <field type="subform"
+		<!-- Addsite_views Field. Type: Subform. (joomla) -->
-                       name="addsite_views"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_LABEL"
+			type="subform"
-                       layout="joomla.form.field.subform.repeatable-table"
+			name="addsite_views"
-                       multiple="true"
+			label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_DESCRIPTION"
+			layout="joomla.form.field.subform.repeatable-table"
-                       icon="list"
+			multiple="true"
-                       maximum="500">
+			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_DESCRIPTION"
-                        <form hidden="true"
+			icon="list"
-                              name="list_addsite_views_modal"
+			maximum="500">
-                              repeat="true">
+			<form hidden="true" name="list_addsite_views_modal" repeat="true">
-                                <!-- Siteview Field. Type: Siteviews. (custom)-->
+				<!-- Siteview Field. Type: Siteviews. (custom) -->
-                                <field type="siteviews"
+				<field
-                                       name="siteview"
+					type="siteviews"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_LABEL"
+					name="siteview"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION"
+					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_LABEL"
-                                       class="fieldMedium"
+					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_DESCRIPTION"
-                                       multiple="false"
+					class="fieldMedium"
-                                       required="false"
+					multiple="false"
-                                       button="false" />
+					required="false"
-                                <!-- Menu Field. Type: Checkbox. (joomla)-->
+					button="false"
-                                <field type="checkbox"
+				/>
-                                       name="menu"
+				<!-- Menu Field. Type: Checkbox. (joomla) -->
-                                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_LABEL"
+				<field
-                                       value="1"
+					type="checkbox"
-                                       default="1"
+					name="menu"
-                                       required="false"
+					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_LABEL"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_DESCRIPTION"
+					value="1"
-                                       class="inputbox" />
+					default="1"
-                                <!-- Metadata Field. Type: Checkbox. (joomla)-->
+					required="false"
-                                <field type="checkbox"
+					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_MENU_DESCRIPTION"
-                                       name="metadata"
+					class="inputbox"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_LABEL"
+				/>
-                                       value="1"
+				<!-- Metadata Field. Type: Checkbox. (joomla) -->
-                                       default="1"
+				<field
-                                       required="false"
+					type="checkbox"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_DESCRIPTION"
+					name="metadata"
-                                       class="inputbox" />
+					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_LABEL"
-                                <!-- Default_view Field. Type: Checkbox. (joomla)-->
+					value="1"
-                                <field type="checkbox"
+					default="1"
-                                       name="default_view"
+					required="false"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_LABEL"
+					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_METADATA_DESCRIPTION"
-                                       value="1"
+					class="inputbox"
-                                       required="false"
+				/>
-                                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_DESCRIPTION"
+				<!-- Default_view Field. Type: Checkbox. (joomla) -->
-                                       class="inputbox" />
+				<field
-                                <!-- Access Field. Type: Checkbox. (joomla)-->
+					type="checkbox"
-                                <field type="checkbox"
+					name="default_view"
-                                       name="access"
+					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_LABEL"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_LABEL"
+					value="1"
-                                       value="1"
+					required="false"
-                                       default="1"
+					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_DEFAULT_VIEW_DESCRIPTION"
-                                       required="false"
+					class="inputbox"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_DESCRIPTION"
+				/>
-                                       class="inputbox" />
+				<!-- Access Field. Type: Checkbox. (joomla) -->
-                                <!-- Public_access Field. Type: Checkbox. (joomla)-->
+				<field
-                                <field type="checkbox"
+					type="checkbox"
-                                       name="public_access"
+					name="access"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_LABEL"
+					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_LABEL"
-                                       value="1"
+					value="1"
-                                       required="false"
+					default="1"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_DESCRIPTION"
+					required="false"
-                                       class="inputbox" />
+					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ACCESS_DESCRIPTION"
-                        </form>
+					class="inputbox"
-                </field>
+				/>
-        </fieldset>
+				<!-- Public_access Field. Type: Checkbox. (joomla) -->
+				<field
+					type="checkbox"
+					name="public_access"
+					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_LABEL"
+					value="1"
+					required="false"
+					description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_PUBLIC_ACCESS_DESCRIPTION"
+					class="inputbox"
+				/>
+			</form>
+		</field>
+		<!-- Note_on_site_views Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_on_site_views" label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NOTE_ON_SITE_VIEWS_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NOTE_ON_SITE_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_site_views" />
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/component_updates.xml

@@ -4,144 +4,157 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL"
-                <!-- Joomla_component Field. Type: Joomlacomponents. (custom)-->
+			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESC"
-                <field type="joomlacomponents"
+			size="6"
-                       name="joomla_component"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Joomla_component Field. Type: Joomlacomponents. (custom) -->
-                       required="true"
+		<field
-                       readonly="true"
+			type="joomlacomponents"
-                       button="false" />
+			name="joomla_component"
-                <!-- Version_update Field. Type: Subform. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_LABEL"
-                <field type="subform"
+			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_JOOMLA_COMPONENT_DESCRIPTION"
-                       name="version_update"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_LABEL"
+			multiple="false"
-                       layout="joomla.form.field.subform.repeatable-table"
+			required="true"
-                       multiple="true"
+			readonly="true"
-                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_DESCRIPTION"
+			button="false"
-                       icon="list"
+		/>
-                       maximum="300">
+		<!-- Version_update Field. Type: Subform. (joomla) -->
-                        <form hidden="true"
+		<field
-                              name="list_version_update_modal"
+			type="subform"
-                              repeat="true">
+			name="version_update"
-                                <!-- Version Field. Type: Text. (joomla)-->
+			label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_LABEL"
-                                <field type="text"
+			layout="joomla.form.field.subform.repeatable-table"
-                                       name="version"
+			multiple="true"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL"
+			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_DESCRIPTION"
-                                       size="10"
+			icon="list"
-                                       maxlength="50"
+			maximum="300">
-                                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESCRIPTION"
+			<form hidden="true" name="list_version_update_modal" repeat="true">
-                                       class="text_area"
+				<!-- Version Field. Type: Text. (joomla) -->
-                                       readonly="false"
+				<field
-                                       disabled="false"
+					type="text"
-                                       required="false"
+					name="version"
-                                       filter="STRING"
+					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL"
-                                       message="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_MESSAGE"
+					size="10"
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_HINT" />
+					maxlength="50"
-                                <!-- Mysql Field. Type: Textarea. (joomla)-->
+					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESCRIPTION"
-                                <field type="textarea"
+					class="text_area"
-                                       name="mysql"
+					readonly="false"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_LABEL"
+					disabled="false"
-                                       rows="30"
+					required="false"
-                                       cols="15"
+					filter="STRING"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_DESCRIPTION"
+					message="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_MESSAGE"
-                                       class="text_area mysql_update"
+					hint="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_HINT"
-                                       filter="raw"
+				/>
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_HINT"
+				<!-- Mysql Field. Type: Textarea. (joomla) -->
-                                       required="false" />
+				<field
-                                <!-- Url Field. Type: Url. (joomla)-->
+					type="textarea"
-                                <field type="url"
+					name="mysql"
-                                       name="url"
+					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_LABEL"
-                                       label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_LABEL"
+					rows="30"
-                                       size="60"
+					cols="15"
-                                       maxlength="150"
+					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_DESCRIPTION"
+					class="text_area mysql_update"
-                                       class="text_area version_url"
+					filter="raw"
-                                       required="false"
+					hint="COM_COMPONENTBUILDER_COMPONENT_UPDATES_MYSQL_HINT"
-                                       filter="raw"
+					required="false"
-                                       validated="url"
+				/>
-                                       message="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_MESSAGE"
+				<!-- Url Field. Type: Url. (joomla) -->
-                                       hint="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_HINT" />
+				<field
-                        </form>
+					type="url"
-                </field>
+					name="url"
-        </fieldset>
+					label="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_LABEL"
+					size="60"
+					maxlength="150"
+					description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_DESCRIPTION"
+					class="text_area version_url"
+					required="false"
+					filter="raw"
+					validated="url"
+					message="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_MESSAGE"
+					hint="COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_HINT"
+				/>
+			</form>
+		</field>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/custom_admin_view.js

@@ -23,294 +23,294 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvybvxx_required = false;
+jform_vvvvvydvxw_required = false;
-jform_vvvvvycvxy_required = false;
+jform_vvvvvyevxx_required = false;
-jform_vvvvvydvxz_required = false;
+jform_vvvvvyfvxy_required = false;
-jform_vvvvvyevya_required = false;
+jform_vvvvvygvxz_required = false;
-jform_vvvvvyfvyb_required = false;
+jform_vvvvvyhvya_required = false;
-jform_vvvvvygvyc_required = false;
+jform_vvvvvyivyb_required = false;
-jform_vvvvvyhvyd_required = false;
+jform_vvvvvyjvyc_required = false;
-jform_vvvvvyivye_required = false;
+jform_vvvvvykvyd_required = false;
-jform_vvvvvyivyf_required = false;
+jform_vvvvvykvye_required = false;
-jform_vvvvvyjvyg_required = false;
+jform_vvvvvylvyf_required = false;
-jform_vvvvvykvyh_required = false;
+jform_vvvvvymvyg_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyd = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyb(add_php_view_vvvvvyb);
+	vvvvvyd(add_php_view_vvvvvyd);
 
-	var add_php_jview_display_vvvvvyc = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvye = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyc(add_php_jview_display_vvvvvyc);
+	vvvvvye(add_php_jview_display_vvvvvye);
 
-	var add_php_jview_vvvvvyd = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyf = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyd(add_php_jview_vvvvvyd);
+	vvvvvyf(add_php_jview_vvvvvyf);
 
-	var add_php_document_vvvvvye = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyg = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvye(add_php_document_vvvvvye);
+	vvvvvyg(add_php_document_vvvvvyg);
 
-	var add_css_document_vvvvvyf = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyh = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyf(add_css_document_vvvvvyf);
+	vvvvvyh(add_css_document_vvvvvyh);
 
-	var add_javascript_file_vvvvvyg = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyi = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyg(add_javascript_file_vvvvvyg);
+	vvvvvyi(add_javascript_file_vvvvvyi);
 
-	var add_js_document_vvvvvyh = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyj = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyh(add_js_document_vvvvvyh);
+	vvvvvyj(add_js_document_vvvvvyj);
 
-	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyk = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyi(add_custom_button_vvvvvyi);
+	vvvvvyk(add_custom_button_vvvvvyk);
 
-	var add_css_vvvvvyj = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyl = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyj(add_css_vvvvvyj);
+	vvvvvyl(add_css_vvvvvyl);
 
-	var add_php_ajax_vvvvvyk = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvym = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyk(add_php_ajax_vvvvvyk);
+	vvvvvym(add_php_ajax_vvvvvym);
 });
 
-// the vvvvvyb function
+// the vvvvvyd function
-function vvvvvyb(add_php_view_vvvvvyb)
+function vvvvvyd(add_php_view_vvvvvyd)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyb == 1)
+	if (add_php_view_vvvvvyd == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvybvxx_required)
+		if (jform_vvvvvydvxw_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvybvxx_required = false;
+			jform_vvvvvydvxw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvybvxx_required)
+		if (!jform_vvvvvydvxw_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvybvxx_required = true;
+			jform_vvvvvydvxw_required = true;
 		}
 	}
 }
 
-// the vvvvvyc function
+// the vvvvvye function
-function vvvvvyc(add_php_jview_display_vvvvvyc)
+function vvvvvye(add_php_jview_display_vvvvvye)
 {
 	// set the function logic
-	if (add_php_jview_display_vvvvvyc == 1)
+	if (add_php_jview_display_vvvvvye == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvycvxy_required)
+		if (jform_vvvvvyevxx_required)
 		{
 			updateFieldRequired('php_jview_display',0);
 			jQuery('#jform_php_jview_display').prop('required','required');
 			jQuery('#jform_php_jview_display').attr('aria-required',true);
 			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvycvxy_required = false;
+			jform_vvvvvyevxx_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvycvxy_required)
+		if (!jform_vvvvvyevxx_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvycvxy_required = true;
+			jform_vvvvvyevxx_required = true;
 		}
 	}
 }
 
-// the vvvvvyd function
+// the vvvvvyf function
-function vvvvvyd(add_php_jview_vvvvvyd)
+function vvvvvyf(add_php_jview_vvvvvyf)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyd == 1)
+	if (add_php_jview_vvvvvyf == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvydvxz_required)
+		if (jform_vvvvvyfvxy_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvydvxz_required = false;
+			jform_vvvvvyfvxy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvydvxz_required)
+		if (!jform_vvvvvyfvxy_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvydvxz_required = true;
+			jform_vvvvvyfvxy_required = true;
 		}
 	}
 }
 
-// the vvvvvye function
+// the vvvvvyg function
-function vvvvvye(add_php_document_vvvvvye)
+function vvvvvyg(add_php_document_vvvvvyg)
 {
 	// set the function logic
-	if (add_php_document_vvvvvye == 1)
+	if (add_php_document_vvvvvyg == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyevya_required)
+		if (jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyevya_required = false;
+			jform_vvvvvygvxz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyevya_required)
+		if (!jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyevya_required = true;
+			jform_vvvvvygvxz_required = true;
 		}
 	}
 }
 
-// the vvvvvyf function
+// the vvvvvyh function
-function vvvvvyf(add_css_document_vvvvvyf)
+function vvvvvyh(add_css_document_vvvvvyh)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyf == 1)
+	if (add_css_document_vvvvvyh == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvyfvyb_required)
+		if (jform_vvvvvyhvya_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvyfvyb_required = false;
+			jform_vvvvvyhvya_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvyfvyb_required)
+		if (!jform_vvvvvyhvya_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvyfvyb_required = true;
+			jform_vvvvvyhvya_required = true;
 		}
 	}
 }
 
-// the vvvvvyg function
+// the vvvvvyi function
-function vvvvvyg(add_javascript_file_vvvvvyg)
+function vvvvvyi(add_javascript_file_vvvvvyi)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyg == 1)
+	if (add_javascript_file_vvvvvyi == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvygvyc_required)
+		if (jform_vvvvvyivyb_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvygvyc_required = false;
+			jform_vvvvvyivyb_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvygvyc_required)
+		if (!jform_vvvvvyivyb_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvygvyc_required = true;
+			jform_vvvvvyivyb_required = true;
 		}
 	}
 }
 
-// the vvvvvyh function
+// the vvvvvyj function
-function vvvvvyh(add_js_document_vvvvvyh)
+function vvvvvyj(add_js_document_vvvvvyj)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyh == 1)
+	if (add_js_document_vvvvvyj == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyhvyd_required)
+		if (jform_vvvvvyjvyc_required)
 		{
 			updateFieldRequired('js_document',0);
 			jQuery('#jform_js_document').prop('required','required');
 			jQuery('#jform_js_document').attr('aria-required',true);
 			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvyhvyd_required = false;
+			jform_vvvvvyjvyc_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyd_required)
+		if (!jform_vvvvvyjvyc_required)
 		{
 			updateFieldRequired('js_document',1);
 			jQuery('#jform_js_document').removeAttr('required');
 			jQuery('#jform_js_document').removeAttr('aria-required');
 			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvyhvyd_required = true;
+			jform_vvvvvyjvyc_required = true;
 		}
 	}
 }
 
-// the vvvvvyi function
+// the vvvvvyk function
-function vvvvvyi(add_custom_button_vvvvvyi)
+function vvvvvyk(add_custom_button_vvvvvyk)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyi == 1)
+	if (add_custom_button_vvvvvyk == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyivye_required)
+		if (jform_vvvvvykvyd_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyivye_required = false;
+			jform_vvvvvykvyd_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyivyf_required)
+		if (jform_vvvvvykvye_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyivyf_required = false;
+			jform_vvvvvykvye_required = false;
 		}
 
 	}
@@ -318,72 +318,72 @@ function vvvvvyi(add_custom_button_vvvvvyi)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyivye_required)
+		if (!jform_vvvvvykvyd_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyivye_required = true;
+			jform_vvvvvykvyd_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyivyf_required)
+		if (!jform_vvvvvykvye_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyivyf_required = true;
+			jform_vvvvvykvye_required = true;
 		}
 	}
 }
 
-// the vvvvvyj function
+// the vvvvvyl function
-function vvvvvyj(add_css_vvvvvyj)
+function vvvvvyl(add_css_vvvvvyl)
 {
 	// set the function logic
-	if (add_css_vvvvvyj == 1)
+	if (add_css_vvvvvyl == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvyjvyg_required)
+		if (jform_vvvvvylvyf_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyjvyg_required = false;
+			jform_vvvvvylvyf_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvyjvyg_required)
+		if (!jform_vvvvvylvyf_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyjvyg_required = true;
+			jform_vvvvvylvyf_required = true;
 		}
 	}
 }
 
-// the vvvvvyk function
+// the vvvvvym function
-function vvvvvyk(add_php_ajax_vvvvvyk)
+function vvvvvym(add_php_ajax_vvvvvym)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyk == 1)
+	if (add_php_ajax_vvvvvym == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvykvyh_required)
+		if (jform_vvvvvymvyg_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvykvyh_required = false;
+			jform_vvvvvymvyg_required = false;
 		}
 
 	}
@@ -391,13 +391,13 @@ function vvvvvyk(add_php_ajax_vvvvvyk)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvykvyh_required)
+		if (!jform_vvvvvymvyg_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvykvyh_required = true;
+			jform_vvvvvymvyg_required = true;
 		}
 	}
 }
@@ -438,6 +438,7 @@ function isSet(val)
 	return false;
 }
 
+
 jQuery(document).ready(function()
 {
 	// get the linked details

admin/models/forms/custom_code.js

@@ -23,43 +23,43 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzxvzp_required = false;
+jform_vvvvvzzvzo_required = false;
-jform_vvvvvzyvzq_required = false;
+jform_vvvvwaavzp_required = false;
-jform_vvvvvzyvzr_required = false;
+jform_vvvvwaavzq_required = false;
-jform_vvvvvzyvzs_required = false;
+jform_vvvvwaavzr_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzx(target_vvvvvzx);
-
-	var target_vvvvvzy = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzy(target_vvvvvzy);
-
 	var target_vvvvvzz = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzz = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzz(target_vvvvvzz);
-	vvvvvzz(target_vvvvvzz,type_vvvvvzz);
 
-	var type_vvvvwaa = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwaa = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwaa(type_vvvvwaa,target_vvvvwaa);
+	vvvvwaa(target_vvvvwaa);
+
+	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwab(target_vvvvwab,type_vvvvwab);
+
+	var type_vvvvwac = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwac(type_vvvvwac,target_vvvvwac);
 });
 
-// the vvvvvzx function
+// the vvvvvzz function
-function vvvvvzx(target_vvvvvzx)
+function vvvvvzz(target_vvvvvzz)
 {
 	// set the function logic
-	if (target_vvvvvzx == 2)
+	if (target_vvvvvzz == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzxvzp_required)
+		if (jform_vvvvvzzvzo_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvvzxvzp_required = false;
+			jform_vvvvvzzvzo_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -68,99 +68,99 @@ function vvvvvzx(target_vvvvvzx)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzxvzp_required)
+		if (!jform_vvvvvzzvzo_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvvzxvzp_required = true;
+			jform_vvvvvzzvzo_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvvzy function
+// the vvvvwaa function
-function vvvvvzy(target_vvvvvzy)
+function vvvvwaa(target_vvvvwaa)
 {
 	// set the function logic
-	if (target_vvvvvzy == 1)
+	if (target_vvvvwaa == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvzyvzq_required)
+		if (jform_vvvvwaavzp_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvzyvzq_required = false;
+			jform_vvvvwaavzp_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzyvzr_required)
+		if (jform_vvvvwaavzq_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvzyvzr_required = false;
+			jform_vvvvwaavzq_required = false;
 		}
 
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvvzyvzs_required)
+		if (jform_vvvvwaavzr_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvzyvzs_required = false;
+			jform_vvvvwaavzr_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzyvzq_required)
+		if (!jform_vvvvwaavzp_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvzyvzq_required = true;
+			jform_vvvvwaavzp_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzyvzr_required)
+		if (!jform_vvvvwaavzq_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvzyvzr_required = true;
+			jform_vvvvwaavzq_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvvzyvzs_required)
+		if (!jform_vvvvwaavzr_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvzyvzs_required = true;
+			jform_vvvvwaavzr_required = true;
 		}
 	}
 }
 
-// the vvvvvzz function
+// the vvvvwab function
-function vvvvvzz(target_vvvvvzz,type_vvvvvzz)
+function vvvvwab(target_vvvvwab,type_vvvvwab)
 {
 	// set the function logic
-	if (target_vvvvvzz == 1 && type_vvvvvzz == 1)
+	if (target_vvvvwab == 1 && type_vvvvwab == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -172,11 +172,11 @@ function vvvvvzz(target_vvvvvzz,type_vvvvvzz)
 	}
 }
 
-// the vvvvwaa function
+// the vvvvwac function
-function vvvvwaa(type_vvvvwaa,target_vvvvwaa)
+function vvvvwac(type_vvvvwac,target_vvvvwac)
 {
 	// set the function logic
-	if (type_vvvvwaa == 1 && target_vvvvwaa == 1)
+	if (type_vvvvwac == 1 && target_vvvvwac == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -224,6 +224,7 @@ function isSet(val)
 	return false;
 }
 
+
 jQuery(document).ready(function()
 {
 	var target = jQuery("#jform_target input[type='radio']:checked").val();

admin/models/forms/custom_code.xml

@@ -4,234 +4,259 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_LABEL"
-                <!-- Component Field. Type: Component. (custom)-->
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_VERSION_DESC"
-                <field type="component"
+			size="6"
-                       name="component"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL"
+			filter="unset"
-                       description="JFIELD_TITLE_DESC"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Component Field. Type: Component. (custom) -->
-                       default="0"
+		<field
-                       required="true"
+			type="component"
-                       button="true" />
+			name="component"
-                <!-- Path Field. Type: Text. (joomla)-->
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL"
-                <field type="text"
+			description="JFIELD_TITLE_DESC"
-                       name="path"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL"
+			multiple="false"
-                       size="100"
+			default="0"
-                       maxlength="250"
+			required="true"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_DESCRIPTION"
+			button="true"
-                       class="text_area span12"
+		/>
-                       required="true"
+		<!-- Path Field. Type: Text. (joomla) -->
-                       filter="PATH"
+		<field
-                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_MESSAGE"
+			type="text"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_HINT" />
+			name="path"
-                <!-- Target Field. Type: Radio. (joomla)-->
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL"
-                <field type="radio"
+			size="100"
-                       name="target"
+			maxlength="250"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_DESCRIPTION"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_DESCRIPTION"
+			class="text_area span12"
-                       class="btn-group btn-group-yesno"
+			required="true"
-                       default="2">
+			filter="PATH"
-                        <!-- Option Set.-->
+			message="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_MESSAGE"
-                        <option value="2">COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL</option>
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_HINT"
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION</option>
+		/>
-                </field>
+		<!-- Target Field. Type: Radio. (joomla) -->
-                <!-- Type Field. Type: Radio. (joomla)-->
+		<field
-                <field type="radio"
+			type="radio"
-                       name="type"
+			name="target"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_DESCRIPTION"
-                       class="btn-group btn-group-yesno"
+			class="btn-group btn-group-yesno"
-                       required="true">
+			default="2">
-                        <!-- Option Set.-->
+			<!-- Option Set. -->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_CODE_REPLACEMENT</option>
+			<option value="2">
-                        <option value="2">COM_COMPONENTBUILDER_CUSTOM_CODE_INSERTION</option>
+				COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL</option>
-                </field>
+			<option value="1">
-                <!-- Comment_type Field. Type: Radio. (joomla)-->
+				COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION</option>
-                <field type="radio"
+		</field>
-                       name="comment_type"
+		<!-- Type Field. Type: Radio. (joomla) -->
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL"
+		<field
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_DESCRIPTION"
+			type="radio"
-                       class="btn-group btn-group-yesno"
+			name="type"
-                       default="1"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_LABEL"
-                       required="true">
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_TYPE_DESCRIPTION"
-                        <!-- Option Set.-->
+			class="btn-group btn-group-yesno"
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS</option>
+			required="true">
-                        <option value="2">COM_COMPONENTBUILDER_CUSTOM_CODE_HTML</option>
+			<!-- Option Set. -->
-                </field>
+			<option value="1">
-                <!-- Hashtarget Field. Type: Text. (joomla)-->
+				COM_COMPONENTBUILDER_CUSTOM_CODE_REPLACEMENT</option>
-                <field type="text"
+			<option value="2">
-                       name="hashtarget"
+				COM_COMPONENTBUILDER_CUSTOM_CODE_INSERTION</option>
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL"
+		</field>
-                       size="50"
+		<!-- Comment_type Field. Type: Radio. (joomla) -->
-                       maxlength="150"
+		<field
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION"
+			type="radio"
-                       class="text_area"
+			name="comment_type"
-                       readonly="true"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL"
-                       filter="STRING"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_DESCRIPTION"
-                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_MESSAGE"
+			class="btn-group btn-group-yesno"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT" />
+			default="1"
-                <!-- Code Field. Type: Textarea. (joomla)-->
+			required="true">
-                <field type="textarea"
+			<!-- Option Set. -->
-                       name="code"
+			<option value="1">
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL"
+				COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS</option>
-                       rows="30"
+			<option value="2">
-                       cols="15"
+				COM_COMPONENTBUILDER_CUSTOM_CODE_HTML</option>
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION"
+		</field>
-                       class="text_area span12"
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
-                       filter="raw"
+		<field
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT"
+			type="hidden"
-                       required="true" />
+			name="not_required"
-                <!-- Hashendtarget Field. Type: Text. (joomla)-->
+			default="[]"
-                <field type="text"
+		/>
-                       name="hashendtarget"
+		<!-- Function_name Field. Type: Text. (joomla) -->
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_LABEL"
+		<field
-                       size="50"
+			type="text"
-                       maxlength="150"
+			name="function_name"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_LABEL"
-                       class="text_area"
+			size="40"
-                       readonly="true"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_DESCRIPTION"
-                       filter="STRING"
+			class="input-large-text"
-                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_MESSAGE"
+			required="true"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT" />
+		/>
-                <!-- To_line Field. Type: Text. (joomla)-->
+		<!-- System_name Field. Type: Text. (joomla) -->
-                <field type="text"
+		<field
-                       name="to_line"
+			type="text"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_LABEL"
+			name="system_name"
-                       size="10"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL"
-                       maxlength="50"
+			size="10"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_DESCRIPTION"
+			maxlength="50"
-                       class="text_area"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION"
-                       filter="FLOAT"
+			class="text_area"
-                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_MESSAGE"
+			filter="STRING"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT"
+			message="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_MESSAGE"
-                       onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};" />
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT"
-                <!-- Function_name Field. Type: Text. (joomla)-->
+		/>
-                <field type="text"
+		<!-- Note_placeholders_explained Field. Type: Note. A None Database Field. (joomla) -->
-                       name="function_name"
+		<field type="note" name="note_placeholders_explained" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION" heading="h4" class="note_placeholders_explained" />
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_LABEL"
+		<!-- Code Field. Type: Textarea. (joomla) -->
-                       size="40"
+		<field
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_DESCRIPTION"
+			type="textarea"
-                       class="input-large-text"
+			name="code"
-                       required="true" />
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL"
-                <!-- Note_placeholders_explained Field. Type: Note. A None Database Field. (joomla)-->
+			rows="30"
-                <field type="note"
+			cols="15"
-                       name="note_placeholders_explained"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL"
+			class="text_area span12"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION"
+			filter="raw"
-                       heading="h4"
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT"
-                       class="note_placeholders_explained" />
+			required="true"
-                <!-- From_line Field. Type: Text. (joomla)-->
+		/>
-                <field type="text"
+		<!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla) -->
-                       name="from_line"
+		<field type="note" name="note_jcb_placeholder" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION" heading="h4" class="span12 note_jcb_placeholder" />
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_LABEL"
+		<!-- Hashendtarget Field. Type: Text. (joomla) -->
-                       size="10"
+		<field
-                       maxlength="50"
+			type="text"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_DESCRIPTION"
+			name="hashendtarget"
-                       class="text_area"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_LABEL"
-                       filter="FLOAT"
+			size="50"
-                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_HINT"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION"
-                       onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};" />
+			class="text_area"
-                <!-- System_name Field. Type: Text. (joomla)-->
+			readonly="true"
-                <field type="text"
+			filter="STRING"
-                       name="system_name"
+			message="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_MESSAGE"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL"
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT"
-                       size="10"
+		/>
-                       maxlength="50"
+		<!-- To_line Field. Type: Text. (joomla) -->
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION"
+		<field
-                       class="text_area"
+			type="text"
-                       filter="STRING"
+			name="to_line"
-                       message="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_MESSAGE"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_LABEL"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT" />
+			size="10"
-                <!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla)-->
+			maxlength="50"
-                <field type="note"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_DESCRIPTION"
-                       name="note_jcb_placeholder"
+			class="text_area"
-                       label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL"
+			filter="FLOAT"
-                       description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION"
+			message="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_MESSAGE"
-                       heading="h4"
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT"
-                       class="span12 note_jcb_placeholder" />
+			onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};"
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+		/>
-                <field type="hidden"
+		<!-- From_line Field. Type: Text. (joomla) -->
-                       name="not_required"
+		<field
-                       default="[]" />
+			type="text"
-        </fieldset>
+			name="from_line"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_LABEL"
+			size="10"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_DESCRIPTION"
+			class="text_area"
+			filter="FLOAT"
+			message="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_MESSAGE"
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_HINT"
+			onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};"
+		/>
+		<!-- Hashtarget Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="hashtarget"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL"
+			size="50"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION"
+			class="text_area"
+			readonly="true"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_MESSAGE"
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT"
+		/>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/field.js

@@ -23,210 +23,96 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwajvzv_required = false;
+jform_vvvvwalvzu_required = false;
-jform_vvvvwakvzw_required = false;
+jform_vvvvwamvzv_required = false;
-jform_vvvvwalvzx_required = false;
+jform_vvvvwanvzw_required = false;
-jform_vvvvwamvzy_required = false;
+jform_vvvvwaovzx_required = false;
-jform_vvvvwapvzz_required = false;
+jform_vvvvwarvzy_required = false;
-jform_vvvvwaqwaa_required = false;
+jform_vvvvwasvzz_required = false;
-jform_vvvvwarwab_required = false;
+jform_vvvvwatwaa_required = false;
-jform_vvvvwaswac_required = false;
+jform_vvvvwauwab_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwaj = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwal = jQuery("#jform_datalenght").val();
-	vvvvwaj(datalenght_vvvvwaj);
+	vvvvwal(datalenght_vvvvwal);
 
-	var datadefault_vvvvwak = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwam = jQuery("#jform_datadefault").val();
-	vvvvwak(datadefault_vvvvwak);
+	vvvvwam(datadefault_vvvvwam);
 
-	var datatype_vvvvwal = jQuery("#jform_datatype").val();
-	vvvvwal(datatype_vvvvwal);
-
-	var datatype_vvvvwam = jQuery("#jform_datatype").val();
-	vvvvwam(datatype_vvvvwam);
-
-	var store_vvvvwan = jQuery("#jform_store").val();
 	var datatype_vvvvwan = jQuery("#jform_datatype").val();
-	vvvvwan(store_vvvvwan,datatype_vvvvwan);
+	vvvvwan(datatype_vvvvwan);
 
-	var add_css_view_vvvvwap = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var datatype_vvvvwao = jQuery("#jform_datatype").val();
-	vvvvwap(add_css_view_vvvvwap);
+	vvvvwao(datatype_vvvvwao);
 
-	var add_css_views_vvvvwaq = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var store_vvvvwap = jQuery("#jform_store").val();
-	vvvvwaq(add_css_views_vvvvwaq);
+	var datatype_vvvvwap = jQuery("#jform_datatype").val();
+	vvvvwap(store_vvvvwap,datatype_vvvvwap);
 
-	var add_javascript_view_footer_vvvvwar = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_css_view_vvvvwar = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwar(add_javascript_view_footer_vvvvwar);
+	vvvvwar(add_css_view_vvvvwar);
 
-	var add_javascript_views_footer_vvvvwas = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_css_views_vvvvwas = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwas(add_javascript_views_footer_vvvvwas);
+	vvvvwas(add_css_views_vvvvwas);
+
+	var add_javascript_view_footer_vvvvwat = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwat(add_javascript_view_footer_vvvvwat);
+
+	var add_javascript_views_footer_vvvvwau = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwau(add_javascript_views_footer_vvvvwau);
 });
 
-// the vvvvwaj function
+// the vvvvwal function
-function vvvvwaj(datalenght_vvvvwaj)
+function vvvvwal(datalenght_vvvvwal)
 {
-	if (isSet(datalenght_vvvvwaj) && datalenght_vvvvwaj.constructor !== Array)
+	if (isSet(datalenght_vvvvwal) && datalenght_vvvvwal.constructor !== Array)
 	{
-		var temp_vvvvwaj = datalenght_vvvvwaj;
+		var temp_vvvvwal = datalenght_vvvvwal;
-		var datalenght_vvvvwaj = [];
+		var datalenght_vvvvwal = [];
-		datalenght_vvvvwaj.push(temp_vvvvwaj);
+		datalenght_vvvvwal.push(temp_vvvvwal);
 	}
-	else if (!isSet(datalenght_vvvvwaj))
+	else if (!isSet(datalenght_vvvvwal))
 	{
-		var datalenght_vvvvwaj = [];
+		var datalenght_vvvvwal = [];
 	}
-	var datalenght = datalenght_vvvvwaj.some(datalenght_vvvvwaj_SomeFunc);
+	var datalenght = datalenght_vvvvwal.some(datalenght_vvvvwal_SomeFunc);
 
 
 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwajvzv_required)
+		if (jform_vvvvwalvzu_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwajvzv_required = false;
+			jform_vvvvwalvzu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwajvzv_required)
+		if (!jform_vvvvwalvzu_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwajvzv_required = true;
+			jform_vvvvwalvzu_required = true;
-		}
-	}
-}
-
-// the vvvvwaj Some function
-function datalenght_vvvvwaj_SomeFunc(datalenght_vvvvwaj)
-{
-	// set the function logic
-	if (datalenght_vvvvwaj == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwak function
-function vvvvwak(datadefault_vvvvwak)
-{
-	if (isSet(datadefault_vvvvwak) && datadefault_vvvvwak.constructor !== Array)
-	{
-		var temp_vvvvwak = datadefault_vvvvwak;
-		var datadefault_vvvvwak = [];
-		datadefault_vvvvwak.push(temp_vvvvwak);
-	}
-	else if (!isSet(datadefault_vvvvwak))
-	{
-		var datadefault_vvvvwak = [];
-	}
-	var datadefault = datadefault_vvvvwak.some(datadefault_vvvvwak_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwakvzw_required)
-		{
-			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwakvzw_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwakvzw_required)
-		{
-			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwakvzw_required = true;
-		}
-	}
-}
-
-// the vvvvwak Some function
-function datadefault_vvvvwak_SomeFunc(datadefault_vvvvwak)
-{
-	// set the function logic
-	if (datadefault_vvvvwak == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwal function
-function vvvvwal(datatype_vvvvwal)
-{
-	if (isSet(datatype_vvvvwal) && datatype_vvvvwal.constructor !== Array)
-	{
-		var temp_vvvvwal = datatype_vvvvwal;
-		var datatype_vvvvwal = [];
-		datatype_vvvvwal.push(temp_vvvvwal);
-	}
-	else if (!isSet(datatype_vvvvwal))
-	{
-		var datatype_vvvvwal = [];
-	}
-	var datatype = datatype_vvvvwal.some(datatype_vvvvwal_SomeFunc);
-
-
-	// set this function logic
-	if (datatype)
-	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvwalvzx_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwalvzx_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
-		if (!jform_vvvvwalvzx_required)
-		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwalvzx_required = true;
 		}
 	}
 }
 
 // the vvvvwal Some function
-function datatype_vvvvwal_SomeFunc(datatype_vvvvwal)
+function datalenght_vvvvwal_SomeFunc(datalenght_vvvvwal)
 {
 	// set the function logic
-	if (datatype_vvvvwal == 'CHAR' || datatype_vvvvwal == 'VARCHAR' || datatype_vvvvwal == 'DATETIME' || datatype_vvvvwal == 'DATE' || datatype_vvvvwal == 'TIME' || datatype_vvvvwal == 'INT' || datatype_vvvvwal == 'TINYINT' || datatype_vvvvwal == 'BIGINT' || datatype_vvvvwal == 'FLOAT' || datatype_vvvvwal == 'DECIMAL' || datatype_vvvvwal == 'DOUBLE')
+	if (datalenght_vvvvwal == 'Other')
 	{
 		return true;
 	}
@@ -234,54 +120,54 @@ function datatype_vvvvwal_SomeFunc(datatype_vvvvwal)
 }
 
 // the vvvvwam function
-function vvvvwam(datatype_vvvvwam)
+function vvvvwam(datadefault_vvvvwam)
 {
-	if (isSet(datatype_vvvvwam) && datatype_vvvvwam.constructor !== Array)
+	if (isSet(datadefault_vvvvwam) && datadefault_vvvvwam.constructor !== Array)
 	{
-		var temp_vvvvwam = datatype_vvvvwam;
+		var temp_vvvvwam = datadefault_vvvvwam;
-		var datatype_vvvvwam = [];
+		var datadefault_vvvvwam = [];
-		datatype_vvvvwam.push(temp_vvvvwam);
+		datadefault_vvvvwam.push(temp_vvvvwam);
 	}
-	else if (!isSet(datatype_vvvvwam))
+	else if (!isSet(datadefault_vvvvwam))
 	{
-		var datatype_vvvvwam = [];
+		var datadefault_vvvvwam = [];
 	}
-	var datatype = datatype_vvvvwam.some(datatype_vvvvwam_SomeFunc);
+	var datadefault = datadefault_vvvvwam.some(datadefault_vvvvwam_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwamvzy_required)
+		if (jform_vvvvwamvzv_required)
 		{
-			updateFieldRequired('store',0);
+			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwamvzy_required = false;
+			jform_vvvvwamvzv_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwamvzy_required)
+		if (!jform_vvvvwamvzv_required)
 		{
-			updateFieldRequired('store',1);
+			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwamvzy_required = true;
+			jform_vvvvwamvzv_required = true;
 		}
 	}
 }
 
 // the vvvvwam Some function
-function datatype_vvvvwam_SomeFunc(datatype_vvvvwam)
+function datadefault_vvvvwam_SomeFunc(datadefault_vvvvwam)
 {
 	// set the function logic
-	if (datatype_vvvvwam == 'CHAR' || datatype_vvvvwam == 'VARCHAR' || datatype_vvvvwam == 'TEXT' || datatype_vvvvwam == 'MEDIUMTEXT' || datatype_vvvvwam == 'LONGTEXT')
+	if (datadefault_vvvvwam == 'Other')
 	{
 		return true;
 	}
@@ -289,20 +175,8 @@ function datatype_vvvvwam_SomeFunc(datatype_vvvvwam)
 }
 
 // the vvvvwan function
-function vvvvwan(store_vvvvwan,datatype_vvvvwan)
+function vvvvwan(datatype_vvvvwan)
 {
-	if (isSet(store_vvvvwan) && store_vvvvwan.constructor !== Array)
-	{
-		var temp_vvvvwan = store_vvvvwan;
-		var store_vvvvwan = [];
-		store_vvvvwan.push(temp_vvvvwan);
-	}
-	else if (!isSet(store_vvvvwan))
-	{
-		var store_vvvvwan = [];
-	}
-	var store = store_vvvvwan.some(store_vvvvwan_SomeFunc);
-
 	if (isSet(datatype_vvvvwan) && datatype_vvvvwan.constructor !== Array)
 	{
 		var temp_vvvvwan = datatype_vvvvwan;
@@ -317,32 +191,97 @@ function vvvvwan(store_vvvvwan,datatype_vvvvwan)
 
 
 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_vdm_encryption').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		if (jform_vvvvwanvzw_required)
+		{
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
+			jform_vvvvwanvzw_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_vdm_encryption').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		if (!jform_vvvvwanvzw_required)
+		{
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
+			jform_vvvvwanvzw_required = true;
+		}
 	}
 }
 
-// the vvvvwan Some function
-function store_vvvvwan_SomeFunc(store_vvvvwan)
-{
-	// set the function logic
-	if (store_vvvvwan == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwan Some function
 function datatype_vvvvwan_SomeFunc(datatype_vvvvwan)
 {
 	// set the function logic
-	if (datatype_vvvvwan == 'CHAR' || datatype_vvvvwan == 'VARCHAR' || datatype_vvvvwan == 'TEXT' || datatype_vvvvwan == 'MEDIUMTEXT' || datatype_vvvvwan == 'LONGTEXT')
+	if (datatype_vvvvwan == 'CHAR' || datatype_vvvvwan == 'VARCHAR' || datatype_vvvvwan == 'DATETIME' || datatype_vvvvwan == 'DATE' || datatype_vvvvwan == 'TIME' || datatype_vvvvwan == 'INT' || datatype_vvvvwan == 'TINYINT' || datatype_vvvvwan == 'BIGINT' || datatype_vvvvwan == 'FLOAT' || datatype_vvvvwan == 'DECIMAL' || datatype_vvvvwan == 'DOUBLE')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwao function
+function vvvvwao(datatype_vvvvwao)
+{
+	if (isSet(datatype_vvvvwao) && datatype_vvvvwao.constructor !== Array)
+	{
+		var temp_vvvvwao = datatype_vvvvwao;
+		var datatype_vvvvwao = [];
+		datatype_vvvvwao.push(temp_vvvvwao);
+	}
+	else if (!isSet(datatype_vvvvwao))
+	{
+		var datatype_vvvvwao = [];
+	}
+	var datatype = datatype_vvvvwao.some(datatype_vvvvwao_SomeFunc);
+
+
+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_store').closest('.control-group').show();
+		if (jform_vvvvwaovzx_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwaovzx_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_store').closest('.control-group').hide();
+		if (!jform_vvvvwaovzx_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwaovzx_required = true;
+		}
+	}
+}
+
+// the vvvvwao Some function
+function datatype_vvvvwao_SomeFunc(datatype_vvvvwao)
+{
+	// set the function logic
+	if (datatype_vvvvwao == 'CHAR' || datatype_vvvvwao == 'VARCHAR' || datatype_vvvvwao == 'TEXT' || datatype_vvvvwao == 'MEDIUMTEXT' || datatype_vvvvwao == 'LONGTEXT')
 	{
 		return true;
 	}
@@ -350,125 +289,186 @@ function datatype_vvvvwan_SomeFunc(datatype_vvvvwan)
 }
 
 // the vvvvwap function
-function vvvvwap(add_css_view_vvvvwap)
+function vvvvwap(store_vvvvwap,datatype_vvvvwap)
+{
+	if (isSet(store_vvvvwap) && store_vvvvwap.constructor !== Array)
+	{
+		var temp_vvvvwap = store_vvvvwap;
+		var store_vvvvwap = [];
+		store_vvvvwap.push(temp_vvvvwap);
+	}
+	else if (!isSet(store_vvvvwap))
+	{
+		var store_vvvvwap = [];
+	}
+	var store = store_vvvvwap.some(store_vvvvwap_SomeFunc);
+
+	if (isSet(datatype_vvvvwap) && datatype_vvvvwap.constructor !== Array)
+	{
+		var temp_vvvvwap = datatype_vvvvwap;
+		var datatype_vvvvwap = [];
+		datatype_vvvvwap.push(temp_vvvvwap);
+	}
+	else if (!isSet(datatype_vvvvwap))
+	{
+		var datatype_vvvvwap = [];
+	}
+	var datatype = datatype_vvvvwap.some(datatype_vvvvwap_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwap Some function
+function store_vvvvwap_SomeFunc(store_vvvvwap)
 {
 	// set the function logic
-	if (add_css_view_vvvvwap == 1)
+	if (store_vvvvwap == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwap Some function
+function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
+{
+	// set the function logic
+	if (datatype_vvvvwap == 'CHAR' || datatype_vvvvwap == 'VARCHAR' || datatype_vvvvwap == 'TEXT' || datatype_vvvvwap == 'MEDIUMTEXT' || datatype_vvvvwap == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwar function
+function vvvvwar(add_css_view_vvvvwar)
+{
+	// set the function logic
+	if (add_css_view_vvvvwar == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwapvzz_required)
+		if (jform_vvvvwarvzy_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwapvzz_required = false;
+			jform_vvvvwarvzy_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwapvzz_required)
+		if (!jform_vvvvwarvzy_required)
 		{
 			updateFieldRequired('css_view',1);
 			jQuery('#jform_css_view').removeAttr('required');
 			jQuery('#jform_css_view').removeAttr('aria-required');
 			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwapvzz_required = true;
+			jform_vvvvwarvzy_required = true;
 		}
 	}
 }
 
-// the vvvvwaq function
+// the vvvvwas function
-function vvvvwaq(add_css_views_vvvvwaq)
+function vvvvwas(add_css_views_vvvvwas)
 {
 	// set the function logic
-	if (add_css_views_vvvvwaq == 1)
+	if (add_css_views_vvvvwas == 1)
 	{
 		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwaqwaa_required)
+		if (jform_vvvvwasvzz_required)
 		{
 			updateFieldRequired('css_views',0);
 			jQuery('#jform_css_views').prop('required','required');
 			jQuery('#jform_css_views').attr('aria-required',true);
 			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvwaqwaa_required = false;
+			jform_vvvvwasvzz_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwaqwaa_required)
+		if (!jform_vvvvwasvzz_required)
 		{
 			updateFieldRequired('css_views',1);
 			jQuery('#jform_css_views').removeAttr('required');
 			jQuery('#jform_css_views').removeAttr('aria-required');
 			jQuery('#jform_css_views').removeClass('required');
-			jform_vvvvwaqwaa_required = true;
+			jform_vvvvwasvzz_required = true;
 		}
 	}
 }
 
-// the vvvvwar function
+// the vvvvwat function
-function vvvvwar(add_javascript_view_footer_vvvvwar)
+function vvvvwat(add_javascript_view_footer_vvvvwat)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwar == 1)
+	if (add_javascript_view_footer_vvvvwat == 1)
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwarwab_required)
+		if (jform_vvvvwatwaa_required)
 		{
 			updateFieldRequired('javascript_view_footer',0);
 			jQuery('#jform_javascript_view_footer').prop('required','required');
 			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_view_footer').addClass('required');
-			jform_vvvvwarwab_required = false;
+			jform_vvvvwatwaa_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
-		if (!jform_vvvvwarwab_required)
+		if (!jform_vvvvwatwaa_required)
 		{
 			updateFieldRequired('javascript_view_footer',1);
 			jQuery('#jform_javascript_view_footer').removeAttr('required');
 			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_view_footer').removeClass('required');
-			jform_vvvvwarwab_required = true;
+			jform_vvvvwatwaa_required = true;
 		}
 	}
 }
 
-// the vvvvwas function
+// the vvvvwau function
-function vvvvwas(add_javascript_views_footer_vvvvwas)
+function vvvvwau(add_javascript_views_footer_vvvvwau)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwas == 1)
+	if (add_javascript_views_footer_vvvvwau == 1)
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
-		if (jform_vvvvwaswac_required)
+		if (jform_vvvvwauwab_required)
 		{
 			updateFieldRequired('javascript_views_footer',0);
 			jQuery('#jform_javascript_views_footer').prop('required','required');
 			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
 			jQuery('#jform_javascript_views_footer').addClass('required');
-			jform_vvvvwaswac_required = false;
+			jform_vvvvwauwab_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
-		if (!jform_vvvvwaswac_required)
+		if (!jform_vvvvwauwab_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwaswac_required = true;
+			jform_vvvvwauwab_required = true;
 		}
 	}
 }
@@ -509,6 +509,7 @@ function isSet(val)
 	return false;
 }
 
+
 jQuery(document).ready(function()
 {
 	// get the linked details

admin/models/forms/field.xml

@@ -4,363 +4,441 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_FIELD_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_FIELD_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_FIELD_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_FIELD_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_FIELD_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_FIELD_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_FIELD_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_FIELD_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_FIELD_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_FIELD_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_FIELD_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_FIELD_NAME_DESCRIPTION"
-                <!-- Fieldtype Field. Type: Fieldtypes. (custom)-->
+			class="text_area"
-                <field type="fieldtypes"
+			readonly="false"
-                       name="fieldtype"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL"
+			required="true"
-                       description="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_DESCRIPTION"
+			filter="STRING"
-                       class="btn-group"
+			message="COM_COMPONENTBUILDER_FIELD_NAME_MESSAGE"
-                       multiple="false"
+			hint="COM_COMPONENTBUILDER_FIELD_NAME_HINT"
-                       required="true"
+		/>
-                       button="true" />
+		<!-- Fieldtype Field. Type: Fieldtypes. (custom) -->
-                <!-- Datatype Field. Type: List. (joomla)-->
+		<field
-                <field type="list"
+			type="fieldtypes"
-                       name="datatype"
+			name="fieldtype"
-                       label="COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL"
+			label="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELD_DATATYPE_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_FIELD_FIELDTYPE_DESCRIPTION"
-                       class="btn-group"
+			class="btn-group"
-                       multiple="false"
+			multiple="false"
-                       required="true">
+			required="true"
-                        <!-- Option Set.-->
+			button="true"
-                        <option value="CHAR">COM_COMPONENTBUILDER_FIELD_CHAR</option>
+		/>
-                        <option value="VARCHAR">COM_COMPONENTBUILDER_FIELD_VARCHAR</option>
+		<!-- Datatype Field. Type: List. (joomla) -->
-                        <option value="TEXT">COM_COMPONENTBUILDER_FIELD_TEXT</option>
+		<field
-                        <option value="MEDIUMTEXT">COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT</option>
+			type="list"
-                        <option value="LONGTEXT">COM_COMPONENTBUILDER_FIELD_LONGTEXT</option>
+			name="datatype"
-                        <option value="DATETIME">COM_COMPONENTBUILDER_FIELD_DATETIME</option>
+			label="COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL"
-                        <option value="DATE">COM_COMPONENTBUILDER_FIELD_DATE</option>
+			description="COM_COMPONENTBUILDER_FIELD_DATATYPE_DESCRIPTION"
-                        <option value="TIME">COM_COMPONENTBUILDER_FIELD_TIME</option>
+			class="btn-group"
-                        <option value="INT">COM_COMPONENTBUILDER_FIELD_INT</option>
+			multiple="false"
-                        <option value="TINYINT">COM_COMPONENTBUILDER_FIELD_TINYINT</option>
+			required="true">
-                        <option value="BIGINT">COM_COMPONENTBUILDER_FIELD_BIGINT</option>
+			<!-- Option Set. -->
-                        <option value="FLOAT">COM_COMPONENTBUILDER_FIELD_FLOAT</option>
+			<option value="CHAR">
-                        <option value="DECIMAL">COM_COMPONENTBUILDER_FIELD_DECIMAL</option>
+				COM_COMPONENTBUILDER_FIELD_CHAR</option>
-                        <option value="DOUBLE">COM_COMPONENTBUILDER_FIELD_DOUBLE</option>
+			<option value="VARCHAR">
-                </field>
+				COM_COMPONENTBUILDER_FIELD_VARCHAR</option>
-                <!-- Indexes Field. Type: List. (joomla)-->
+			<option value="TEXT">
-                <field type="list"
+				COM_COMPONENTBUILDER_FIELD_TEXT</option>
-                       name="indexes"
+			<option value="MEDIUMTEXT">
-                       label="COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL"
+				COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT</option>
-                       class="btn-group"
+			<option value="LONGTEXT">
-                       multiple="false"
+				COM_COMPONENTBUILDER_FIELD_LONGTEXT</option>
-                       filter="INT"
+			<option value="DATETIME">
-                       required="true"
+				COM_COMPONENTBUILDER_FIELD_DATETIME</option>
-                       default="0">
+			<option value="DATE">
-                        <!-- Option Set.-->
+				COM_COMPONENTBUILDER_FIELD_DATE</option>
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_UNIQUE_KEY</option>
+			<option value="TIME">
-                        <option value="2">COM_COMPONENTBUILDER_FIELD_KEY</option>
+				COM_COMPONENTBUILDER_FIELD_TIME</option>
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_NONE</option>
+			<option value="INT">
-                </field>
+				COM_COMPONENTBUILDER_FIELD_INT</option>
-                <!-- Null_switch Field. Type: Radio. (joomla)-->
+			<option value="TINYINT">
-                <field type="radio"
+				COM_COMPONENTBUILDER_FIELD_TINYINT</option>
-                       name="null_switch"
+			<option value="BIGINT">
-                       label="COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL"
+				COM_COMPONENTBUILDER_FIELD_BIGINT</option>
-                       class="btn-group btn-group-yesno"
+			<option value="FLOAT">
-                       default="NOT NULL"
+				COM_COMPONENTBUILDER_FIELD_FLOAT</option>
-                       required="true">
+			<option value="DECIMAL">
-                        <!-- Option Set.-->
+				COM_COMPONENTBUILDER_FIELD_DECIMAL</option>
-                        <option value="NULL">COM_COMPONENTBUILDER_FIELD_NULL</option>
+			<option value="DOUBLE">
-                        <option value="NOT NULL">COM_COMPONENTBUILDER_FIELD_NOT_NULL</option>
+				COM_COMPONENTBUILDER_FIELD_DOUBLE</option>
-                </field>
+		</field>
-                <!-- Datalenght_other Field. Type: Text. (joomla)-->
+		<!-- Indexes Field. Type: List. (joomla) -->
-                <field type="text"
+		<field
-                       name="datalenght_other"
+			type="list"
-                       label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL"
+			name="indexes"
-                       size="10"
+			label="COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL"
-                       maxlength="50"
+			class="btn-group"
-                       description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION"
+			multiple="false"
-                       class="text_area"
+			filter="INT"
-                       readonly="false"
+			required="true"
-                       disabled="false"
+			default="0">
-                       required="true"
+			<!-- Option Set. -->
-                       filter="STRING"
+			<option value="1">
-                       message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
+				COM_COMPONENTBUILDER_FIELD_UNIQUE_KEY</option>
-                       hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT" />
+			<option value="2">
-                <!-- Datadefault Field. Type: List. (joomla)-->
+				COM_COMPONENTBUILDER_FIELD_KEY</option>
-                <field type="list"
+			<option value="0">
-                       name="datadefault"
+				COM_COMPONENTBUILDER_FIELD_NONE</option>
-                       label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL"
+		</field>
-                       description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION"
+		<!-- Null_switch Field. Type: Radio. (joomla) -->
-                       class="btn-group"
+		<field
-                       multiple="false">
+			type="radio"
-                        <!-- Option Set.-->
+			name="null_switch"
-                        <option value="">COM_COMPONENTBUILDER_FIELD_NONE</option>
+			label="COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL"
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_ZERO</option>
+			class="btn-group btn-group-yesno"
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_ONE</option>
+			default="NOT NULL"
-                        <option value="CURRENT_TIMESTAMP">COM_COMPONENTBUILDER_FIELD_CURRENT_TIMESTAMP</option>
+			required="true">
-                        <option value="DATETIME">COM_COMPONENTBUILDER_FIELD_DATETIME</option>
+			<!-- Option Set. -->
-                        <option value="Other">COM_COMPONENTBUILDER_FIELD_OTHER</option>
+			<option value="NULL">
-                </field>
+				COM_COMPONENTBUILDER_FIELD_NULL</option>
-                <!-- Add_css_view Field. Type: Radio. (joomla)-->
+			<option value="NOT NULL">
-                <field type="radio"
+				COM_COMPONENTBUILDER_FIELD_NOT_NULL</option>
-                       name="add_css_view"
+		</field>
-                       label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
+		<!-- Add_css_view Field. Type: Radio. (joomla) -->
-                       class="btn-group btn-group-yesno"
+		<field
-                       default="0"
+			type="radio"
-                       required="true">
+			name="add_css_view"
-                        <!-- Option Set.-->
+			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+			class="btn-group btn-group-yesno"
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+			default="0"
-                </field>
+			required="true">
-                <!-- Datadefault_other Field. Type: Text. (joomla)-->
+			<!-- Option Set. -->
-                <field type="text"
+			<option value="1">
-                       name="datadefault_other"
+				COM_COMPONENTBUILDER_FIELD_YES</option>
-                       label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL"
+			<option value="0">
-                       size="10"
+				COM_COMPONENTBUILDER_FIELD_NO</option>
-                       maxlength="50"
+		</field>
-                       description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION"
+		<!-- Css_view Field. Type: Textarea. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="textarea"
-                       disabled="false"
+			name="css_view"
-                       required="true"
+			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
-                       filter="STRING"
+			rows="30"
-                       message="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE"
+			cols="15"
-                       hint="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT" />
+			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
-                <!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla)-->
+			class="text_area span12"
-                <field type="note"
+			filter="raw"
-                       name="note_filter_information"
+			hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT"
-                       description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION"
+			required="true"
-                       class="note_filter_information" />
+		/>
-                <!-- Datalenght Field. Type: List. (joomla)-->
+		<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
-                <field type="list"
+		<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
-                       name="datalenght"
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
-                       label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL"
+		<field
-                       description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION"
+			type="hidden"
-                       class="btn-group"
+			name="not_required"
-                       multiple="false">
+			default="[]"
-                        <!-- Option Set.-->
+		/>
-                        <option value="">COM_COMPONENTBUILDER_FIELD_NONE_SET</option>
+		<!-- Catid Field. Type: Category. (joomla) -->
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_ONE</option>
+		<field
-                        <option value="7">COM_COMPONENTBUILDER_FIELD_SEVEN</option>
+			type="category"
-                        <option value="10">COM_COMPONENTBUILDER_FIELD_TEN</option>
+			name="catid"
-                        <option value="11">COM_COMPONENTBUILDER_FIELD_ELEVEN</option>
+			label="COM_COMPONENTBUILDER_FIELD_CATID_LABEL"
-                        <option value="50">COM_COMPONENTBUILDER_FIELD_FIFTY</option>
+			extension="com_componentbuilder.fields"
-                        <option value="64">COM_COMPONENTBUILDER_FIELD_SIXTY_FOUR</option>
+			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
-                        <option value="100">COM_COMPONENTBUILDER_FIELD_ONE_HUNDRED</option>
+			class="inputbox"
-                        <option value="255">COM_COMPONENTBUILDER_FIELD_TWO_HUNDRED_AND_FIFTY_FIVE</option>
+		/>
-                        <option value="1024">COM_COMPONENTBUILDER_FIELD_ONE_THOUSAND_AND_TWENTY_FOUR</option>
+		<!-- Xml Field. Type: Textarea. (joomla) -->
-                        <option value="2048">COM_COMPONENTBUILDER_FIELD_TWO_THOUSAND_AND_FORTY_EIGHT</option>
+		<field
-                        <option value="Other">COM_COMPONENTBUILDER_FIELD_OTHER</option>
+			type="textarea"
-                </field>
+			name="xml"
-                <!-- Add_css_views Field. Type: Radio. (joomla)-->
+			label="COM_COMPONENTBUILDER_FIELD_XML_LABEL"
-                <field type="radio"
+			rows="17"
-                       name="add_css_views"
+			cols="720"
-                       label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_XML_DESCRIPTION"
-                       class="btn-group btn-group-yesno"
+			class="text_area span12"
-                       default="0"
+			filter="raw"
-                       required="true">
+			hint="COM_COMPONENTBUILDER_FIELD_XML_HINT"
-                        <!-- Option Set.-->
+			required="true"
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+		/>
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
-                </field>
+		<field
-                <!-- Add_javascript_view_footer Field. Type: Radio. (joomla)-->
+			type="radio"
-                <field type="radio"
+			name="add_javascript_view_footer"
-                       name="add_javascript_view_footer"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
-                       label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			class="btn-group btn-group-yesno"
-                       class="btn-group btn-group-yesno"
+			default="0"
-                       default="0"
+			required="true">
-                       required="true">
+			<!-- Option Set. -->
-                        <!-- Option Set.-->
+			<option value="1">
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+				COM_COMPONENTBUILDER_FIELD_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+			<option value="0">
-                </field>
+				COM_COMPONENTBUILDER_FIELD_NO</option>
-                <!-- Xml Field. Type: Textarea. (joomla)-->
+		</field>
-                <field type="textarea"
+		<!-- Add_javascript_views_footer Field. Type: Radio. (joomla) -->
-                       name="xml"
+		<field
-                       label="COM_COMPONENTBUILDER_FIELD_XML_LABEL"
+			type="radio"
-                       rows="17"
+			name="add_javascript_views_footer"
-                       cols="720"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELD_XML_DESCRIPTION"
+			class="btn-group btn-group-yesno"
-                       class="text_area span12"
+			default="0"
-                       filter="raw"
+			required="true">
-                       hint="COM_COMPONENTBUILDER_FIELD_XML_HINT"
+			<!-- Option Set. -->
-                       required="true" />
+			<option value="1">
-                <!-- Add_javascript_views_footer Field. Type: Radio. (joomla)-->
+				COM_COMPONENTBUILDER_FIELD_YES</option>
-                <field type="radio"
+			<option value="0">
-                       name="add_javascript_views_footer"
+				COM_COMPONENTBUILDER_FIELD_NO</option>
-                       label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
+		</field>
-                       class="btn-group btn-group-yesno"
+		<!-- Add_css_views Field. Type: Radio. (joomla) -->
-                       default="0"
+		<field
-                       required="true">
+			type="radio"
-                        <!-- Option Set.-->
+			name="add_css_views"
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_YES</option>
+			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_NO</option>
+			class="btn-group btn-group-yesno"
-                </field>
+			default="0"
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+			required="true">
-                <field type="hidden"
+			<!-- Option Set. -->
-                       name="not_required"
+			<option value="1">
-                       default="[]" />
+				COM_COMPONENTBUILDER_FIELD_YES</option>
-                <!-- Catid Field. Type: Category. (joomla)-->
+			<option value="0">
-                <field type="category"
+				COM_COMPONENTBUILDER_FIELD_NO</option>
-                       name="catid"
+		</field>
-                       label="COM_COMPONENTBUILDER_FIELD_CATID_LABEL"
+		<!-- Datalenght Field. Type: List. (joomla) -->
-                       extension="com_componentbuilder.fields"
+		<field
-                       description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
+			type="list"
-                       class="inputbox" />
+			name="datalenght"
-                <!-- Css_view Field. Type: Textarea. (joomla)-->
+			label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL"
-                <field type="textarea"
+			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION"
-                       name="css_view"
+			class="btn-group"
-                       label="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_LABEL"
+			multiple="false">
-                       rows="30"
+			<!-- Option Set. -->
-                       cols="15"
+			<option value="">
-                       description="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_DESCRIPTION"
+				COM_COMPONENTBUILDER_FIELD_NONE_SET</option>
-                       class="text_area span12"
+			<option value="1">
-                       filter="raw"
+				COM_COMPONENTBUILDER_FIELD_ONE</option>
-                       hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT"
+			<option value="7">
-                       required="true" />
+				COM_COMPONENTBUILDER_FIELD_SEVEN</option>
-                <!-- Helpnote Field. Type: Note. A None Database Field. (joomla)-->
+			<option value="10">
-                <field type="note"
+				COM_COMPONENTBUILDER_FIELD_TEN</option>
-                       name="helpnote"
+			<option value="11">
-                       label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL"
+				COM_COMPONENTBUILDER_FIELD_ELEVEN</option>
-                       class="helpNote helpnote" />
+			<option value="50">
-                <!-- Css_views Field. Type: Textarea. (joomla)-->
+				COM_COMPONENTBUILDER_FIELD_FIFTY</option>
-                <field type="textarea"
+			<option value="64">
-                       name="css_views"
+				COM_COMPONENTBUILDER_FIELD_SIXTY_FOUR</option>
-                       label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
+			<option value="100">
-                       rows="30"
+				COM_COMPONENTBUILDER_FIELD_ONE_HUNDRED</option>
-                       cols="15"
+			<option value="255">
-                       description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
+				COM_COMPONENTBUILDER_FIELD_TWO_HUNDRED_AND_FIFTY_FIVE</option>
-                       class="text_area span12"
+			<option value="1024">
-                       filter="raw"
+				COM_COMPONENTBUILDER_FIELD_ONE_THOUSAND_AND_TWENTY_FOUR</option>
-                       hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_HINT"
+			<option value="2048">
-                       required="true" />
+				COM_COMPONENTBUILDER_FIELD_TWO_THOUSAND_AND_FORTY_EIGHT</option>
-                <!-- Store Field. Type: List. (joomla)-->
+			<option value="Other">
-                <field type="list"
+				COM_COMPONENTBUILDER_FIELD_OTHER</option>
-                       name="store"
+		</field>
-                       label="COM_COMPONENTBUILDER_FIELD_STORE_LABEL"
+		<!-- Datadefault_other Field. Type: Text. (joomla) -->
-                       description="COM_COMPONENTBUILDER_FIELD_STORE_DESCRIPTION"
+		<field
-                       class="list_class"
+			type="text"
-                       multiple="false"
+			name="datadefault_other"
-                       filter="INT"
+			label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_LABEL"
-                       required="true"
+			size="10"
-                       default="0">
+			maxlength="50"
-                        <!-- Option Set.-->
+			description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_DESCRIPTION"
-                        <option value="0">COM_COMPONENTBUILDER_FIELD_DEFAULT</option>
+			class="text_area"
-                        <option value="1">COM_COMPONENTBUILDER_FIELD_JSON</option>
+			readonly="false"
-                        <option value="2">COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR</option>
+			disabled="false"
-                        <option value="3">COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALKEY</option>
+			required="true"
-                        <option value="4">COM_COMPONENTBUILDER_FIELD_ADVANCE_ENCRYPTION_WHMCSKEY</option>
+			filter="STRING"
-                </field>
+			message="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE"
-                <!-- Javascript_view_footer Field. Type: Textarea. (joomla)-->
+			hint="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT"
-                <field type="textarea"
+		/>
-                       name="javascript_view_footer"
+		<!-- Datadefault Field. Type: List. (joomla) -->
-                       label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+		<field
-                       rows="30"
+			type="list"
-                       cols="15"
+			name="datadefault"
-                       description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_LABEL"
-                       class="text_area span12"
+			description="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_DESCRIPTION"
-                       filter="raw"
+			class="btn-group"
-                       hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT"
+			multiple="false">
-                       required="true" />
+			<!-- Option Set. -->
-                <!-- Note_vdm_encryption Field. Type: Note. A None Database Field. (joomla)-->
+			<option value="">
-                <field type="note"
+				COM_COMPONENTBUILDER_FIELD_NONE</option>
-                       name="note_vdm_encryption"
+			<option value="0">
-                       label="COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_LABEL"
+				COM_COMPONENTBUILDER_FIELD_ZERO</option>
-                       description="COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_DESCRIPTION"
+			<option value="1">
-                       heading="h4"
+				COM_COMPONENTBUILDER_FIELD_ONE</option>
-                       class="alert alert-success note_vdm_encryption"
+			<option value="CURRENT_TIMESTAMP">
-                       close="true" />
+				COM_COMPONENTBUILDER_FIELD_CURRENT_TIMESTAMP</option>
-                <!-- Javascript_views_footer Field. Type: Textarea. (joomla)-->
+			<option value="DATETIME">
-                <field type="textarea"
+				COM_COMPONENTBUILDER_FIELD_DATETIME</option>
-                       name="javascript_views_footer"
+			<option value="Other">
-                       label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
+				COM_COMPONENTBUILDER_FIELD_OTHER</option>
-                       rows="30"
+		</field>
-                       cols="15"
+		<!-- Datalenght_other Field. Type: Text. (joomla) -->
-                       description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION"
+		<field
-                       class="text_area span12"
+			type="text"
-                       filter="raw"
+			name="datalenght_other"
-                       hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_HINT"
+			label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_LABEL"
-                       required="true" />
+			size="10"
-        </fieldset>
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="true"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE"
+			hint="COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_HINT"
+		/>
+		<!-- Css_views Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="css_views"
+			label="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_HINT"
+			required="true"
+		/>
+		<!-- Store Field. Type: List. (joomla) -->
+		<field
+			type="list"
+			name="store"
+			label="COM_COMPONENTBUILDER_FIELD_STORE_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_STORE_DESCRIPTION"
+			class="list_class"
+			multiple="false"
+			filter="INT"
+			required="true"
+			default="0">
+			<!-- Option Set. -->
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELD_DEFAULT</option>
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELD_JSON</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_FIELD_BASESIXTY_FOUR</option>
+			<option value="3">
+				COM_COMPONENTBUILDER_FIELD_BASIC_ENCRYPTION_LOCALDBKEY</option>
+			<option value="5">
+				COM_COMPONENTBUILDER_FIELD_MEDIUM_ENCRYPTION_LOCALFILEKEY</option>
+			<option value="4">
+				COM_COMPONENTBUILDER_FIELD_WHMCSKEY_ENCRYPTION</option>
+		</field>
+		<!-- Javascript_view_footer Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="javascript_view_footer"
+			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEW_FOOTER_HINT"
+			required="true"
+		/>
+		<!-- Note_whmcs_encryption Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_whmcs_encryption" label="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_WHMCS_ENCRYPTION_DESCRIPTION" heading="h4" class="alert alert-success note_whmcs_encryption" />
+		<!-- Javascript_views_footer Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="javascript_views_footer"
+			label="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_FIELD_JAVASCRIPT_VIEWS_FOOTER_HINT"
+			required="true"
+		/>
+		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/fieldtype.xml

@@ -4,208 +4,228 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_FIELDTYPE_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_FIELDTYPE_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_FIELDTYPE_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION"
-                <!-- Note_on_fields Field. Type: Note. A None Database Field. (joomla)-->
+			class="text_area"
-                <field type="note"
+			readonly="false"
-                       name="note_on_fields"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_LABEL"
+			required="true"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_DESCRIPTION"
+			filter="STRING"
-                       heading="h4"
+			message="COM_COMPONENTBUILDER_FIELDTYPE_NAME_MESSAGE"
-                       class="alert alert-info note_on_fields" />
+			hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT"
-                <!-- Catid Field. Type: Category. (joomla)-->
+		/>
-                <field type="category"
+		<!-- Properties Field. Type: Subform. (joomla) -->
-                       name="catid"
+		<field
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_CATID_LABEL"
+			type="subform"
-                       extension="com_componentbuilder.fieldtypes"
+			name="properties"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_LABEL"
-                       class="inputbox" />
+			layout="joomla.form.field.subform.repeatable-table"
-                <!-- Description Field. Type: Textarea. (joomla)-->
+			multiple="true"
-                <field type="textarea"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_DESCRIPTION"
-                       name="description"
+			icon="list"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_LABEL"
+			maximum="500">
-                       rows="11"
+			<form hidden="true" name="list_properties_modal" repeat="true">
-                       cols="10"
+				<!-- Name Field. Type: Text. (joomla) -->
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION"
+				<field
-                       class="text_area span12"
+					type="text"
-                       filter="HTML"
+					name="name"
-                       hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT" />
+					label="COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL"
-                <!-- Short_description Field. Type: Text. (joomla)-->
+					size="40"
-                <field type="text"
+					maxlength="150"
-                       name="short_description"
+					description="COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_LABEL"
+					class="text_area"
-                       size="40"
+					readonly="false"
-                       maxlength="150"
+					disabled="false"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_DESCRIPTION"
+					required="false"
-                       class="text_area"
+					filter="STRING"
-                       required="true"
+					message="COM_COMPONENTBUILDER_FIELDTYPE_NAME_MESSAGE"
-                       filter="HTML"
+					hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT"
-                       message="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_MESSAGE"
+				/>
-                       hint="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_HINT" />
+				<!-- Example Field. Type: Text. (joomla) -->
-                <!-- Properties Field. Type: Subform. (joomla)-->
+				<field
-                <field type="subform"
+					type="text"
-                       name="properties"
+					name="example"
-                       label="COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_LABEL"
+					label="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_LABEL"
-                       layout="joomla.form.field.subform.repeatable-table"
+					size="40"
-                       multiple="true"
+					maxlength="150"
-                       description="COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_DESCRIPTION"
+					class="text_area"
-                       icon="list"
+					readonly="false"
-                       maximum="500">
+					disabled="false"
-                        <form hidden="true"
+					required="false"
-                              name="list_properties_modal"
+					filter="STRING"
-                              repeat="true">
+					message="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_MESSAGE"
-                                <!-- Name Field. Type: Text. (joomla)-->
+					hint="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_HINT"
-                                <field type="text"
+				/>
-                                       name="name"
+				<!-- Adjustable Field. Type: Checkbox. (joomla) -->
-                                       label="COM_COMPONENTBUILDER_FIELDTYPE_NAME_LABEL"
+				<field
-                                       size="40"
+					type="checkbox"
-                                       maxlength="150"
+					name="adjustable"
-                                       description="COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION"
+					label="COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL"
-                                       class="text_area"
+					value="1"
-                                       readonly="false"
+					required="false"
-                                       disabled="false"
+					description="COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION"
-                                       required="false"
+					class="inputbox"
-                                       filter="STRING"
+				/>
-                                       message="COM_COMPONENTBUILDER_FIELDTYPE_NAME_MESSAGE"
+				<!-- Mandatory Field. Type: Checkbox. (joomla) -->
-                                       hint="COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT" />
+				<field
-                                <!-- Example Field. Type: Text. (joomla)-->
+					type="checkbox"
-                                <field type="text"
+					name="mandatory"
-                                       name="example"
+					label="COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_LABEL"
-                                       label="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_LABEL"
+					value="1"
-                                       size="40"
+					required="false"
-                                       maxlength="150"
+					description="COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION"
-                                       class="text_area"
+					class="inputbox"
-                                       readonly="false"
+				/>
-                                       disabled="false"
+				<!-- Translatable Field. Type: Checkbox. (joomla) -->
-                                       required="false"
+				<field
-                                       filter="STRING"
+					type="checkbox"
-                                       message="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_MESSAGE"
+					name="translatable"
-                                       hint="COM_COMPONENTBUILDER_FIELDTYPE_EXAMPLE_HINT" />
+					label="COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_LABEL"
-                                <!-- Adjustable Field. Type: Checkbox. (joomla)-->
+					value="1"
-                                <field type="checkbox"
+					required="false"
-                                       name="adjustable"
+					description="COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_DESCRIPTION"
-                                       label="COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL"
+					class="inputbox"
-                                       value="1"
+				/>
-                                       required="false"
+				<!-- Description Field. Type: Textarea. (joomla) -->
-                                       description="COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION"
+				<field
-                                       class="inputbox" />
+					type="textarea"
-                                <!-- Mandatory Field. Type: Checkbox. (joomla)-->
+					name="description"
-                                <field type="checkbox"
+					label="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_LABEL"
-                                       name="mandatory"
+					rows="5"
-                                       label="COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_LABEL"
+					cols="8"
-                                       value="1"
+					description="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION"
-                                       required="false"
+					class="text_area"
-                                       description="COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION"
+					filter="HTML"
-                                       class="inputbox" />
+					hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT"
-                                <!-- Translatable Field. Type: Checkbox. (joomla)-->
+					required="false"
-                                <field type="checkbox"
+				/>
-                                       name="translatable"
+			</form>
-                                       label="COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_LABEL"
+		</field>
-                                       value="1"
+		<!-- Note_on_fields Field. Type: Note. A None Database Field. (joomla) -->
-                                       required="false"
+		<field type="note" name="note_on_fields" label="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_NOTE_ON_FIELDS_DESCRIPTION" heading="h4" class="alert alert-info note_on_fields" />
-                                       description="COM_COMPONENTBUILDER_FIELDTYPE_TRANSLATABLE_DESCRIPTION"
+		<!-- Description Field. Type: Textarea. (joomla) -->
-                                       class="inputbox" />
+		<field
-                                <!-- Description Field. Type: Textarea. (joomla)-->
+			type="textarea"
-                                <field type="textarea"
+			name="description"
-                                       name="description"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_LABEL"
-                                       label="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_LABEL"
+			rows="11"
-                                       rows="5"
+			cols="10"
-                                       cols="8"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION"
+			class="text_area span12"
-                                       class="text_area"
+			filter="HTML"
-                                       filter="HTML"
+			hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT"
-                                       hint="COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT"
+		/>
-                                       required="false" />
+		<!-- Short_description Field. Type: Text. (joomla) -->
-                        </form>
+		<field
-                </field>
+			type="text"
-        </fieldset>
+			name="short_description"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_LABEL"
+			size="40"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="HTML"
+			message="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_MESSAGE"
+			hint="COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_HINT"
+		/>
+		<!-- Catid Field. Type: Category. (joomla) -->
+		<field
+			type="category"
+			name="catid"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_CATID_LABEL"
+			extension="com_componentbuilder.fieldtypes"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION"
+			class="inputbox"
+		/>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/help_document.js

@@ -23,207 +23,97 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwbdwan_required = false;
+jform_vvvvwbfwan_required = false;
-jform_vvvvwbewao_required = false;
+jform_vvvvwbgwao_required = false;
-jform_vvvvwbfwap_required = false;
+jform_vvvvwbhwap_required = false;
-jform_vvvvwbgwaq_required = false;
+jform_vvvvwbiwaq_required = false;
-jform_vvvvwbhwar_required = false;
+jform_vvvvwbjwar_required = false;
-jform_vvvvwbiwas_required = false;
+jform_vvvvwbkwas_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwbd = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwbf = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbd(location_vvvvwbd);
+	vvvvwbf(location_vvvvwbf);
 
-	var location_vvvvwbe = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwbg = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbe(location_vvvvwbe);
+	vvvvwbg(location_vvvvwbg);
-
-	var type_vvvvwbf = jQuery("#jform_type").val();
-	vvvvwbf(type_vvvvwbf);
-
-	var type_vvvvwbg = jQuery("#jform_type").val();
-	vvvvwbg(type_vvvvwbg);
 
 	var type_vvvvwbh = jQuery("#jform_type").val();
 	vvvvwbh(type_vvvvwbh);
 
-	var target_vvvvwbi = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwbi = jQuery("#jform_type").val();
-	vvvvwbi(target_vvvvwbi);
+	vvvvwbi(type_vvvvwbi);
+
+	var type_vvvvwbj = jQuery("#jform_type").val();
+	vvvvwbj(type_vvvvwbj);
+
+	var target_vvvvwbk = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbk(target_vvvvwbk);
 });
 
-// the vvvvwbd function
+// the vvvvwbf function
-function vvvvwbd(location_vvvvwbd)
+function vvvvwbf(location_vvvvwbf)
 {
 	// set the function logic
-	if (location_vvvvwbd == 1)
+	if (location_vvvvwbf == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwbdwan_required)
+		if (jform_vvvvwbfwan_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwbdwan_required = false;
+			jform_vvvvwbfwan_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwbdwan_required)
+		if (!jform_vvvvwbfwan_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwbdwan_required = true;
+			jform_vvvvwbfwan_required = true;
 		}
 	}
 }
 
-// the vvvvwbe function
+// the vvvvwbg function
-function vvvvwbe(location_vvvvwbe)
+function vvvvwbg(location_vvvvwbg)
 {
 	// set the function logic
-	if (location_vvvvwbe == 2)
+	if (location_vvvvwbg == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwbewao_required)
+		if (jform_vvvvwbgwao_required)
 		{
 			updateFieldRequired('site_view',0);
 			jQuery('#jform_site_view').prop('required','required');
 			jQuery('#jform_site_view').attr('aria-required',true);
 			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwbewao_required = false;
+			jform_vvvvwbgwao_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwbewao_required)
+		if (!jform_vvvvwbgwao_required)
 		{
 			updateFieldRequired('site_view',1);
 			jQuery('#jform_site_view').removeAttr('required');
 			jQuery('#jform_site_view').removeAttr('aria-required');
 			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwbewao_required = true;
+			jform_vvvvwbgwao_required = true;
 		}
 	}
 }
 
-// the vvvvwbf function
-function vvvvwbf(type_vvvvwbf)
-{
-	if (isSet(type_vvvvwbf) && type_vvvvwbf.constructor !== Array)
-	{
-		var temp_vvvvwbf = type_vvvvwbf;
-		var type_vvvvwbf = [];
-		type_vvvvwbf.push(temp_vvvvwbf);
-	}
-	else if (!isSet(type_vvvvwbf))
-	{
-		var type_vvvvwbf = [];
-	}
-	var type = type_vvvvwbf.some(type_vvvvwbf_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwbfwap_required)
-		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
-			jform_vvvvwbfwap_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwbfwap_required)
-		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwbfwap_required = true;
-		}
-	}
-}
-
-// the vvvvwbf Some function
-function type_vvvvwbf_SomeFunc(type_vvvvwbf)
-{
-	// set the function logic
-	if (type_vvvvwbf == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwbg function
-function vvvvwbg(type_vvvvwbg)
-{
-	if (isSet(type_vvvvwbg) && type_vvvvwbg.constructor !== Array)
-	{
-		var temp_vvvvwbg = type_vvvvwbg;
-		var type_vvvvwbg = [];
-		type_vvvvwbg.push(temp_vvvvwbg);
-	}
-	else if (!isSet(type_vvvvwbg))
-	{
-		var type_vvvvwbg = [];
-	}
-	var type = type_vvvvwbg.some(type_vvvvwbg_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_vvvvwbgwaq_required)
-		{
-			updateFieldRequired('article',0);
-			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
-			jform_vvvvwbgwaq_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_vvvvwbgwaq_required)
-		{
-			updateFieldRequired('article',1);
-			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwbgwaq_required = true;
-		}
-	}
-}
-
-// the vvvvwbg Some function
-function type_vvvvwbg_SomeFunc(type_vvvvwbg)
-{
-	// set the function logic
-	if (type_vvvvwbg == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbh function
 function vvvvwbh(type_vvvvwbh)
 {
@@ -243,27 +133,27 @@ function vvvvwbh(type_vvvvwbh)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwbhwar_required)
+		if (jform_vvvvwbhwap_required)
 		{
-			updateFieldRequired('content',0);
+			updateFieldRequired('url',0);
-			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			jQuery('#jform_url').addClass('required');
-			jform_vvvvwbhwar_required = false;
+			jform_vvvvwbhwap_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwbhwar_required)
+		if (!jform_vvvvwbhwap_required)
 		{
-			updateFieldRequired('content',1);
+			updateFieldRequired('url',1);
-			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwbhwar_required = true;
+			jform_vvvvwbhwap_required = true;
 		}
 	}
 }
@@ -272,7 +162,7 @@ function vvvvwbh(type_vvvvwbh)
 function type_vvvvwbh_SomeFunc(type_vvvvwbh)
 {
 	// set the function logic
-	if (type_vvvvwbh == 2)
+	if (type_vvvvwbh == 3)
 	{
 		return true;
 	}
@@ -280,32 +170,142 @@ function type_vvvvwbh_SomeFunc(type_vvvvwbh)
 }
 
 // the vvvvwbi function
-function vvvvwbi(target_vvvvwbi)
+function vvvvwbi(type_vvvvwbi)
+{
+	if (isSet(type_vvvvwbi) && type_vvvvwbi.constructor !== Array)
+	{
+		var temp_vvvvwbi = type_vvvvwbi;
+		var type_vvvvwbi = [];
+		type_vvvvwbi.push(temp_vvvvwbi);
+	}
+	else if (!isSet(type_vvvvwbi))
+	{
+		var type_vvvvwbi = [];
+	}
+	var type = type_vvvvwbi.some(type_vvvvwbi_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_article').closest('.control-group').show();
+		if (jform_vvvvwbiwaq_required)
+		{
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
+			jform_vvvvwbiwaq_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_article').closest('.control-group').hide();
+		if (!jform_vvvvwbiwaq_required)
+		{
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
+			jform_vvvvwbiwaq_required = true;
+		}
+	}
+}
+
+// the vvvvwbi Some function
+function type_vvvvwbi_SomeFunc(type_vvvvwbi)
 {
 	// set the function logic
-	if (target_vvvvwbi == 1)
+	if (type_vvvvwbi == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbj function
+function vvvvwbj(type_vvvvwbj)
+{
+	if (isSet(type_vvvvwbj) && type_vvvvwbj.constructor !== Array)
+	{
+		var temp_vvvvwbj = type_vvvvwbj;
+		var type_vvvvwbj = [];
+		type_vvvvwbj.push(temp_vvvvwbj);
+	}
+	else if (!isSet(type_vvvvwbj))
+	{
+		var type_vvvvwbj = [];
+	}
+	var type = type_vvvvwbj.some(type_vvvvwbj_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		if (jform_vvvvwbjwar_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwbjwar_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwbjwar_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwbjwar_required = true;
+		}
+	}
+}
+
+// the vvvvwbj Some function
+function type_vvvvwbj_SomeFunc(type_vvvvwbj)
+{
+	// set the function logic
+	if (type_vvvvwbj == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbk function
+function vvvvwbk(target_vvvvwbk)
+{
+	// set the function logic
+	if (target_vvvvwbk == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_vvvvwbiwas_required)
+		if (jform_vvvvwbkwas_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwbiwas_required = false;
+			jform_vvvvwbkwas_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_vvvvwbiwas_required)
+		if (!jform_vvvvwbkwas_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwbiwas_required = true;
+			jform_vvvvwbkwas_required = true;
 		}
 	}
 }

admin/models/forms/help_document.xml

@@ -4,198 +4,233 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_LABEL"
-                <!-- Title Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="title"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_DESCRIPTION"
+		<!-- Title Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="title"
-                       required="true"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_HINT" />
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_DESCRIPTION"
-                <!-- Type Field. Type: List. (joomla)-->
+			class="text_area"
-                <field type="list"
+			readonly="false"
-                       name="type"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL"
+			required="true"
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_DESCRIPTION"
+			filter="STRING"
-                       class="list_class"
+			message="COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_MESSAGE"
-                       multiple="false"
+			hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_HINT"
-                       required="true">
+		/>
-                        <!-- Option Set.-->
+		<!-- Type Field. Type: List. (joomla) -->
-                        <option value="">COM_COMPONENTBUILDER_HELP_DOCUMENT_SELECT_AN_OPTION</option>
+		<field
-                        <option value="1">COM_COMPONENTBUILDER_HELP_DOCUMENT_JOOMLA_ARTICLE</option>
+			type="list"
-                        <option value="2">COM_COMPONENTBUILDER_HELP_DOCUMENT_TEXT</option>
+			name="type"
-                        <option value="3">COM_COMPONENTBUILDER_HELP_DOCUMENT_URL</option>
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL"
-                </field>
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_DESCRIPTION"
-                <!-- Groups Field. Type: Usergroup. (joomla)-->
+			class="list_class"
-                <field type="usergroup"
+			multiple="false"
-                       name="groups"
+			required="true">
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_GROUPS_LABEL"
+			<!-- Option Set. -->
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_GROUPS_DESCRIPTION"
+			<option value="">
-                       required="true"
+				COM_COMPONENTBUILDER_HELP_DOCUMENT_SELECT_AN_OPTION</option>
-                       multiple="true" />
+			<option value="1">
-                <!-- Location Field. Type: Radio. (joomla)-->
+				COM_COMPONENTBUILDER_HELP_DOCUMENT_JOOMLA_ARTICLE</option>
-                <field type="radio"
+			<option value="2">
-                       name="location"
+				COM_COMPONENTBUILDER_HELP_DOCUMENT_TEXT</option>
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL"
+			<option value="3">
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_DESCRIPTION"
+				COM_COMPONENTBUILDER_HELP_DOCUMENT_URL</option>
-                       class="btn-group"
+		</field>
-                       required="true">
+		<!-- Groups Field. Type: Usergroup. (joomla) -->
-                        <!-- Option Set.-->
+		<field
-                        <option value="1">COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN</option>
+			type="usergroup"
-                        <option value="2">COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE</option>
+			name="groups"
-                </field>
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_GROUPS_LABEL"
-                <!-- Admin_view Field. Type: Adminviewfolderlist. (custom)-->
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_GROUPS_DESCRIPTION"
-                <field type="adminviewfolderlist"
+			required="true"
-                       name="admin_view"
+			multiple="true"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL"
+		/>
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION"
+		<!-- Location Field. Type: Radio. (joomla) -->
-                       class="list_class"
+		<field
-                       multiple="false"
+			type="radio"
-                       required="true"
+			name="location"
-                       button="false" />
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL"
-                <!-- Site_view Field. Type: Siteviewfolderlist. (custom)-->
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_DESCRIPTION"
-                <field type="siteviewfolderlist"
+			class="btn-group"
-                       name="site_view"
+			required="true">
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_LABEL"
+			<!-- Option Set. -->
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_DESCRIPTION"
+			<option value="1">
-                       class="list_class"
+				COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN</option>
-                       multiple="false"
+			<option value="2">
-                       required="true"
+				COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE</option>
-                       button="false" />
+		</field>
-                <!-- Target Field. Type: Radio. (joomla)-->
+		<!-- Admin_view Field. Type: Adminviewfolderlist. (custom) -->
-                <field type="radio"
+		<field
-                       name="target"
+			type="adminviewfolderlist"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TARGET_LABEL"
+			name="admin_view"
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TARGET_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL"
-                       class="btn-group"
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION"
-                       required="true">
+			class="list_class"
-                        <!-- Option Set.-->
+			multiple="false"
-                        <option value="1">COM_COMPONENTBUILDER_HELP_DOCUMENT_SOME</option>
+			required="true"
-                        <option value="2">COM_COMPONENTBUILDER_HELP_DOCUMENT_ALL</option>
+			button="false"
-                </field>
+		/>
-                <!-- Content Field. Type: Editor. (joomla)-->
+		<!-- Site_view Field. Type: Siteviewfolderlist. (custom) -->
-                <field type="editor"
+		<field
-                       name="content"
+			type="siteviewfolderlist"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_CONTENT_LABEL"
+			name="site_view"
-                       width="100%"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_LABEL"
-                       height="300 px"
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_SITE_VIEW_DESCRIPTION"
-                       buttons="false"
+			class="list_class"
-                       filter="safehtml"
+			multiple="false"
-                       required="true" />
+			required="true"
-                <!-- Alias Field. Type: Text. (joomla)-->
+			button="false"
-                <field type="text"
+		/>
-                       name="alias"
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_LABEL"
+		<field
-                       description="JFIELD_ALIAS_DESC"
+			type="hidden"
-                       filter="STRING"
+			name="not_required"
-                       hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_HINT" />
+			default="[]"
-                <!-- Article Field. Type: Articles. (custom)-->
+		/>
-                <field type="articles"
+		<!-- Content Field. Type: Editor. (joomla) -->
-                       name="article"
+		<field
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE_LABEL"
+			type="editor"
-                       class="list_class"
+			name="content"
-                       multiple="false"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_CONTENT_LABEL"
-                       default="0"
+			width="100%"
-                       required="true" />
+			height="300 px"
-                <!-- Url Field. Type: Url. (joomla)-->
+			buttons="false"
-                <field type="url"
+			filter="safehtml"
-                       name="url"
+			required="true"
-                       label="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_LABEL"
+		/>
-                       size="60"
+		<!-- Article Field. Type: Articles. (custom) -->
-                       maxlength="150"
+		<field
-                       description="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_DESCRIPTION"
+			type="articles"
-                       class="text_area"
+			name="article"
-                       required="true"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE_LABEL"
-                       filter="url"
+			class="list_class"
-                       validated="url"
+			multiple="false"
-                       message="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_MESSAGE"
+			default="0"
-                       hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_HINT" />
+			required="true"
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+		/>
-                <field type="hidden"
+		<!-- Url Field. Type: Url. (joomla) -->
-                       name="not_required"
+		<field
-                       default="[]" />
+			type="url"
-        </fieldset>
+			name="url"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="url"
+			validated="url"
+			message="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_MESSAGE"
+			hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_HINT"
+		/>
+		<!-- Target Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="target"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_TARGET_LABEL"
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_TARGET_DESCRIPTION"
+			class="btn-group"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_HELP_DOCUMENT_SOME</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_HELP_DOCUMENT_ALL</option>
+		</field>
+		<!-- Alias Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="alias"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			filter="STRING"
+			hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_HINT"
+		/>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/joomla_component.js

@@ -126,6 +126,12 @@ jQuery(document).ready(function()
 
 	var buildcomp_vvvvvww = jQuery("#jform_buildcomp input[type='radio']:checked").val();
 	vvvvvww(buildcomp_vvvvvww);
+
+	var dashboard_type_vvvvvwx = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwx(dashboard_type_vvvvvwx);
+
+	var dashboard_type_vvvvvwy = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	vvvvvwy(dashboard_type_vvvvvwy);
 });
 
 // the vvvvvvv function
@@ -808,6 +814,36 @@ function vvvvvww(buildcomp_vvvvvww)
 	}
 }
 
+// the vvvvvwx function
+function vvvvvwx(dashboard_type_vvvvvwx)
+{
+	// set the function logic
+	if (dashboard_type_vvvvvwx == 2)
+	{
+		jQuery('#jform_dashboard').closest('.control-group').show();
+		jQuery('.note_dynamic_dashboard').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('#jform_dashboard').closest('.control-group').hide();
+		jQuery('.note_dynamic_dashboard').closest('.control-group').hide();
+	}
+}
+
+// the vvvvvwy function
+function vvvvvwy(dashboard_type_vvvvvwy)
+{
+	// set the function logic
+	if (dashboard_type_vvvvvwy == 1)
+	{
+		jQuery('.note_botton_component_dashboard').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_botton_component_dashboard').closest('.control-group').hide();
+	}
+}
+
 // update required fields
 function updateFieldRequired(name,status)
 {
@@ -844,11 +880,14 @@ function isSet(val)
 	return false;
 }
 
+
 jQuery(document).ready(function()
 {
+	// check what is the dashboard switch
+	var dasboard_type = jQuery("#jform_dashboard_type input[type='radio']:checked").val();
+	dasboardSwitch(dasboard_type);
 	// set buttons
 	function setButtons1() {
-		addButtonID('component_dashboard','button_component_dashboard', 1);
 		addButtonID('component_files_folders','button_component_files_folders', 1);
 		addButtonID('component_site_views','button_create_edit_views', 1);
 	 }
@@ -915,6 +954,20 @@ function addData(result, where){
 	jQuery(result).insertAfter(jQuery(where).closest('.control-group'));
 }
 
+function dasboardSwitch(value){
+	// hide if default
+	if (2 == value) {
+		jQuery('.control-group-componentdashboard-one').hide();
+	} else {
+		// default behaviour
+		if (jQuery('div.control-group-componentdashboard-one').length) {
+			jQuery('.control-group-componentdashboard-one').show();
+		} else {
+			addButtonID('component_dashboard','button_component_dashboard', 1);
+		}
+	}
+}
+
 
 function addButtonID_server(type, size){
 	var getUrl = JRouter("index.php?option=com_componentbuilder&task=ajax.getButtonID&format=json&vdm="+vastDevMod);

admin/models/forms/language.xml

@@ -4,107 +4,117 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_LANGUAGE_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_LANGUAGE_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_LANGUAGE_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_LANGUAGE_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_LANGUAGE_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_LANGUAGE_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_LANGUAGE_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_LANGUAGE_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_LANGUAGE_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_LANGUAGE_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_LANGUAGE_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_LANGUAGE_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_LANGUAGE_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_LANGUAGE_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_LANGUAGE_NAME_DESCRIPTION"
-                <!-- Langtag Field. Type: Text. (joomla)-->
+			class="text_area"
-                <field type="text"
+			readonly="false"
-                       name="langtag"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_LABEL"
+			required="true"
-                       size="10"
+			filter="STRING"
-                       maxlength="10"
+			message="COM_COMPONENTBUILDER_LANGUAGE_NAME_MESSAGE"
-                       description="COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_LANGUAGE_NAME_HINT"
-                       class="text_area"
+		/>
-                       filter="STRING"
+		<!-- Langtag Field. Type: Text. (joomla) -->
-                       message="COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_MESSAGE"
+		<field
-                       hint="COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_HINT" />
+			type="text"
-        </fieldset>
+			name="langtag"
+			label="COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_LABEL"
+			size="10"
+			maxlength="10"
+			description="COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_DESCRIPTION"
+			class="text_area"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_MESSAGE"
+			hint="COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_HINT"
+		/>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/language_translation.js

@@ -24,6 +24,7 @@
 
 
 
+
 jQuery(document).ready(function($)
 {
 	// set button to add more languages

admin/models/forms/language_translation.xml

@@ -4,138 +4,151 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL"
-                <!-- Entranslation Field. Type: Textarea. (joomla)-->
+			description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC"
-                <field type="textarea"
+			size="6"
-                       name="entranslation"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL"
+			filter="unset"
-                       rows="4"
+		/>
-                       cols="5"
+		<!-- Dynamic Fields. -->
-                       description="JFIELD_TITLE_DESC"
+		<!-- Entranslation Field. Type: Textarea. (joomla) -->
-                       message="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_MESSAGE"
+		<field
-                       class="text_area span12"
+			type="textarea"
-                       filter="STRING"
+			name="entranslation"
-                       hint="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_HINT"
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_LABEL"
-                       readonly="true"
+			rows="4"
-                       disabled="true" />
+			cols="5"
-                <!-- Translation Field. Type: Subform. (joomla)-->
+			description="JFIELD_TITLE_DESC"
-                <field type="subform"
+			message="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_MESSAGE"
-                       name="translation"
+			class="text_area span12"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL"
+			filter="STRING"
-                       layout="joomla.form.field.subform.repeatable-table"
+			hint="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_ENTRANSLATION_HINT"
-                       multiple="true"
+			readonly="true"
-                       description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION"
+			disabled="true"
-                       icon="list"
+		/>
-                       maximum="200">
+		<!-- Components Field. Type: Components. (custom) -->
-                        <form hidden="true"
+		<field
-                              name="list_translation_modal"
+			type="components"
-                              repeat="true">
+			name="components"
-                                <!-- Translation Field. Type: Textarea. (joomla)-->
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL"
-                                <field type="textarea"
+			class="list_class"
-                                       name="translation"
+			multiple="true"
-                                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL"
+			default="0"
-                                       rows="4"
+			required="true"
-                                       cols="20"
+			button="false"
-                                       message="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_MESSAGE"
+		/>
-                                       class="text_area translation_text_area"
+		<!-- Translation Field. Type: Subform. (joomla) -->
-                                       filter="STRING"
+		<field
-                                       hint="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT"
+			type="subform"
-                                       required="false" />
+			name="translation"
-                                <!-- Language Field. Type: Lang. (custom)-->
+			label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL"
-                                <field type="lang"
+			layout="joomla.form.field.subform.repeatable-table"
-                                       name="language"
+			multiple="true"
-                                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_LANGUAGE_LABEL"
+			description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION"
-                                       class="list_class"
+			icon="list"
-                                       multiple="false"
+			maximum="200">
-                                       default="0"
+			<form hidden="true" name="list_translation_modal" repeat="true">
-                                       required="false"
+				<!-- Translation Field. Type: Textarea. (joomla) -->
-                                       button="false" />
+				<field
-                        </form>
+					type="textarea"
-                </field>
+					name="translation"
-                <!-- Components Field. Type: Components. (custom)-->
+					label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL"
-                <field type="components"
+					rows="4"
-                       name="components"
+					cols="20"
-                       label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_COMPONENTS_LABEL"
+					message="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_MESSAGE"
-                       class="list_class"
+					class="text_area translation_text_area"
-                       multiple="true"
+					filter="STRING"
-                       default="0"
+					hint="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT"
-                       required="true"
+					required="false"
-                       button="false" />
+				/>
-        </fieldset>
+				<!-- Language Field. Type: Lang. (custom) -->
+				<field
+					type="lang"
+					name="language"
+					label="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_LANGUAGE_LABEL"
+					class="list_class"
+					multiple="false"
+					default="0"
+					required="false"
+					button="false"
+				/>
+			</form>
+		</field>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/layout.js

@@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyxvyu_required = false;
+jform_vvvvvyzvyt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyx = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyz = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyx(add_php_view_vvvvvyx);
+	vvvvvyz(add_php_view_vvvvvyz);
 });
 
-// the vvvvvyx function
+// the vvvvvyz function
-function vvvvvyx(add_php_view_vvvvvyx)
+function vvvvvyz(add_php_view_vvvvvyz)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyx == 1)
+	if (add_php_view_vvvvvyz == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyxvyu_required)
+		if (jform_vvvvvyzvyt_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyxvyu_required = false;
+			jform_vvvvvyzvyt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyxvyu_required)
+		if (!jform_vvvvvyzvyt_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyxvyu_required = true;
+			jform_vvvvvyzvyt_required = true;
 		}
 	}
 }
@@ -100,6 +100,7 @@ function isSet(val)
 }
 
 
+
 function getSnippetDetails_server(snippetId){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
 	if(token.length > 0 && snippetId > 0){

admin/models/forms/layout.xml

@@ -4,217 +4,221 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_LAYOUT_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_LAYOUT_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_LAYOUT_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_LAYOUT_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_LAYOUT_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_LAYOUT_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_LAYOUT_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_LAYOUT_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_LAYOUT_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_LAYOUT_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_LAYOUT_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_LAYOUT_NAME_DESCRIPTION"
-                <!-- Alias Field. Type: Text. (joomla)-->
+			class="text_area"
-                <field type="text"
+			readonly="false"
-                       name="alias"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_LAYOUT_ALIAS_LABEL"
+			required="true"
-                       size="40"
+			filter="STRING"
-                       maxlength="50"
+			message="COM_COMPONENTBUILDER_LAYOUT_NAME_MESSAGE"
-                       description="COM_COMPONENTBUILDER_LAYOUT_ALIAS_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_LAYOUT_NAME_HINT"
-                       class="text_area"
+		/>
-                       filter="CMD"
+		<!-- Alias Field. Type: Text. (joomla) -->
-                       message="COM_COMPONENTBUILDER_LAYOUT_ALIAS_MESSAGE"
+		<field
-                       hint="COM_COMPONENTBUILDER_LAYOUT_ALIAS_HINT" />
+			type="text"
-                <!-- Description Field. Type: Text. (joomla)-->
+			name="alias"
-                <field type="text"
+			label="COM_COMPONENTBUILDER_LAYOUT_ALIAS_LABEL"
-                       name="description"
+			size="40"
-                       label="COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_LABEL"
+			maxlength="50"
-                       size="80"
+			description="COM_COMPONENTBUILDER_LAYOUT_ALIAS_DESCRIPTION"
-                       maxlength="150"
+			class="text_area"
-                       description="COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_DESCRIPTION"
+			filter="CMD"
-                       class="text_area"
+			message="COM_COMPONENTBUILDER_LAYOUT_ALIAS_MESSAGE"
-                       readonly="false"
+			hint="COM_COMPONENTBUILDER_LAYOUT_ALIAS_HINT"
-                       disabled="false"
+		/>
-                       required="true"
+		<!-- Description Field. Type: Text. (joomla) -->
-                       filter="STRING"
+		<field
-                       message="COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_MESSAGE"
+			type="text"
-                       hint="COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_HINT" />
+			name="description"
-                <!-- Dynamic_get Field. Type: Dynamicget. (custom)-->
+			label="COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_LABEL"
-                <field type="dynamicget"
+			size="80"
-                       name="dynamic_get"
+			maxlength="150"
-                       label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_LABEL"
+			description="COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_DESCRIPTION"
-                       description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_DESCRIPTION"
+			class="text_area"
-                       multiple="false"
+			readonly="false"
-                       required="false"
+			disabled="false"
-                       button="true" />
+			required="true"
-                <!-- Snippet Field. Type: Snippets. (custom)-->
+			filter="STRING"
-                <field type="snippets"
+			message="COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_MESSAGE"
-                       name="snippet"
+			hint="COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_HINT"
-                       label="COM_COMPONENTBUILDER_LAYOUT_SNIPPET_LABEL"
+		/>
-                       description="COM_COMPONENTBUILDER_LAYOUT_SNIPPET_DESCRIPTION"
+		<!-- Dynamic_get Field. Type: Dynamicget. (custom) -->
-                       class="list_class"
+		<field
-                       multiple="false"
+			type="dynamicget"
-                       required="false"
+			name="dynamic_get"
-                       button="true" />
+			label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_LABEL"
-                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+			description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_GET_DESCRIPTION"
-                <field type="note"
+			multiple="false"
-                       name="note_libraries_selection"
+			required="false"
-                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_LABEL"
+			button="true"
-                       description="COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
+		/>
-                       heading="h4"
+		<!-- Snippet Field. Type: Snippets. (custom) -->
-                       class="alert alert-info note_libraries_selection" />
+		<field
-                <!-- Layout Field. Type: Textarea. (joomla)-->
+			type="snippets"
-                <field type="textarea"
+			name="snippet"
-                       name="layout"
+			label="COM_COMPONENTBUILDER_LAYOUT_SNIPPET_LABEL"
-                       label="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL"
+			description="COM_COMPONENTBUILDER_LAYOUT_SNIPPET_DESCRIPTION"
-                       rows="20"
+			class="list_class"
-                       cols="15"
+			multiple="false"
-                       class="text_area span12"
+			required="false"
-                       filter="raw"
+			button="true"
-                       hint="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT"
+		/>
-                       required="true" />
+		<!-- Php_view Field. Type: Textarea. (joomla) -->
-                <!-- Add_php_view Field. Type: Radio. (joomla)-->
+		<field
-                <field type="radio"
+			type="textarea"
-                       name="add_php_view"
+			name="php_view"
-                       label="COM_COMPONENTBUILDER_LAYOUT_ADD_PHP_VIEW_LABEL"
+			label="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_LABEL"
-                       class="btn-group btn-group-yesno"
+			rows="17"
-                       default="0"
+			cols="5"
-                       required="true">
+			description="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_DESCRIPTION"
-                        <!-- Option Set.-->
+			class="text_area span12"
-                        <option value="1">COM_COMPONENTBUILDER_LAYOUT_YES</option>
+			filter="raw"
-                        <option value="0">COM_COMPONENTBUILDER_LAYOUT_NO</option>
+			hint="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_HINT"
-                </field>
+			required="true"
-                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
+		/>
-                <field type="note"
+		<!-- Add_php_view Field. Type: Radio. (joomla) -->
-                       name="note_add_language_string"
+		<field
-                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_LANGUAGE_STRING_LABEL"
+			type="radio"
-                       description="COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
+			name="add_php_view"
-                       heading="h4"
+			label="COM_COMPONENTBUILDER_LAYOUT_ADD_PHP_VIEW_LABEL"
-                       class="note_add_language_string" />
+			class="btn-group btn-group-yesno"
-                <!-- Libraries Field. Type: Libraries. (custom)-->
+			default="0"
-                <field type="libraries"
+			required="true">
-                       name="libraries"
+			<!-- Option Set. -->
-                       label="COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_LABEL"
+			<option value="1">
-                       description="COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_DESCRIPTION"
+				COM_COMPONENTBUILDER_LAYOUT_YES</option>
-                       class="list_class"
+			<option value="0">
-                       multiple="true"
+				COM_COMPONENTBUILDER_LAYOUT_NO</option>
-                       default="0"
+		</field>
-                       required="false"
+		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
-                       button="true" />
+		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
-                <field type="hidden"
+		<field
-                       name="not_required"
+			type="hidden"
-                       default="[]" />
+			name="not_required"
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+			default="[]"
-                <field type="note"
+		/>
-                       name="note_snippet_usage"
+		<!-- Layout Field. Type: Textarea. (joomla) -->
-                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_SNIPPET_USAGE_LABEL"
+		<field
-                       heading="h4"
+			type="textarea"
-                       class="snippet-usage note_snippet_usage" />
+			name="layout"
-                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
+			label="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL"
-                <field type="note"
+			rows="20"
-                       name="dynamic_values"
+			cols="15"
-                       label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_LABEL"
+			class="text_area span12"
-                       description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_DESCRIPTION"
+			filter="raw"
-                       heading="h4"
+			hint="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT"
-                       class="dynamic_values" />
+			required="true"
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+		/>
-                <field type="note"
+		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
-                       name="note_uikit_snippet"
+		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
-                       label="COM_COMPONENTBUILDER_LAYOUT_NOTE_UIKIT_SNIPPET_LABEL"
+		<!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla) -->
-                       heading="h4"
+		<field type="note" name="note_uikit_snippet" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_UIKIT_SNIPPET_LABEL" heading="h4" class="snippet-code note_uikit_snippet" />
-                       class="snippet-code note_uikit_snippet" />
+		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
+		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
-                <field type="textarea"
+		<!-- Libraries Field. Type: Libraries. (custom) -->
-                       name="php_view"
+		<field
-                       label="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_LABEL"
+			type="libraries"
-                       rows="17"
+			name="libraries"
-                       cols="5"
+			label="COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_LAYOUT_LIBRARIES_DESCRIPTION"
-                       class="text_area span12"
+			class="list_class"
-                       filter="raw"
+			multiple="true"
-                       hint="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_HINT"
+			default="0"
-                       required="true" />
+			required="false"
-        </fieldset>
+			button="true"
+		/>
+		<!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_libraries_selection" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_NOTE_LIBRARIES_SELECTION_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_selection" />
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/library.js

@@ -23,18 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwacvzt_required = false;
+jform_vvvvwaevzs_required = false;
-jform_vvvvwaivzu_required = false;
+jform_vvvvwakvzt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwab = jQuery("#jform_how").val();
-	vvvvwab(how_vvvvwab);
-
-	var how_vvvvwac = jQuery("#jform_how").val();
-	vvvvwac(how_vvvvwac);
-
 	var how_vvvvwad = jQuery("#jform_how").val();
 	vvvvwad(how_vvvvwad);
 
@@ -50,103 +44,16 @@ jQuery(document).ready(function()
 	var how_vvvvwah = jQuery("#jform_how").val();
 	vvvvwah(how_vvvvwah);
 
-	var type_vvvvwai = jQuery("#jform_type input[type='radio']:checked").val();
+	var how_vvvvwai = jQuery("#jform_how").val();
-	vvvvwai(type_vvvvwai);
+	vvvvwai(how_vvvvwai);
+
+	var how_vvvvwaj = jQuery("#jform_how").val();
+	vvvvwaj(how_vvvvwaj);
+
+	var type_vvvvwak = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwak(type_vvvvwak);
 });
 
-// the vvvvwab function
-function vvvvwab(how_vvvvwab)
-{
-	if (isSet(how_vvvvwab) && how_vvvvwab.constructor !== Array)
-	{
-		var temp_vvvvwab = how_vvvvwab;
-		var how_vvvvwab = [];
-		how_vvvvwab.push(temp_vvvvwab);
-	}
-	else if (!isSet(how_vvvvwab))
-	{
-		var how_vvvvwab = [];
-	}
-	var how = how_vvvvwab.some(how_vvvvwab_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwab Some function
-function how_vvvvwab_SomeFunc(how_vvvvwab)
-{
-	// set the function logic
-	if (how_vvvvwab == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwac function
-function vvvvwac(how_vvvvwac)
-{
-	if (isSet(how_vvvvwac) && how_vvvvwac.constructor !== Array)
-	{
-		var temp_vvvvwac = how_vvvvwac;
-		var how_vvvvwac = [];
-		how_vvvvwac.push(temp_vvvvwac);
-	}
-	else if (!isSet(how_vvvvwac))
-	{
-		var how_vvvvwac = [];
-	}
-	var how = how_vvvvwac.some(how_vvvvwac_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvwacvzt_required)
-		{
-			updateFieldRequired('php_setdocument',0);
-			jQuery('#jform_php_setdocument').prop('required','required');
-			jQuery('#jform_php_setdocument').attr('aria-required',true);
-			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvwacvzt_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvwacvzt_required)
-		{
-			updateFieldRequired('php_setdocument',1);
-			jQuery('#jform_php_setdocument').removeAttr('required');
-			jQuery('#jform_php_setdocument').removeAttr('aria-required');
-			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvwacvzt_required = true;
-		}
-	}
-}
-
-// the vvvvwac Some function
-function how_vvvvwac_SomeFunc(how_vvvvwac)
-{
-	// set the function logic
-	if (how_vvvvwac == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwad function
 function vvvvwad(how_vvvvwad)
 {
@@ -166,11 +73,11 @@ function vvvvwad(how_vvvvwad)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }
 
@@ -178,7 +85,7 @@ function vvvvwad(how_vvvvwad)
 function how_vvvvwad_SomeFunc(how_vvvvwad)
 {
 	// set the function logic
-	if (how_vvvvwad == 2 || how_vvvvwad == 3)
+	if (how_vvvvwad == 2)
 	{
 		return true;
 	}
@@ -204,11 +111,28 @@ function vvvvwae(how_vvvvwae)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvwaevzs_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvwaevzs_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvwaevzs_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvwaevzs_required = true;
+		}
 	}
 }
 
@@ -216,7 +140,7 @@ function vvvvwae(how_vvvvwae)
 function how_vvvvwae_SomeFunc(how_vvvvwae)
 {
 	// set the function logic
-	if (how_vvvvwae == 1 || how_vvvvwae == 2 || how_vvvvwae == 3)
+	if (how_vvvvwae == 3)
 	{
 		return true;
 	}
@@ -242,15 +166,11 @@ function vvvvwaf(how_vvvvwaf)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -258,7 +178,7 @@ function vvvvwaf(how_vvvvwaf)
 function how_vvvvwaf_SomeFunc(how_vvvvwaf)
 {
 	// set the function logic
-	if (how_vvvvwaf == 0)
+	if (how_vvvvwaf == 2 || how_vvvvwaf == 3)
 	{
 		return true;
 	}
@@ -284,13 +204,11 @@ function vvvvwag(how_vvvvwag)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -298,7 +216,7 @@ function vvvvwag(how_vvvvwag)
 function how_vvvvwag_SomeFunc(how_vvvvwag)
 {
 	// set the function logic
-	if (how_vvvvwag == 1)
+	if (how_vvvvwag == 1 || how_vvvvwag == 2 || how_vvvvwag == 3)
 	{
 		return true;
 	}
@@ -321,6 +239,88 @@ function vvvvwah(how_vvvvwah)
 	var how = how_vvvvwah.some(how_vvvvwah_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwah Some function
+function how_vvvvwah_SomeFunc(how_vvvvwah)
+{
+	// set the function logic
+	if (how_vvvvwah == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwai function
+function vvvvwai(how_vvvvwai)
+{
+	if (isSet(how_vvvvwai) && how_vvvvwai.constructor !== Array)
+	{
+		var temp_vvvvwai = how_vvvvwai;
+		var how_vvvvwai = [];
+		how_vvvvwai.push(temp_vvvvwai);
+	}
+	else if (!isSet(how_vvvvwai))
+	{
+		var how_vvvvwai = [];
+	}
+	var how = how_vvvvwai.some(how_vvvvwai_SomeFunc);
+
+
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwai Some function
+function how_vvvvwai_SomeFunc(how_vvvvwai)
+{
+	// set the function logic
+	if (how_vvvvwai == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaj function
+function vvvvwaj(how_vvvvwaj)
+{
+	if (isSet(how_vvvvwaj) && how_vvvvwaj.constructor !== Array)
+	{
+		var temp_vvvvwaj = how_vvvvwaj;
+		var how_vvvvwaj = [];
+		how_vvvvwaj.push(temp_vvvvwaj);
+	}
+	else if (!isSet(how_vvvvwaj))
+	{
+		var how_vvvvwaj = [];
+	}
+	var how = how_vvvvwaj.some(how_vvvvwaj_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -336,44 +336,44 @@ function vvvvwah(how_vvvvwah)
 	}
 }
 
-// the vvvvwah Some function
+// the vvvvwaj Some function
-function how_vvvvwah_SomeFunc(how_vvvvwah)
+function how_vvvvwaj_SomeFunc(how_vvvvwaj)
 {
 	// set the function logic
-	if (how_vvvvwah == 4)
+	if (how_vvvvwaj == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwai function
+// the vvvvwak function
-function vvvvwai(type_vvvvwai)
+function vvvvwak(type_vvvvwak)
 {
 	// set the function logic
-	if (type_vvvvwai == 2)
+	if (type_vvvvwak == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwaivzu_required)
+		if (jform_vvvvwakvzt_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwaivzu_required = false;
+			jform_vvvvwakvzt_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwaivzu_required)
+		if (!jform_vvvvwakvzt_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwaivzu_required = true;
+			jform_vvvvwakvzt_required = true;
 		}
 	}
 }
@@ -414,6 +414,7 @@ function isSet(val)
 	return false;
 }
 
+
 jQuery(document).ready(function()
 {
 	// get the linked details

admin/models/forms/library.xml

@@ -4,331 +4,320 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_LIBRARY_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_LIBRARY_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_LIBRARY_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_LIBRARY_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_LIBRARY_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_LIBRARY_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_LIBRARY_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_LIBRARY_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_LIBRARY_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_LIBRARY_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_LIBRARY_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_LIBRARY_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_LIBRARY_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_LIBRARY_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_LIBRARY_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_LIBRARY_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_LIBRARY_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_LIBRARY_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_LIBRARY_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_LIBRARY_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_LIBRARY_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_LIBRARY_NAME_DESCRIPTION"
-                <!-- Description Field. Type: Text. (joomla)-->
+			class="text_area"
-                <field type="text"
+			readonly="false"
-                       name="description"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL"
+			required="true"
-                       size="80"
+			filter="STRING"
-                       maxlength="150"
+			message="COM_COMPONENTBUILDER_LIBRARY_NAME_MESSAGE"
-                       description="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_LIBRARY_NAME_HINT"
-                       class="text_area"
+		/>
-                       readonly="false"
+		<!-- Description Field. Type: Text. (joomla) -->
-                       disabled="false"
+		<field
-                       required="false"
+			type="text"
-                       filter="STRING"
+			name="description"
-                       message="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_MESSAGE"
+			label="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_LABEL"
-                       hint="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_HINT" />
+			size="80"
-                <!-- How Field. Type: Filebehaviour. (custom)-->
+			maxlength="150"
-                <field type="filebehaviour"
+			description="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_DESCRIPTION"
-                       name="how"
+			class="text_area"
-                       label="COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL"
+			readonly="false"
-                       description="COM_COMPONENTBUILDER_LIBRARY_HOW_DESCRIPTION"
+			disabled="false"
-                       class="list_class"
+			required="false"
-                       multiple="false"
+			filter="STRING"
-                       default="1"
+			message="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_MESSAGE"
-                       required="true"
+			hint="COM_COMPONENTBUILDER_LIBRARY_DESCRIPTION_HINT"
-                       button="false" />
+		/>
-                <!-- Type Field. Type: Radio. (joomla)-->
+		<!-- How Field. Type: Filebehaviour. (custom) -->
-                <field type="radio"
+		<field
-                       name="type"
+			type="filebehaviour"
-                       label="COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL"
+			name="how"
-                       description="COM_COMPONENTBUILDER_LIBRARY_TYPE_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL"
-                       class="btn-group btn-group-yesno"
+			description="COM_COMPONENTBUILDER_LIBRARY_HOW_DESCRIPTION"
-                       default="1"
+			class="list_class"
-                       required="true">
+			multiple="false"
-                        <!-- Option Set.-->
+			default="1"
-                        <option value="1">COM_COMPONENTBUILDER_LIBRARY_MAIN</option>
+			required="true"
-                        <option value="2">COM_COMPONENTBUILDER_LIBRARY_BUNDLE</option>
+			button="false"
-                </field>
+		/>
-                <!-- Note_yes_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
+		<!-- Type Field. Type: Radio. (joomla) -->
-                <field type="note"
+		<field
-                       name="note_yes_behaviour_one"
+			type="radio"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_LABEL"
+			name="type"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_LIBRARY_TYPE_LABEL"
-                       heading="h4"
+			description="COM_COMPONENTBUILDER_LIBRARY_TYPE_DESCRIPTION"
-                       class="alert alert-success note_yes_behaviour_one" />
+			class="btn-group btn-group-yesno"
-                <!-- Note_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla)-->
+			default="1"
-                <field type="note"
+			required="true">
-                       name="note_display_library_files_folders_urls"
+			<!-- Option Set. -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION"
+			<option value="1">
-                       class="note_display_library_files_folders_urls" />
+				COM_COMPONENTBUILDER_LIBRARY_MAIN</option>
-                <!-- Note_build_in_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
+			<option value="2">
-                <field type="note"
+				COM_COMPONENTBUILDER_LIBRARY_BUNDLE</option>
-                       name="note_build_in_behaviour_one"
+		</field>
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL"
+		<!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION"
+		<field type="note" name="note_build_in_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_two" />
-                       heading="h4"
+		<!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
-                       class="alert alert-success note_build_in_behaviour_one" />
+		<field type="note" name="note_no_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_two" />
-                <!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
+		<!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla) -->
-                <field type="note"
+		<field type="note" name="note_yes_behaviour_two" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_two" />
-                       name="note_no_behaviour_three"
+		<!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL"
+		<field type="note" name="note_build_in_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_three" />
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION"
+		<!-- Note_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla) -->
-                       heading="h4"
+		<field type="note" name="note_display_library_files_folders_urls" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION" class="note_display_library_files_folders_urls" />
-                       class="alert alert-error note_no_behaviour_three" />
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
-                <!-- Addconditions Field. Type: Subform. (joomla)-->
+		<field
-                <field type="subform"
+			type="hidden"
-                       name="addconditions"
+			name="not_required"
-                       label="COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_LABEL"
+			default="[]"
-                       layout="joomla.form.field.subform.repeatable-table"
+		/>
-                       multiple="true"
+		<!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla) -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_DESCRIPTION"
+		<field type="note" name="note_no_behaviour_three" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_three" />
-                       icon="list"
+		<!-- Note_display_library_config Field. Type: Note. A None Database Field. (joomla) -->
-                       maximum="500">
+		<field type="note" name="note_display_library_config" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION" class="note_display_library_config" />
-                        <form hidden="true"
+		<!-- Libraries Field. Type: Librariesx. (custom) -->
-                              name="list_addconditions_modal"
+		<field
-                              repeat="true">
+			type="librariesx"
-                                <!-- File Field. Type: Libraryfiles. (custom)-->
+			name="libraries"
-                                <field type="libraryfiles"
+			label="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL"
-                                       name="file"
+			description="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILE_LABEL"
+			class="list_class"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILE_DESCRIPTION"
+			multiple="true"
-                                       class="list_class"
+			default="0"
-                                       multiple="true"
+			required="false"
-                                       default="0"
+			button="true"
-                                       required="false"
+		/>
-                                       button="false" />
+		<!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
-                                <!-- Target_behavior Field. Type: List. (joomla)-->
+		<field type="note" name="note_no_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-error note_no_behaviour_one" />
-                                <field type="list"
+		<!-- Php_setdocument Field. Type: Textarea. (joomla) -->
-                                       name="target_behavior"
+		<field
-                                       label="COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_LABEL"
+			type="textarea"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_DESCRIPTION"
+			name="php_setdocument"
-                                       class="list_class"
+			label="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL"
-                                       multiple="false"
+			rows="30"
-                                       filter="INT"
+			cols="15"
-                                       required="false"
+			description="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_DESCRIPTION"
-                                       default="1">
+			class="text_area span12"
-                                        <!-- Option Set.-->
+			filter="raw"
-                                        <option value="1">COM_COMPONENTBUILDER_LIBRARY_INCLUDE</option>
+			hint="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_HINT"
-                                        <option value="2">COM_COMPONENTBUILDER_LIBRARY_EXCLUDE</option>
+			required="true"
-                                </field>
+		/>
-                                <!-- Target_relation Field. Type: List. (joomla)-->
+		<!-- Addconditions Field. Type: Subform. (joomla) -->
-                                <field type="list"
+		<field
-                                       name="target_relation"
+			type="subform"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_LABEL"
+			name="addconditions"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_LABEL"
-                                       class="list_class"
+			layout="joomla.form.field.subform.repeatable-table"
-                                       multiple="false"
+			multiple="true"
-                                       filter="INT"
+			description="COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_DESCRIPTION"
-                                       required="false"
+			icon="list"
-                                       default="0">
+			maximum="500">
-                                        <!-- Option Set.-->
+			<form hidden="true" name="list_addconditions_modal" repeat="true">
-                                        <option value="0">COM_COMPONENTBUILDER_LIBRARY_ISOLATE</option>
+				<!-- File Field. Type: Libraryfiles. (custom) -->
-                                        <option value="1">COM_COMPONENTBUILDER_LIBRARY_CHAIN</option>
+				<field
-                                </field>
+					type="libraryfiles"
-                                <!-- Option_field Field. Type: Libconfigfield. (custom)-->
+					name="file"
-                                <field type="libconfigfield"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILE_LABEL"
-                                       name="option_field"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILE_DESCRIPTION"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_OPTION_FIELD_LABEL"
+					class="list_class"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_OPTION_FIELD_DESCRIPTION"
+					multiple="true"
-                                       multiple="false"
+					default="0"
-                                       required="false"
+					required="false"
-                                       button="false" />
+					button="false"
-                                <!-- Option_behaviour Field. Type: List. (joomla)-->
+				/>
-                                <field type="list"
+				<!-- Target_behavior Field. Type: List. (joomla) -->
-                                       name="option_behaviour"
+				<field
-                                       label="COM_COMPONENTBUILDER_LIBRARY_OPTION_BEHAVIOUR_LABEL"
+					type="list"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_OPTION_BEHAVIOUR_DESCRIPTION"
+					name="target_behavior"
-                                       class="list_class"
+					label="COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_LABEL"
-                                       multiple="false"
+					description="COM_COMPONENTBUILDER_LIBRARY_TARGET_BEHAVIOR_DESCRIPTION"
-                                       filter="INT"
+					class="list_class"
-                                       required="false"
+					multiple="false"
-                                       default="1">
+					filter="INT"
-                                        <!-- Option Set.-->
+					required="false"
-                                        <option value="1">COM_COMPONENTBUILDER_LIBRARY_IS_ONLY_FOUR_LISTRADIOCHECKBOXES</option>
+					default="1">
-                                        <option value="2">COM_COMPONENTBUILDER_LIBRARY_IS_NOT_ONLY_FOUR_LISTRADIOCHECKBOXES</option>
+					<!-- Option Set. -->
-                                        <option value="3">COM_COMPONENTBUILDER_LIBRARY_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST</option>
+					<option value="1">
-                                        <option value="4">COM_COMPONENTBUILDER_LIBRARY_ACTIVE_ONLY_FOUR_TEXT_FIELD</option>
+						COM_COMPONENTBUILDER_LIBRARY_INCLUDE</option>
-                                        <option value="5">COM_COMPONENTBUILDER_LIBRARY_UNACTIVE_ONLY_FOUR_TEXT_FIELD</option>
+					<option value="2">
-                                        <option value="6">COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ALL_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+						COM_COMPONENTBUILDER_LIBRARY_EXCLUDE</option>
-                                        <option value="7">COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+				</field>
-                                        <option value="8">COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ALL_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+				<!-- Target_relation Field. Type: List. (joomla) -->
-                                        <option value="9">COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
+				<field
-                                        <option value="10">COM_COMPONENTBUILDER_LIBRARY_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+					type="list"
-                                        <option value="11">COM_COMPONENTBUILDER_LIBRARY_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+					name="target_relation"
-                                        <option value="12">COM_COMPONENTBUILDER_LIBRARY_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
+					label="COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_LABEL"
-                                </field>
+					description="COM_COMPONENTBUILDER_LIBRARY_TARGET_RELATION_DESCRIPTION"
-                                <!-- Field_options Field. Type: Textarea. (joomla)-->
+					class="list_class"
-                                <field type="textarea"
+					multiple="false"
-                                       name="field_options"
+					filter="INT"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_LABEL"
+					required="false"
-                                       rows="10"
+					default="0">
-                                       cols="5"
+					<!-- Option Set. -->
-                                       class="text_area"
+					<option value="0">
-                                       filter="STRING"
+						COM_COMPONENTBUILDER_LIBRARY_ISOLATE</option>
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_HINT"
+					<option value="1">
-                                       required="false" />
+						COM_COMPONENTBUILDER_LIBRARY_CHAIN</option>
-                        </form>
+				</field>
-                </field>
+				<!-- Option_field Field. Type: Libconfigfield. (custom) -->
-                <!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+				<field
-                <field type="note"
+					type="libconfigfield"
-                       name="note_yes_behaviour_two"
+					name="option_field"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL"
+					label="COM_COMPONENTBUILDER_LIBRARY_OPTION_FIELD_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION"
+					description="COM_COMPONENTBUILDER_LIBRARY_OPTION_FIELD_DESCRIPTION"
-                       heading="h4"
+					multiple="false"
-                       class="alert alert-success note_yes_behaviour_two" />
+					required="false"
-                <!-- Php_setdocument Field. Type: Textarea. (joomla)-->
+					button="false"
-                <field type="textarea"
+				/>
-                       name="php_setdocument"
+				<!-- Option_behaviour Field. Type: List. (joomla) -->
-                       label="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_LABEL"
+				<field
-                       rows="30"
+					type="list"
-                       cols="15"
+					name="option_behaviour"
-                       description="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_DESCRIPTION"
+					label="COM_COMPONENTBUILDER_LIBRARY_OPTION_BEHAVIOUR_LABEL"
-                       class="text_area span12"
+					description="COM_COMPONENTBUILDER_LIBRARY_OPTION_BEHAVIOUR_DESCRIPTION"
-                       filter="raw"
+					class="list_class"
-                       hint="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_HINT"
+					multiple="false"
-                       required="true" />
+					filter="INT"
-                <!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
+					required="false"
-                <field type="note"
+					default="1">
-                       name="note_no_behaviour_one"
+					<!-- Option Set. -->
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL"
+					<option value="1">
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION"
+						COM_COMPONENTBUILDER_LIBRARY_IS_ONLY_FOUR_LISTRADIOCHECKBOXES</option>
-                       heading="h4"
+					<option value="2">
-                       class="alert alert-error note_no_behaviour_one" />
+						COM_COMPONENTBUILDER_LIBRARY_IS_NOT_ONLY_FOUR_LISTRADIOCHECKBOXES</option>
-                <!-- Libraries Field. Type: Librariesx. (custom)-->
+					<option value="3">
-                <field type="librariesx"
+						COM_COMPONENTBUILDER_LIBRARY_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST</option>
-                       name="libraries"
+					<option value="4">
-                       label="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL"
+						COM_COMPONENTBUILDER_LIBRARY_ACTIVE_ONLY_FOUR_TEXT_FIELD</option>
-                       description="COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION"
+					<option value="5">
-                       class="list_class"
+						COM_COMPONENTBUILDER_LIBRARY_UNACTIVE_ONLY_FOUR_TEXT_FIELD</option>
-                       multiple="true"
+					<option value="6">
-                       default="0"
+						COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ALL_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
-                       required="false"
+					<option value="7">
-                       button="true" />
+						COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
-                <!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
+					<option value="8">
-                <field type="note"
+						COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ALL_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
-                       name="note_build_in_behaviour_three"
+					<option value="9">
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL"
+						COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD</option>
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION"
+					<option value="10">
-                       heading="h4"
+						COM_COMPONENTBUILDER_LIBRARY_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
-                       class="alert alert-success note_build_in_behaviour_three" />
+					<option value="11">
-                <!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla)-->
+						COM_COMPONENTBUILDER_LIBRARY_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
-                <field type="note"
+					<option value="12">
-                       name="note_library_instruction"
+						COM_COMPONENTBUILDER_LIBRARY_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD</option>
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL"
+				</field>
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION"
+				<!-- Field_options Field. Type: Textarea. (joomla) -->
-                       heading="h4"
+				<field
-                       class="alert alert-info note_library_instruction" />
+					type="textarea"
-                <!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+					name="field_options"
-                <field type="note"
+					label="COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_LABEL"
-                       name="note_no_behaviour_two"
+					rows="10"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL"
+					cols="5"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION"
+					class="text_area"
-                       heading="h4"
+					filter="STRING"
-                       class="alert alert-error note_no_behaviour_two" />
+					hint="COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_HINT"
-                <!-- Note_display_library_config Field. Type: Note. A None Database Field. (joomla)-->
+					required="false"
-                <field type="note"
+				/>
-                       name="note_display_library_config"
+			</form>
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION"
+		</field>
-                       class="note_display_library_config" />
+		<!-- Note_build_in_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
-                <!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+		<field type="note" name="note_build_in_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-success note_build_in_behaviour_one" />
-                <field type="note"
+		<!-- Note_yes_behaviour_one Field. Type: Note. A None Database Field. (joomla) -->
-                       name="note_build_in_behaviour_two"
+		<field type="note" name="note_yes_behaviour_one" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION" heading="h4" class="alert alert-success note_yes_behaviour_one" />
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL"
+		<!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla) -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION"
+		<field type="note" name="note_linked_to_notice" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_DESCRIPTION" heading="h4" class="note_linked_to_notice" />
-                       heading="h4"
+		<!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla) -->
-                       class="alert alert-success note_build_in_behaviour_two" />
+		<field type="note" name="note_library_instruction" label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION" heading="h4" class="alert alert-info note_library_instruction" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+	</fieldset>
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_linked_to_notice"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
-                       heading="h4"
-                       class="note_linked_to_notice" />
-        </fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/library_config.xml

@@ -4,142 +4,155 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_VERSION_LABEL"
-                <!-- Library Field. Type: Libraryreadonly. (custom)-->
+			description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_VERSION_DESC"
-                <field type="libraryreadonly"
+			size="6"
-                       name="library"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_LIBRARY_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_LIBRARY_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Library Field. Type: Libraryreadonly. (custom) -->
-                       default="0"
+		<field
-                       required="true"
+			type="libraryreadonly"
-                       readonly="true" />
+			name="library"
-                <!-- Addconfig Field. Type: Subform. (joomla)-->
+			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_LIBRARY_LABEL"
-                <field type="subform"
+			description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_LIBRARY_DESCRIPTION"
-                       name="addconfig"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_LABEL"
+			multiple="false"
-                       layout="joomla.form.field.subform.repeatable-table"
+			default="0"
-                       multiple="true"
+			required="true"
-                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_DESCRIPTION"
+			readonly="true"
-                       icon="list"
+		/>
-                       maximum="500">
+		<!-- Addconfig Field. Type: Subform. (joomla) -->
-                        <form hidden="true"
+		<field
-                              name="list_addconfig_modal"
+			type="subform"
-                              repeat="true">
+			name="addconfig"
-                                <!-- Field Field. Type: Fields. (custom)-->
+			label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_LABEL"
-                                <field type="fields"
+			layout="joomla.form.field.subform.repeatable-table"
-                                       name="field"
+			multiple="true"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_LABEL"
+			description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_DESCRIPTION"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION"
+			icon="list"
-                                       class="list_class"
+			maximum="500">
-                                       multiple="false"
+			<form hidden="true" name="list_addconfig_modal" repeat="true">
-                                       required="false"
+				<!-- Field Field. Type: Fields. (custom) -->
-                                       button="false" />
+				<field
-                                <!-- Custom_value Field. Type: Textarea. (joomla)-->
+					type="fields"
-                                <field type="textarea"
+					name="field"
-                                       name="custom_value"
+					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_LABEL"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_LABEL"
+					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION"
-                                       rows="2"
+					class="list_class"
-                                       cols="4"
+					multiple="false"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_DESCRIPTION"
+					required="false"
-                                       class="text_area"
+					button="false"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_HINT"
+				/>
-                                       required="false"
+				<!-- Custom_value Field. Type: Textarea. (joomla) -->
-                                       readonly="false"
+				<field
-                                       disabled="false" />
+					type="textarea"
-                                <!-- Tabname Field. Type: Text. (joomla)-->
+					name="custom_value"
-                                <field type="text"
+					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_LABEL"
-                                       name="tabname"
+					rows="2"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_LABEL"
+					cols="4"
-                                       size="40"
+					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_DESCRIPTION"
-                                       maxlength="150"
+					class="text_area"
-                                       default="Global"
+					hint="COM_COMPONENTBUILDER_LIBRARY_CONFIG_CUSTOM_VALUE_HINT"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_DESCRIPTION"
+					required="false"
-                                       class="text_area"
+					readonly="false"
-                                       readonly="false"
+					disabled="false"
-                                       disabled="false"
+				/>
-                                       required="false"
+				<!-- Tabname Field. Type: Text. (joomla) -->
-                                       filter="STRING"
+				<field
-                                       message="COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_MESSAGE"
+					type="text"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_HINT" />
+					name="tabname"
-                        </form>
+					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_LABEL"
-                </field>
+					size="40"
-        </fieldset>
+					maxlength="150"
+					default="Global"
+					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_DESCRIPTION"
+					class="text_area"
+					readonly="false"
+					disabled="false"
+					required="false"
+					filter="STRING"
+					message="COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_MESSAGE"
+					hint="COM_COMPONENTBUILDER_LIBRARY_CONFIG_TABNAME_HINT"
+				/>
+			</form>
+		</field>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/library_files_folders_urls.xml

@@ -4,355 +4,365 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_LABEL"
-                <!-- Library Field. Type: Libraryreadonly. (custom)-->
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_DESC"
-                <field type="libraryreadonly"
+			size="6"
-                       name="library"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LIBRARY_LABEL"
+			filter="unset"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LIBRARY_DESCRIPTION"
+		/>
-                       class="list_class"
+		<!-- Dynamic Fields. -->
-                       multiple="false"
+		<!-- Library Field. Type: Libraryreadonly. (custom) -->
-                       default="0"
+		<field
-                       required="true"
+			type="libraryreadonly"
-                       readonly="true" />
+			name="library"
-                <!-- Note_add_folders_fullpath Field. Type: Note. A None Database Field. (joomla)-->
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LIBRARY_LABEL"
-                <field type="note"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LIBRARY_DESCRIPTION"
-                       name="note_add_folders_fullpath"
+			class="list_class"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_LABEL"
+			multiple="false"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION"
+			default="0"
-                       heading="h4"
+			required="true"
-                       class="alert alert-info note_add_folders_fullpath" />
+			readonly="true"
-                <!-- Addurls Field. Type: Subform. (joomla)-->
+		/>
-                <field type="subform"
+		<!-- Note_constant_paths Field. Type: Note. A None Database Field. (joomla) -->
-                       name="addurls"
+		<field type="note" name="note_constant_paths" label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_DESCRIPTION" heading="h4" class="alert alert-info note_constant_paths" />
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_LABEL"
+		<!-- Addfoldersfullpath Field. Type: Subform. (joomla) -->
-                       layout="joomla.form.field.subform.repeatable-table"
+		<field
-                       multiple="true"
+			type="subform"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_DESCRIPTION"
+			name="addfoldersfullpath"
-                       icon="list"
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERSFULLPATH_LABEL"
-                       maximum="500">
+			layout="joomla.form.field.subform.repeatable-table"
-                        <form hidden="true"
+			multiple="true"
-                              name="list_addurls_modal"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERSFULLPATH_DESCRIPTION"
-                              repeat="true">
+			icon="list"
-                                <!-- Url Field. Type: Url. (joomla)-->
+			maximum="500">
-                                <field type="url"
+			<form hidden="true" name="list_addfoldersfullpath_modal" repeat="true">
-                                       name="url"
+				<!-- Folderpath Field. Type: Text. (joomla) -->
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_LABEL"
+				<field
-                                       size="150"
+					type="text"
-                                       maxlength="250"
+					name="folderpath"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_DESCRIPTION"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDERPATH_LABEL"
-                                       class="text_area"
+					size="70"
-                                       required="false"
+					maxlength="300"
-                                       filter="url"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDERPATH_DESCRIPTION"
-                                       validated="url"
+					class="text_area"
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_MESSAGE"
+					required="false"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_HINT" />
+					filter="PATH"
-                                <!-- Type Field. Type: List. (joomla)-->
+					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDERPATH_MESSAGE"
-                                <field type="list"
+					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDERPATH_HINT"
-                                       name="type"
+				/>
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_TYPE_LABEL"
+				<!-- Path Field. Type: Text. (joomla) -->
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_TYPE_DESCRIPTION"
+				<field
-                                       class="list_class"
+					type="text"
-                                       multiple="false"
+					name="path"
-                                       filter="INT"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
-                                       required="false"
+					size="40"
-                                       default="1">
+					maxlength="150"
-                                        <!-- Option Set.-->
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
-                                        <option value="1">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_DEFAULT_LINK</option>
+					class="text_area"
-                                        <option value="2">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LOCAL_GET</option>
+					readonly="false"
-                                        <option value="3">COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LINK_LOCAL_DYNAMIC</option>
+					disabled="false"
-                                </field>
+					required="false"
-                        </form>
+					filter="PATH"
-                </field>
+					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
-                <!-- Note_add_files_fullpath Field. Type: Note. A None Database Field. (joomla)-->
+					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT"
-                <field type="note"
+				/>
-                       name="note_add_files_fullpath"
+				<!-- Rename Field. Type: Checkbox. (joomla) -->
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_LABEL"
+				<field
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION"
+					type="checkbox"
-                       heading="h4"
+					name="rename"
-                       class="alert alert-info note_add_files_fullpath" />
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
-                <!-- Note_add_files Field. Type: Note. A None Database Field. (joomla)-->
+					value="1"
-                <field type="note"
+					required="false"
-                       name="note_add_files"
+					class="inputbox"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_LABEL"
+				/>
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_DESCRIPTION"
+			</form>
-                       heading="h4"
+		</field>
-                       class="alert alert-info note_add_files" />
+		<!-- Note_add_folders_fullpath Field. Type: Note. A None Database Field. (joomla) -->
-                <!-- Note_add_urls Field. Type: Note. A None Database Field. (joomla)-->
+		<field type="note" name="note_add_folders_fullpath" label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_FULLPATH_DESCRIPTION" heading="h4" class="alert alert-info note_add_folders_fullpath" />
-                <field type="note"
+		<!-- Addfilesfullpath Field. Type: Subform. (joomla) -->
-                       name="note_add_urls"
+		<field
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_LABEL"
+			type="subform"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_DESCRIPTION"
+			name="addfilesfullpath"
-                       heading="h4"
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH_LABEL"
-                       class="alert alert-info note_add_urls" />
+			layout="joomla.form.field.subform.repeatable-table"
-                <!-- Addfiles Field. Type: Subform. (joomla)-->
+			multiple="true"
-                <field type="subform"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH_DESCRIPTION"
-                       name="addfiles"
+			icon="list"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILES_LABEL"
+			maximum="500">
-                       layout="joomla.form.field.subform.repeatable-table"
+			<form hidden="true" name="list_addfilesfullpath_modal" repeat="true">
-                       multiple="true"
+				<!-- Filepath Field. Type: Text. (joomla) -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILES_DESCRIPTION"
+				<field
-                       icon="list"
+					type="text"
-                       maximum="500">
+					name="filepath"
-                        <form hidden="true"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILEPATH_LABEL"
-                              name="list_addfiles_modal"
+					size="70"
-                              repeat="true">
+					maxlength="300"
-                                <!-- File Field. Type: Customfilelist. (custom)-->
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILEPATH_DESCRIPTION"
-                                <field type="customfilelist"
+					class="text_area"
-                                       name="file"
+					required="false"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILE_LABEL"
+					filter="PATH"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILE_DESCRIPTION"
+					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILEPATH_MESSAGE"
-                                       class="list_class"
+					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILEPATH_HINT"
-                                       multiple="false"
+				/>
-                                       default="0"
+				<!-- Path Field. Type: Text. (joomla) -->
-                                       required="false"
+				<field
-                                       button="false" />
+					type="text"
-                                <!-- Path Field. Type: Text. (joomla)-->
+					name="path"
-                                <field type="text"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
-                                       name="path"
+					size="40"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
+					maxlength="150"
-                                       size="40"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
-                                       maxlength="150"
+					class="text_area"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
+					readonly="false"
-                                       class="text_area"
+					disabled="false"
-                                       readonly="false"
+					required="false"
-                                       disabled="false"
+					filter="PATH"
-                                       required="false"
+					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
-                                       filter="PATH"
+					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT"
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
+				/>
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT" />
+				<!-- Notnew Field. Type: Checkbox. (joomla) -->
-                                <!-- Notnew Field. Type: Checkbox. (joomla)-->
+				<field
-                                <field type="checkbox"
+					type="checkbox"
-                                       name="notnew"
+					name="notnew"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
-                                       value="1"
+					value="1"
-                                       required="false"
+					required="false"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
-                                       class="inputbox" />
+					class="inputbox"
-                        </form>
+				/>
-                </field>
+			</form>
-                <!-- Note_add_folders Field. Type: Note. A None Database Field. (joomla)-->
+		</field>
-                <field type="note"
+		<!-- Note_add_files_fullpath Field. Type: Note. A None Database Field. (joomla) -->
-                       name="note_add_folders"
+		<field type="note" name="note_add_files_fullpath" label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_FULLPATH_DESCRIPTION" heading="h4" class="alert alert-info note_add_files_fullpath" />
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_LABEL"
+		<!-- Addfolders Field. Type: Subform. (joomla) -->
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_DESCRIPTION"
+		<field
-                       heading="h4"
+			type="subform"
-                       class="alert alert-info note_add_folders" />
+			name="addfolders"
-                <!-- Addfilesfullpath Field. Type: Subform. (joomla)-->
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_LABEL"
-                <field type="subform"
+			layout="joomla.form.field.subform.repeatable-table"
-                       name="addfilesfullpath"
+			multiple="true"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH_LABEL"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_DESCRIPTION"
-                       layout="joomla.form.field.subform.repeatable-table"
+			icon="list"
-                       multiple="true"
+			maximum="500">
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH_DESCRIPTION"
+			<form hidden="true" name="list_addfolders_modal" repeat="true">
-                       icon="list"
+				<!-- Folder Field. Type: Customfolderlist. (custom) -->
-                       maximum="500">
+				<field
-                        <form hidden="true"
+					type="customfolderlist"
-                              name="list_addfilesfullpath_modal"
+					name="folder"
-                              repeat="true">
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDER_LABEL"
-                                <!-- Filepath Field. Type: Text. (joomla)-->
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDER_DESCRIPTION"
-                                <field type="text"
+					class="list_class"
-                                       name="filepath"
+					multiple="false"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILEPATH_LABEL"
+					default="0"
-                                       size="70"
+					required="false"
-                                       maxlength="300"
+					button="false"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILEPATH_DESCRIPTION"
+				/>
-                                       class="text_area"
+				<!-- Path Field. Type: Text. (joomla) -->
-                                       required="false"
+				<field
-                                       filter="PATH"
+					type="text"
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILEPATH_MESSAGE"
+					name="path"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILEPATH_HINT" />
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
-                                <!-- Path Field. Type: Text. (joomla)-->
+					size="40"
-                                <field type="text"
+					maxlength="150"
-                                       name="path"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
+					class="text_area"
-                                       size="40"
+					readonly="false"
-                                       maxlength="150"
+					disabled="false"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
+					required="false"
-                                       class="text_area"
+					filter="PATH"
-                                       readonly="false"
+					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
-                                       disabled="false"
+					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT"
-                                       required="false"
+				/>
-                                       filter="PATH"
+				<!-- Rename Field. Type: Checkbox. (joomla) -->
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
+				<field
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT" />
+					type="checkbox"
-                                <!-- Notnew Field. Type: Checkbox. (joomla)-->
+					name="rename"
-                                <field type="checkbox"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
-                                       name="notnew"
+					value="1"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
+					required="false"
-                                       value="1"
+					class="inputbox"
-                                       required="false"
+				/>
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
+			</form>
-                                       class="inputbox" />
+		</field>
-                        </form>
+		<!-- Note_add_folders Field. Type: Note. A None Database Field. (joomla) -->
-                </field>
+		<field type="note" name="note_add_folders" label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FOLDERS_DESCRIPTION" heading="h4" class="alert alert-info note_add_folders" />
-                <!-- Addfolders Field. Type: Subform. (joomla)-->
+		<!-- Addfiles Field. Type: Subform. (joomla) -->
-                <field type="subform"
+		<field
-                       name="addfolders"
+			type="subform"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_LABEL"
+			name="addfiles"
-                       layout="joomla.form.field.subform.repeatable-table"
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILES_LABEL"
-                       multiple="true"
+			layout="joomla.form.field.subform.repeatable-table"
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_DESCRIPTION"
+			multiple="true"
-                       icon="list"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILES_DESCRIPTION"
-                       maximum="500">
+			icon="list"
-                        <form hidden="true"
+			maximum="500">
-                              name="list_addfolders_modal"
+			<form hidden="true" name="list_addfiles_modal" repeat="true">
-                              repeat="true">
+				<!-- File Field. Type: Customfilelist. (custom) -->
-                                <!-- Folder Field. Type: Customfolderlist. (custom)-->
+				<field
-                                <field type="customfolderlist"
+					type="customfilelist"
-                                       name="folder"
+					name="file"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDER_LABEL"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILE_LABEL"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDER_DESCRIPTION"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FILE_DESCRIPTION"
-                                       class="list_class"
+					class="list_class"
-                                       multiple="false"
+					multiple="false"
-                                       default="0"
+					default="0"
-                                       required="false"
+					required="false"
-                                       button="false" />
+					button="false"
-                                <!-- Path Field. Type: Text. (joomla)-->
+				/>
-                                <field type="text"
+				<!-- Path Field. Type: Text. (joomla) -->
-                                       name="path"
+				<field
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
+					type="text"
-                                       size="40"
+					name="path"
-                                       maxlength="150"
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
+					size="40"
-                                       class="text_area"
+					maxlength="150"
-                                       readonly="false"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
-                                       disabled="false"
+					class="text_area"
-                                       required="false"
+					readonly="false"
-                                       filter="PATH"
+					disabled="false"
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
+					required="false"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT" />
+					filter="PATH"
-                                <!-- Rename Field. Type: Checkbox. (joomla)-->
+					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
-                                <field type="checkbox"
+					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT"
-                                       name="rename"
+				/>
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
+				<!-- Notnew Field. Type: Checkbox. (joomla) -->
-                                       value="1"
+				<field
-                                       required="false"
+					type="checkbox"
-                                       class="inputbox" />
+					name="notnew"
-                        </form>
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL"
-                </field>
+					value="1"
-                <!-- Addfoldersfullpath Field. Type: Subform. (joomla)-->
+					required="false"
-                <field type="subform"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION"
-                       name="addfoldersfullpath"
+					class="inputbox"
-                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERSFULLPATH_LABEL"
+				/>
-                       layout="joomla.form.field.subform.repeatable-table"
+			</form>
-                       multiple="true"
+		</field>
-                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERSFULLPATH_DESCRIPTION"
+		<!-- Note_add_files Field. Type: Note. A None Database Field. (joomla) -->
-                       icon="list"
+		<field type="note" name="note_add_files" label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_FILES_DESCRIPTION" heading="h4" class="alert alert-info note_add_files" />
-                       maximum="500">
+		<!-- Addurls Field. Type: Subform. (joomla) -->
-                        <form hidden="true"
+		<field
-                              name="list_addfoldersfullpath_modal"
+			type="subform"
-                              repeat="true">
+			name="addurls"
-                                <!-- Folderpath Field. Type: Text. (joomla)-->
+			label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_LABEL"
-                                <field type="text"
+			layout="joomla.form.field.subform.repeatable-table"
-                                       name="folderpath"
+			multiple="true"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDERPATH_LABEL"
+			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_DESCRIPTION"
-                                       size="70"
+			icon="list"
-                                       maxlength="300"
+			maximum="500">
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDERPATH_DESCRIPTION"
+			<form hidden="true" name="list_addurls_modal" repeat="true">
-                                       class="text_area"
+				<!-- Url Field. Type: Url. (joomla) -->
-                                       required="false"
+				<field
-                                       filter="PATH"
+					type="url"
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDERPATH_MESSAGE"
+					name="url"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_FOLDERPATH_HINT" />
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_LABEL"
-                                <!-- Path Field. Type: Text. (joomla)-->
+					size="150"
-                                <field type="text"
+					maxlength="250"
-                                       name="path"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_DESCRIPTION"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL"
+					class="text_area"
-                                       size="40"
+					required="false"
-                                       maxlength="150"
+					filter="url"
-                                       description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION"
+					validated="url"
-                                       class="text_area"
+					message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_MESSAGE"
-                                       readonly="false"
+					hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_URL_HINT"
-                                       disabled="false"
+				/>
-                                       required="false"
+				<!-- Type Field. Type: List. (joomla) -->
-                                       filter="PATH"
+				<field
-                                       message="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE"
+					type="list"
-                                       hint="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT" />
+					name="type"
-                                <!-- Rename Field. Type: Checkbox. (joomla)-->
+					label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_TYPE_LABEL"
-                                <field type="checkbox"
+					description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_TYPE_DESCRIPTION"
-                                       name="rename"
+					class="list_class"
-                                       label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_RENAME_LABEL"
+					multiple="false"
-                                       value="1"
+					filter="INT"
-                                       required="false"
+					required="false"
-                                       class="inputbox" />
+					default="1">
-                        </form>
+					<!-- Option Set. -->
-                </field>
+					<option value="1">
-        </fieldset>
+						COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_DEFAULT_LINK</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LOCAL_GET</option>
+					<option value="3">
+						COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_LINK_LOCAL_DYNAMIC</option>
+				</field>
+			</form>
+		</field>
+		<!-- Note_add_urls Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_add_urls" label="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_LABEL" description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_ADD_URLS_DESCRIPTION" heading="h4" class="alert alert-info note_add_urls" />
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/server.js

@@ -23,27 +23,24 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwatwae_required = false;
+jform_vvvvwavwad_required = false;
-jform_vvvvwatwaf_required = false;
+jform_vvvvwavwae_required = false;
-jform_vvvvwatwag_required = false;
+jform_vvvvwavwaf_required = false;
-jform_vvvvwatwah_required = false;
+jform_vvvvwavwag_required = false;
-jform_vvvvwatwai_required = false;
+jform_vvvvwavwah_required = false;
-jform_vvvvwauwaj_required = false;
+jform_vvvvwawwai_required = false;
-jform_vvvvwavwak_required = false;
+jform_vvvvwaxwaj_required = false;
-jform_vvvvwaxwal_required = false;
+jform_vvvvwazwak_required = false;
+jform_vvvvwbbwal_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwat = jQuery("#jform_protocol").val();
-	vvvvwat(protocol_vvvvwat);
-
-	var protocol_vvvvwau = jQuery("#jform_protocol").val();
-	vvvvwau(protocol_vvvvwau);
-
 	var protocol_vvvvwav = jQuery("#jform_protocol").val();
-	var authentication_vvvvwav = jQuery("#jform_authentication").val();
+	vvvvwav(protocol_vvvvwav);
-	vvvvwav(protocol_vvvvwav,authentication_vvvvwav);
+
+	var protocol_vvvvwaw = jQuery("#jform_protocol").val();
+	vvvvwaw(protocol_vvvvwaw);
 
 	var protocol_vvvvwax = jQuery("#jform_protocol").val();
 	var authentication_vvvvwax = jQuery("#jform_authentication").val();
@@ -56,200 +53,14 @@ jQuery(document).ready(function()
 	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
 	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
 	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+
+	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
+	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
 });
 
-// the vvvvwat function
-function vvvvwat(protocol_vvvvwat)
-{
-	if (isSet(protocol_vvvvwat) && protocol_vvvvwat.constructor !== Array)
-	{
-		var temp_vvvvwat = protocol_vvvvwat;
-		var protocol_vvvvwat = [];
-		protocol_vvvvwat.push(temp_vvvvwat);
-	}
-	else if (!isSet(protocol_vvvvwat))
-	{
-		var protocol_vvvvwat = [];
-	}
-	var protocol = protocol_vvvvwat.some(protocol_vvvvwat_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		if (jform_vvvvwatwae_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwatwae_required = false;
-		}
-
-		jQuery('#jform_host').closest('.control-group').show();
-		if (jform_vvvvwatwaf_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwatwaf_required = false;
-		}
-
-		jQuery('#jform_port').closest('.control-group').show();
-		if (jform_vvvvwatwag_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwatwag_required = false;
-		}
-
-		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwatwah_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwatwah_required = false;
-		}
-
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		if (jform_vvvvwatwai_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwatwai_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		if (!jform_vvvvwatwae_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwatwae_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		if (!jform_vvvvwatwaf_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwatwaf_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		if (!jform_vvvvwatwag_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwatwag_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwatwah_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwatwah_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		if (!jform_vvvvwatwai_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwatwai_required = true;
-		}
-	}
-}
-
-// the vvvvwat Some function
-function protocol_vvvvwat_SomeFunc(protocol_vvvvwat)
-{
-	// set the function logic
-	if (protocol_vvvvwat == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwau function
-function vvvvwau(protocol_vvvvwau)
-{
-	if (isSet(protocol_vvvvwau) && protocol_vvvvwau.constructor !== Array)
-	{
-		var temp_vvvvwau = protocol_vvvvwau;
-		var protocol_vvvvwau = [];
-		protocol_vvvvwau.push(temp_vvvvwau);
-	}
-	else if (!isSet(protocol_vvvvwau))
-	{
-		var protocol_vvvvwau = [];
-	}
-	var protocol = protocol_vvvvwau.some(protocol_vvvvwau_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('.note_ftp_signature').closest('.control-group').show();
-		jQuery('#jform_signature').closest('.control-group').show();
-		if (jform_vvvvwauwaj_required)
-		{
-			updateFieldRequired('signature',0);
-			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwauwaj_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
-		if (!jform_vvvvwauwaj_required)
-		{
-			updateFieldRequired('signature',1);
-			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwauwaj_required = true;
-		}
-	}
-}
-
-// the vvvvwau Some function
-function protocol_vvvvwau_SomeFunc(protocol_vvvvwau)
-{
-	// set the function logic
-	if (protocol_vvvvwau == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwav function
-function vvvvwav(protocol_vvvvwav,authentication_vvvvwav)
+function vvvvwav(protocol_vvvvwav)
 {
 	if (isSet(protocol_vvvvwav) && protocol_vvvvwav.constructor !== Array)
 	{
@@ -263,43 +74,109 @@ function vvvvwav(protocol_vvvvwav,authentication_vvvvwav)
 	}
 	var protocol = protocol_vvvvwav.some(protocol_vvvvwav_SomeFunc);
 
-	if (isSet(authentication_vvvvwav) && authentication_vvvvwav.constructor !== Array)
-	{
-		var temp_vvvvwav = authentication_vvvvwav;
-		var authentication_vvvvwav = [];
-		authentication_vvvvwav.push(temp_vvvvwav);
-	}
-	else if (!isSet(authentication_vvvvwav))
-	{
-		var authentication_vvvvwav = [];
-	}
-	var authentication = authentication_vvvvwav.some(authentication_vvvvwav_SomeFunc);
-
 
 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_password').closest('.control-group').show();
+		jQuery('#jform_authentication').closest('.control-group').show();
-		if (jform_vvvvwavwak_required)
+		if (jform_vvvvwavwad_required)
 		{
-			updateFieldRequired('password',0);
+			updateFieldRequired('authentication',0);
-			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
+			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwavwak_required = false;
+			jform_vvvvwavwad_required = false;
+		}
+
+		jQuery('#jform_host').closest('.control-group').show();
+		if (jform_vvvvwavwae_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwavwae_required = false;
+		}
+
+		jQuery('#jform_port').closest('.control-group').show();
+		if (jform_vvvvwavwaf_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwavwaf_required = false;
+		}
+
+		jQuery('#jform_path').closest('.control-group').show();
+		if (jform_vvvvwavwag_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwavwag_required = false;
+		}
+
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
+		if (jform_vvvvwavwah_required)
+		{
+			updateFieldRequired('username',0);
+			jQuery('#jform_username').prop('required','required');
+			jQuery('#jform_username').attr('aria-required',true);
+			jQuery('#jform_username').addClass('required');
+			jform_vvvvwavwah_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
+		jQuery('#jform_authentication').closest('.control-group').hide();
-		if (!jform_vvvvwavwak_required)
+		if (!jform_vvvvwavwad_required)
 		{
-			updateFieldRequired('password',1);
+			updateFieldRequired('authentication',1);
-			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
+			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwavwak_required = true;
+			jform_vvvvwavwad_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		if (!jform_vvvvwavwae_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwavwae_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		if (!jform_vvvvwavwaf_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwavwaf_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		if (!jform_vvvvwavwag_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwavwag_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
+		if (!jform_vvvvwavwah_required)
+		{
+			updateFieldRequired('username',1);
+			jQuery('#jform_username').removeAttr('required');
+			jQuery('#jform_username').removeAttr('aria-required');
+			jQuery('#jform_username').removeClass('required');
+			jform_vvvvwavwah_required = true;
 		}
 	}
 }
@@ -315,11 +192,57 @@ function protocol_vvvvwav_SomeFunc(protocol_vvvvwav)
 	return false;
 }
 
-// the vvvvwav Some function
+// the vvvvwaw function
-function authentication_vvvvwav_SomeFunc(authentication_vvvvwav)
+function vvvvwaw(protocol_vvvvwaw)
+{
+	if (isSet(protocol_vvvvwaw) && protocol_vvvvwaw.constructor !== Array)
+	{
+		var temp_vvvvwaw = protocol_vvvvwaw;
+		var protocol_vvvvwaw = [];
+		protocol_vvvvwaw.push(temp_vvvvwaw);
+	}
+	else if (!isSet(protocol_vvvvwaw))
+	{
+		var protocol_vvvvwaw = [];
+	}
+	var protocol = protocol_vvvvwaw.some(protocol_vvvvwaw_SomeFunc);
+
+
+	// set this function logic
+	if (protocol)
+	{
+		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_signature').closest('.control-group').show();
+		if (jform_vvvvwawwai_required)
+		{
+			updateFieldRequired('signature',0);
+			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_signature').addClass('required');
+			jform_vvvvwawwai_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_signature').closest('.control-group').hide();
+		if (!jform_vvvvwawwai_required)
+		{
+			updateFieldRequired('signature',1);
+			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_signature').removeClass('required');
+			jform_vvvvwawwai_required = true;
+		}
+	}
+}
+
+// the vvvvwaw Some function
+function protocol_vvvvwaw_SomeFunc(protocol_vvvvwaw)
 {
 	// set the function logic
-	if (authentication_vvvvwav == 1 || authentication_vvvvwav == 3 || authentication_vvvvwav == 5)
+	if (protocol_vvvvwaw == 1)
 	{
 		return true;
 	}
@@ -357,27 +280,27 @@ function vvvvwax(protocol_vvvvwax,authentication_vvvvwax)
 	// set this function logic
 	if (protocol && authentication)
 	{
-		jQuery('#jform_private').closest('.control-group').show();
+		jQuery('#jform_password').closest('.control-group').show();
-		if (jform_vvvvwaxwal_required)
+		if (jform_vvvvwaxwaj_required)
 		{
-			updateFieldRequired('private',0);
+			updateFieldRequired('password',0);
-			jQuery('#jform_private').prop('required','required');
+			jQuery('#jform_password').prop('required','required');
-			jQuery('#jform_private').attr('aria-required',true);
+			jQuery('#jform_password').attr('aria-required',true);
-			jQuery('#jform_private').addClass('required');
+			jQuery('#jform_password').addClass('required');
-			jform_vvvvwaxwal_required = false;
+			jform_vvvvwaxwaj_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_private').closest('.control-group').hide();
+		jQuery('#jform_password').closest('.control-group').hide();
-		if (!jform_vvvvwaxwal_required)
+		if (!jform_vvvvwaxwaj_required)
 		{
-			updateFieldRequired('private',1);
+			updateFieldRequired('password',1);
-			jQuery('#jform_private').removeAttr('required');
+			jQuery('#jform_password').removeAttr('required');
-			jQuery('#jform_private').removeAttr('aria-required');
+			jQuery('#jform_password').removeAttr('aria-required');
-			jQuery('#jform_private').removeClass('required');
+			jQuery('#jform_password').removeClass('required');
-			jform_vvvvwaxwal_required = true;
+			jform_vvvvwaxwaj_required = true;
 		}
 	}
 }
@@ -397,7 +320,7 @@ function protocol_vvvvwax_SomeFunc(protocol_vvvvwax)
 function authentication_vvvvwax_SomeFunc(authentication_vvvvwax)
 {
 	// set the function logic
-	if (authentication_vvvvwax == 2 || authentication_vvvvwax == 3)
+	if (authentication_vvvvwax == 1 || authentication_vvvvwax == 3 || authentication_vvvvwax == 5)
 	{
 		return true;
 	}
@@ -435,11 +358,28 @@ function vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz)
 	// set this function logic
 	if (protocol && authentication)
 	{
-		jQuery('#jform_private_key').closest('.control-group').show();
+		jQuery('#jform_private').closest('.control-group').show();
+		if (jform_vvvvwazwak_required)
+		{
+			updateFieldRequired('private',0);
+			jQuery('#jform_private').prop('required','required');
+			jQuery('#jform_private').attr('aria-required',true);
+			jQuery('#jform_private').addClass('required');
+			jform_vvvvwazwak_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('#jform_private_key').closest('.control-group').hide();
+		jQuery('#jform_private').closest('.control-group').hide();
+		if (!jform_vvvvwazwak_required)
+		{
+			updateFieldRequired('private',1);
+			jQuery('#jform_private').removeAttr('required');
+			jQuery('#jform_private').removeAttr('aria-required');
+			jQuery('#jform_private').removeClass('required');
+			jform_vvvvwazwak_required = true;
+		}
 	}
 }
 
@@ -458,7 +398,7 @@ function protocol_vvvvwaz_SomeFunc(protocol_vvvvwaz)
 function authentication_vvvvwaz_SomeFunc(authentication_vvvvwaz)
 {
 	// set the function logic
-	if (authentication_vvvvwaz == 4 || authentication_vvvvwaz == 5)
+	if (authentication_vvvvwaz == 2 || authentication_vvvvwaz == 3)
 	{
 		return true;
 	}
@@ -496,11 +436,28 @@ function vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb)
 	// set this function logic
 	if (protocol && authentication)
 	{
-		jQuery('#jform_secret').closest('.control-group').show();
+		jQuery('#jform_private_key').closest('.control-group').show();
+		if (jform_vvvvwbbwal_required)
+		{
+			updateFieldRequired('private_key',0);
+			jQuery('#jform_private_key').prop('required','required');
+			jQuery('#jform_private_key').attr('aria-required',true);
+			jQuery('#jform_private_key').addClass('required');
+			jform_vvvvwbbwal_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('#jform_secret').closest('.control-group').hide();
+		jQuery('#jform_private_key').closest('.control-group').hide();
+		if (!jform_vvvvwbbwal_required)
+		{
+			updateFieldRequired('private_key',1);
+			jQuery('#jform_private_key').removeAttr('required');
+			jQuery('#jform_private_key').removeAttr('aria-required');
+			jQuery('#jform_private_key').removeClass('required');
+			jform_vvvvwbbwal_required = true;
+		}
 	}
 }
 
@@ -519,7 +476,68 @@ function protocol_vvvvwbb_SomeFunc(protocol_vvvvwbb)
 function authentication_vvvvwbb_SomeFunc(authentication_vvvvwbb)
 {
 	// set the function logic
-	if (authentication_vvvvwbb == 2 || authentication_vvvvwbb == 3 || authentication_vvvvwbb == 4 || authentication_vvvvwbb == 5)
+	if (authentication_vvvvwbb == 4 || authentication_vvvvwbb == 5)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbd function
+function vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd)
+{
+	if (isSet(protocol_vvvvwbd) && protocol_vvvvwbd.constructor !== Array)
+	{
+		var temp_vvvvwbd = protocol_vvvvwbd;
+		var protocol_vvvvwbd = [];
+		protocol_vvvvwbd.push(temp_vvvvwbd);
+	}
+	else if (!isSet(protocol_vvvvwbd))
+	{
+		var protocol_vvvvwbd = [];
+	}
+	var protocol = protocol_vvvvwbd.some(protocol_vvvvwbd_SomeFunc);
+
+	if (isSet(authentication_vvvvwbd) && authentication_vvvvwbd.constructor !== Array)
+	{
+		var temp_vvvvwbd = authentication_vvvvwbd;
+		var authentication_vvvvwbd = [];
+		authentication_vvvvwbd.push(temp_vvvvwbd);
+	}
+	else if (!isSet(authentication_vvvvwbd))
+	{
+		var authentication_vvvvwbd = [];
+	}
+	var authentication = authentication_vvvvwbd.some(authentication_vvvvwbd_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_secret').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('#jform_secret').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwbd Some function
+function protocol_vvvvwbd_SomeFunc(protocol_vvvvwbd)
+{
+	// set the function logic
+	if (protocol_vvvvwbd == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbd Some function
+function authentication_vvvvwbd_SomeFunc(authentication_vvvvwbd)
+{
+	// set the function logic
+	if (authentication_vvvvwbd == 2 || authentication_vvvvwbd == 3 || authentication_vvvvwbd == 4 || authentication_vvvvwbd == 5)
 	{
 		return true;
 	}

admin/models/forms/server.xml

@@ -4,252 +4,282 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_SERVER_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_SERVER_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_SERVER_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_SERVER_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_SERVER_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_SERVER_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_SERVER_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_SERVER_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_SERVER_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_SERVER_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_SERVER_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_SERVER_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_SERVER_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_SERVER_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_SERVER_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_SERVER_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_SERVER_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_SERVER_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_SERVER_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_SERVER_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_SERVER_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_SERVER_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_SERVER_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_SERVER_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_SERVER_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_SERVER_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_SERVER_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_SERVER_NAME_DESCRIPTION"
-                <!-- Protocol Field. Type: List. (joomla)-->
+			class="text_area"
-                <field type="list"
+			readonly="false"
-                       name="protocol"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL"
+			required="true"
-                       description="COM_COMPONENTBUILDER_SERVER_PROTOCOL_DESCRIPTION"
+			filter="STRING"
-                       class="list_class"
+			message="COM_COMPONENTBUILDER_SERVER_NAME_MESSAGE"
-                       multiple="false"
+			hint="COM_COMPONENTBUILDER_SERVER_NAME_HINT"
-                       filter="INT"
+		/>
-                       required="true">
+		<!-- Protocol Field. Type: List. (joomla) -->
-                        <!-- Option Set.-->
+		<field
-                        <option value="">COM_COMPONENTBUILDER_SERVER_SELECT_AN_OPTION</option>
+			type="list"
-                        <option value="1">COM_COMPONENTBUILDER_SERVER_FTP</option>
+			name="protocol"
-                        <option value="2">COM_COMPONENTBUILDER_SERVER_SFTP</option>
+			label="COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL"
-                </field>
+			description="COM_COMPONENTBUILDER_SERVER_PROTOCOL_DESCRIPTION"
-                <!-- Note_ftp_signature Field. Type: Note. A None Database Field. (joomla)-->
+			class="list_class"
-                <field type="note"
+			multiple="false"
-                       name="note_ftp_signature"
+			filter="INT"
-                       label="COM_COMPONENTBUILDER_SERVER_NOTE_FTP_SIGNATURE_LABEL"
+			required="true">
-                       description="COM_COMPONENTBUILDER_SERVER_NOTE_FTP_SIGNATURE_DESCRIPTION"
+			<!-- Option Set. -->
-                       heading="h4"
+			<option value="">
-                       class="alert alert-success note_ftp_signature" />
+				COM_COMPONENTBUILDER_SERVER_SELECT_AN_OPTION</option>
-                <!-- Path Field. Type: Text. (joomla)-->
+			<option value="1">
-                <field type="text"
+				COM_COMPONENTBUILDER_SERVER_FTP</option>
-                       name="path"
+			<option value="2">
-                       label="COM_COMPONENTBUILDER_SERVER_PATH_LABEL"
+				COM_COMPONENTBUILDER_SERVER_SFTP</option>
-                       size="40"
+		</field>
-                       maxlength="150"
+		<!-- Note_ssh_security Field. Type: Note. A None Database Field. (joomla) -->
-                       description="COM_COMPONENTBUILDER_SERVER_PATH_DESCRIPTION"
+		<field type="note" name="note_ssh_security" label="COM_COMPONENTBUILDER_SERVER_NOTE_SSH_SECURITY_LABEL" description="COM_COMPONENTBUILDER_SERVER_NOTE_SSH_SECURITY_DESCRIPTION" heading="h4" class="alert alert-info note_ssh_security" />
-                       class="text_area"
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
-                       readonly="false"
+		<field
-                       disabled="false"
+			type="hidden"
-                       required="true"
+			name="not_required"
-                       filter="PATH"
+			default="[]"
-                       message="COM_COMPONENTBUILDER_SERVER_PATH_MESSAGE"
+		/>
-                       hint="COM_COMPONENTBUILDER_SERVER_PATH_HINT" />
+		<!-- Note_ftp_signature Field. Type: Note. A None Database Field. (joomla) -->
-                <!-- Port Field. Type: Text. (joomla)-->
+		<field type="note" name="note_ftp_signature" label="COM_COMPONENTBUILDER_SERVER_NOTE_FTP_SIGNATURE_LABEL" description="COM_COMPONENTBUILDER_SERVER_NOTE_FTP_SIGNATURE_DESCRIPTION" heading="h4" class="alert alert-success note_ftp_signature" />
-                <field type="text"
+		<!-- Signature Field. Type: Text. (joomla) -->
-                       name="port"
+		<field
-                       label="COM_COMPONENTBUILDER_SERVER_PORT_LABEL"
+			type="text"
-                       size="10"
+			name="signature"
-                       maxlength="50"
+			label="COM_COMPONENTBUILDER_SERVER_SIGNATURE_LABEL"
-                       default="22"
+			size="250"
-                       description="COM_COMPONENTBUILDER_SERVER_PORT_DESCRIPTION"
+			maxlength="250"
-                       class="text_area"
+			description="COM_COMPONENTBUILDER_SERVER_SIGNATURE_DESCRIPTION"
-                       required="true"
+			class="text_area span12"
-                       filter="INT"
+			required="true"
-                       message="COM_COMPONENTBUILDER_SERVER_PORT_MESSAGE"
+			filter="STRING"
-                       hint="COM_COMPONENTBUILDER_SERVER_PORT_HINT"
+			message="COM_COMPONENTBUILDER_SERVER_SIGNATURE_MESSAGE"
-                       onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};" />
+			hint="COM_COMPONENTBUILDER_SERVER_SIGNATURE_HINT"
-                <!-- Authentication Field. Type: List. (joomla)-->
+			autocomplete="off"
-                <field type="list"
+		/>
-                       name="authentication"
+		<!-- Private_key Field. Type: Textarea. (joomla) -->
-                       label="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_LABEL"
+		<field
-                       description="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_DESCRIPTION"
+			type="textarea"
-                       class="list_class"
+			name="private_key"
-                       multiple="false"
+			label="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL"
-                       filter="INT"
+			rows="15"
-                       required="true">
+			cols="5"
-                        <!-- Option Set.-->
+			description="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_DESCRIPTION"
-                        <option value="">COM_COMPONENTBUILDER_SERVER_SELECT_AN_OPTION</option>
+			class="input-xxlarge span12"
-                        <option value="1">COM_COMPONENTBUILDER_SERVER_PASSWORD</option>
+			hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_HINT"
-                        <option value="2">COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_FILE_PATH</option>
+			required="true"
-                        <option value="3">COM_COMPONENTBUILDER_SERVER_BOTH_PASSWORD_PRIVATE_KEY_FILE_PATH</option>
+		/>
-                        <option value="4">COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_TEXT_FIELD</option>
+		<!-- Secret Field. Type: Password. (joomla) -->
-                        <option value="5">COM_COMPONENTBUILDER_SERVER_BOTH_PASSWORD_PRIVATE_KEY_TEXT_FIELD</option>
+		<field
-                </field>
+			type="password"
-                <!-- Note_ssh_security Field. Type: Note. A None Database Field. (joomla)-->
+			name="secret"
-                <field type="note"
+			label="COM_COMPONENTBUILDER_SERVER_SECRET_LABEL"
-                       name="note_ssh_security"
+			size="60"
-                       label="COM_COMPONENTBUILDER_SERVER_NOTE_SSH_SECURITY_LABEL"
+			description="COM_COMPONENTBUILDER_SERVER_SECRET_DESCRIPTION"
-                       description="COM_COMPONENTBUILDER_SERVER_NOTE_SSH_SECURITY_DESCRIPTION"
+			message="Error! Please add the passphrase here."
-                       heading="h4"
+			class="text_area"
-                       class="alert alert-info note_ssh_security" />
+			filter="raw"
-                <!-- Password Field. Type: Password. (joomla)-->
+		/>
-                <field type="password"
+		<!-- Password Field. Type: Password. (joomla) -->
-                       name="password"
+		<field
-                       label="COM_COMPONENTBUILDER_SERVER_PASSWORD_LABEL"
+			type="password"
-                       size="60"
+			name="password"
-                       description="COM_COMPONENTBUILDER_SERVER_PASSWORD_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_SERVER_PASSWORD_LABEL"
-                       message="Error! Please add the password here."
+			size="60"
-                       class="text_area"
+			description="COM_COMPONENTBUILDER_SERVER_PASSWORD_DESCRIPTION"
-                       required="true"
+			message="Error! Please add the password here."
-                       filter="raw" />
+			class="text_area"
-                <!-- Secret Field. Type: Password. (joomla)-->
+			required="true"
-                <field type="password"
+			filter="raw"
-                       name="secret"
+		/>
-                       label="COM_COMPONENTBUILDER_SERVER_SECRET_LABEL"
+		<!-- Private Field. Type: Text. (joomla) -->
-                       size="60"
+		<field
-                       description="COM_COMPONENTBUILDER_SERVER_SECRET_DESCRIPTION"
+			type="text"
-                       message="Error! Please add the passphrase here."
+			name="private"
-                       class="text_area"
+			label="COM_COMPONENTBUILDER_SERVER_PRIVATE_LABEL"
-                       filter="raw" />
+			size="50"
-                <!-- Host Field. Type: Text. (joomla)-->
+			maxlength="150"
-                <field type="text"
+			description="COM_COMPONENTBUILDER_SERVER_PRIVATE_DESCRIPTION"
-                       name="host"
+			class="text_area"
-                       label="COM_COMPONENTBUILDER_SERVER_HOST_LABEL"
+			readonly="false"
-                       size="40"
+			disabled="false"
-                       maxlength="150"
+			required="true"
-                       description="COM_COMPONENTBUILDER_SERVER_HOST_DESCRIPTION"
+			filter="PATH"
-                       class="text_area"
+			message="COM_COMPONENTBUILDER_SERVER_PRIVATE_MESSAGE"
-                       required="true"
+			hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_HINT"
-                       filter="STRING"
+		/>
-                       message="COM_COMPONENTBUILDER_SERVER_HOST_MESSAGE"
+		<!-- Authentication Field. Type: List. (joomla) -->
-                       hint="COM_COMPONENTBUILDER_SERVER_HOST_HINT" />
+		<field
-                <!-- Signature Field. Type: Text. (joomla)-->
+			type="list"
-                <field type="text"
+			name="authentication"
-                       name="signature"
+			label="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_LABEL"
-                       label="COM_COMPONENTBUILDER_SERVER_SIGNATURE_LABEL"
+			description="COM_COMPONENTBUILDER_SERVER_AUTHENTICATION_DESCRIPTION"
-                       size="250"
+			class="list_class"
-                       maxlength="250"
+			multiple="false"
-                       description="COM_COMPONENTBUILDER_SERVER_SIGNATURE_DESCRIPTION"
+			filter="INT"
-                       class="text_area span12"
+			required="true">
-                       required="true"
+			<!-- Option Set. -->
-                       filter="STRING"
+			<option value="">
-                       message="COM_COMPONENTBUILDER_SERVER_SIGNATURE_MESSAGE"
+				COM_COMPONENTBUILDER_SERVER_SELECT_AN_OPTION</option>
-                       hint="COM_COMPONENTBUILDER_SERVER_SIGNATURE_HINT"
+			<option value="1">
-                       autocomplete="off" />
+				COM_COMPONENTBUILDER_SERVER_PASSWORD</option>
-                <!-- Username Field. Type: Text. (joomla)-->
+			<option value="2">
-                <field type="text"
+				COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_FILE_PATH</option>
-                       name="username"
+			<option value="3">
-                       label="COM_COMPONENTBUILDER_SERVER_USERNAME_LABEL"
+				COM_COMPONENTBUILDER_SERVER_BOTH_PASSWORD_PRIVATE_KEY_FILE_PATH</option>
-                       size="60"
+			<option value="4">
-                       maxlength="150"
+				COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_TEXT_FIELD</option>
-                       description="COM_COMPONENTBUILDER_SERVER_USERNAME_DESCRIPTION"
+			<option value="5">
-                       class="text_area"
+				COM_COMPONENTBUILDER_SERVER_BOTH_PASSWORD_PRIVATE_KEY_TEXT_FIELD</option>
-                       required="true"
+		</field>
-                       filter="STRING"
+		<!-- Path Field. Type: Text. (joomla) -->
-                       message="COM_COMPONENTBUILDER_SERVER_USERNAME_MESSAGE"
+		<field
-                       hint="COM_COMPONENTBUILDER_SERVER_USERNAME_HINT" />
+			type="text"
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+			name="path"
-                <field type="hidden"
+			label="COM_COMPONENTBUILDER_SERVER_PATH_LABEL"
-                       name="not_required"
+			size="40"
-                       default="[]" />
+			maxlength="150"
-                <!-- Private Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_SERVER_PATH_DESCRIPTION"
-                <field type="text"
+			class="text_area"
-                       name="private"
+			readonly="false"
-                       label="COM_COMPONENTBUILDER_SERVER_PRIVATE_LABEL"
+			disabled="false"
-                       size="50"
+			required="true"
-                       maxlength="150"
+			filter="PATH"
-                       description="COM_COMPONENTBUILDER_SERVER_PRIVATE_DESCRIPTION"
+			message="COM_COMPONENTBUILDER_SERVER_PATH_MESSAGE"
-                       class="text_area"
+			hint="COM_COMPONENTBUILDER_SERVER_PATH_HINT"
-                       readonly="false"
+		/>
-                       disabled="false"
+		<!-- Port Field. Type: Text. (joomla) -->
-                       required="true"
+		<field
-                       filter="PATH"
+			type="text"
-                       message="COM_COMPONENTBUILDER_SERVER_PRIVATE_MESSAGE"
+			name="port"
-                       hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_HINT" />
+			label="COM_COMPONENTBUILDER_SERVER_PORT_LABEL"
-                <!-- Private_key Field. Type: Textarea. (joomla)-->
+			size="10"
-                <field type="textarea"
+			maxlength="50"
-                       name="private_key"
+			default="22"
-                       label="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_LABEL"
+			description="COM_COMPONENTBUILDER_SERVER_PORT_DESCRIPTION"
-                       rows="15"
+			class="text_area"
-                       cols="5"
+			required="true"
-                       description="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_DESCRIPTION"
+			filter="INT"
-                       class="input-xxlarge span12"
+			message="COM_COMPONENTBUILDER_SERVER_PORT_MESSAGE"
-                       hint="COM_COMPONENTBUILDER_SERVER_PRIVATE_KEY_HINT" />
+			hint="COM_COMPONENTBUILDER_SERVER_PORT_HINT"
-        </fieldset>
+			onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};"
+		/>
+		<!-- Host Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="host"
+			label="COM_COMPONENTBUILDER_SERVER_HOST_LABEL"
+			size="40"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_SERVER_HOST_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_SERVER_HOST_MESSAGE"
+			hint="COM_COMPONENTBUILDER_SERVER_HOST_HINT"
+		/>
+		<!-- Username Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="username"
+			label="COM_COMPONENTBUILDER_SERVER_USERNAME_LABEL"
+			size="60"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_SERVER_USERNAME_DESCRIPTION"
+			class="text_area"
+			required="true"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_SERVER_USERNAME_MESSAGE"
+			hint="COM_COMPONENTBUILDER_SERVER_USERNAME_HINT"
+		/>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/site_view.js

@@ -23,318 +23,318 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvylvyi_required = false;
+jform_vvvvvynvyh_required = false;
-jform_vvvvvymvyj_required = false;
+jform_vvvvvyovyi_required = false;
-jform_vvvvvynvyk_required = false;
+jform_vvvvvypvyj_required = false;
-jform_vvvvvyovyl_required = false;
+jform_vvvvvyqvyk_required = false;
-jform_vvvvvypvym_required = false;
+jform_vvvvvyrvyl_required = false;
-jform_vvvvvyqvyn_required = false;
+jform_vvvvvysvym_required = false;
-jform_vvvvvyrvyo_required = false;
+jform_vvvvvytvyn_required = false;
-jform_vvvvvysvyp_required = false;
+jform_vvvvvyuvyo_required = false;
-jform_vvvvvytvyq_required = false;
+jform_vvvvvyvvyp_required = false;
-jform_vvvvvyuvyr_required = false;
+jform_vvvvvywvyq_required = false;
-jform_vvvvvyuvys_required = false;
+jform_vvvvvywvyr_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyl = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyn = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyl(add_php_view_vvvvvyl);
+	vvvvvyn(add_php_view_vvvvvyn);
 
-	var add_php_jview_display_vvvvvym = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyo = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvym(add_php_jview_display_vvvvvym);
+	vvvvvyo(add_php_jview_display_vvvvvyo);
 
-	var add_php_jview_vvvvvyn = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyp = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyn(add_php_jview_vvvvvyn);
+	vvvvvyp(add_php_jview_vvvvvyp);
 
-	var add_php_document_vvvvvyo = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvyq = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyo(add_php_document_vvvvvyo);
+	vvvvvyq(add_php_document_vvvvvyq);
 
-	var add_css_document_vvvvvyp = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyr = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyp(add_css_document_vvvvvyp);
+	vvvvvyr(add_css_document_vvvvvyr);
 
-	var add_javascript_file_vvvvvyq = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvys = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyq(add_javascript_file_vvvvvyq);
+	vvvvvys(add_javascript_file_vvvvvys);
 
-	var add_js_document_vvvvvyr = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyt = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyr(add_js_document_vvvvvyr);
+	vvvvvyt(add_js_document_vvvvvyt);
 
-	var add_css_vvvvvys = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyu = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvys(add_css_vvvvvys);
+	vvvvvyu(add_css_vvvvvyu);
 
-	var add_php_ajax_vvvvvyt = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyv = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyt(add_php_ajax_vvvvvyt);
+	vvvvvyv(add_php_ajax_vvvvvyv);
 
-	var add_custom_button_vvvvvyu = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyw = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyu(add_custom_button_vvvvvyu);
+	vvvvvyw(add_custom_button_vvvvvyw);
 
-	var button_position_vvvvvyv = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyx = jQuery("#jform_button_position").val();
-	vvvvvyv(button_position_vvvvvyv);
+	vvvvvyx(button_position_vvvvvyx);
 });
 
-// the vvvvvyl function
+// the vvvvvyn function
-function vvvvvyl(add_php_view_vvvvvyl)
+function vvvvvyn(add_php_view_vvvvvyn)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyl == 1)
+	if (add_php_view_vvvvvyn == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvylvyi_required)
+		if (jform_vvvvvynvyh_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvylvyi_required = false;
+			jform_vvvvvynvyh_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvylvyi_required)
+		if (!jform_vvvvvynvyh_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvylvyi_required = true;
+			jform_vvvvvynvyh_required = true;
 		}
 	}
 }
 
-// the vvvvvym function
+// the vvvvvyo function
-function vvvvvym(add_php_jview_display_vvvvvym)
+function vvvvvyo(add_php_jview_display_vvvvvyo)
 {
 	// set the function logic
-	if (add_php_jview_display_vvvvvym == 1)
+	if (add_php_jview_display_vvvvvyo == 1)
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvymvyj_required)
+		if (jform_vvvvvyovyi_required)
 		{
 			updateFieldRequired('php_jview_display',0);
 			jQuery('#jform_php_jview_display').prop('required','required');
 			jQuery('#jform_php_jview_display').attr('aria-required',true);
 			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvymvyj_required = false;
+			jform_vvvvvyovyi_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvymvyj_required)
+		if (!jform_vvvvvyovyi_required)
 		{
 			updateFieldRequired('php_jview_display',1);
 			jQuery('#jform_php_jview_display').removeAttr('required');
 			jQuery('#jform_php_jview_display').removeAttr('aria-required');
 			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvymvyj_required = true;
+			jform_vvvvvyovyi_required = true;
 		}
 	}
 }
 
-// the vvvvvyn function
+// the vvvvvyp function
-function vvvvvyn(add_php_jview_vvvvvyn)
+function vvvvvyp(add_php_jview_vvvvvyp)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyn == 1)
+	if (add_php_jview_vvvvvyp == 1)
 	{
 		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvynvyk_required)
+		if (jform_vvvvvypvyj_required)
 		{
 			updateFieldRequired('php_jview',0);
 			jQuery('#jform_php_jview').prop('required','required');
 			jQuery('#jform_php_jview').attr('aria-required',true);
 			jQuery('#jform_php_jview').addClass('required');
-			jform_vvvvvynvyk_required = false;
+			jform_vvvvvypvyj_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_jview').closest('.control-group').hide();
-		if (!jform_vvvvvynvyk_required)
+		if (!jform_vvvvvypvyj_required)
 		{
 			updateFieldRequired('php_jview',1);
 			jQuery('#jform_php_jview').removeAttr('required');
 			jQuery('#jform_php_jview').removeAttr('aria-required');
 			jQuery('#jform_php_jview').removeClass('required');
-			jform_vvvvvynvyk_required = true;
+			jform_vvvvvypvyj_required = true;
 		}
 	}
 }
 
-// the vvvvvyo function
+// the vvvvvyq function
-function vvvvvyo(add_php_document_vvvvvyo)
+function vvvvvyq(add_php_document_vvvvvyq)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyo == 1)
+	if (add_php_document_vvvvvyq == 1)
 	{
 		jQuery('#jform_php_document').closest('.control-group').show();
-		if (jform_vvvvvyovyl_required)
+		if (jform_vvvvvyqvyk_required)
 		{
 			updateFieldRequired('php_document',0);
 			jQuery('#jform_php_document').prop('required','required');
 			jQuery('#jform_php_document').attr('aria-required',true);
 			jQuery('#jform_php_document').addClass('required');
-			jform_vvvvvyovyl_required = false;
+			jform_vvvvvyqvyk_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_document').closest('.control-group').hide();
-		if (!jform_vvvvvyovyl_required)
+		if (!jform_vvvvvyqvyk_required)
 		{
 			updateFieldRequired('php_document',1);
 			jQuery('#jform_php_document').removeAttr('required');
 			jQuery('#jform_php_document').removeAttr('aria-required');
 			jQuery('#jform_php_document').removeClass('required');
-			jform_vvvvvyovyl_required = true;
+			jform_vvvvvyqvyk_required = true;
 		}
 	}
 }
 
-// the vvvvvyp function
+// the vvvvvyr function
-function vvvvvyp(add_css_document_vvvvvyp)
+function vvvvvyr(add_css_document_vvvvvyr)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyp == 1)
+	if (add_css_document_vvvvvyr == 1)
 	{
 		jQuery('#jform_css_document').closest('.control-group').show();
-		if (jform_vvvvvypvym_required)
+		if (jform_vvvvvyrvyl_required)
 		{
 			updateFieldRequired('css_document',0);
 			jQuery('#jform_css_document').prop('required','required');
 			jQuery('#jform_css_document').attr('aria-required',true);
 			jQuery('#jform_css_document').addClass('required');
-			jform_vvvvvypvym_required = false;
+			jform_vvvvvyrvyl_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css_document').closest('.control-group').hide();
-		if (!jform_vvvvvypvym_required)
+		if (!jform_vvvvvyrvyl_required)
 		{
 			updateFieldRequired('css_document',1);
 			jQuery('#jform_css_document').removeAttr('required');
 			jQuery('#jform_css_document').removeAttr('aria-required');
 			jQuery('#jform_css_document').removeClass('required');
-			jform_vvvvvypvym_required = true;
+			jform_vvvvvyrvyl_required = true;
 		}
 	}
 }
 
-// the vvvvvyq function
+// the vvvvvys function
-function vvvvvyq(add_javascript_file_vvvvvyq)
+function vvvvvys(add_javascript_file_vvvvvys)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyq == 1)
+	if (add_javascript_file_vvvvvys == 1)
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').show();
-		if (jform_vvvvvyqvyn_required)
+		if (jform_vvvvvysvym_required)
 		{
 			updateFieldRequired('javascript_file',0);
 			jQuery('#jform_javascript_file').prop('required','required');
 			jQuery('#jform_javascript_file').attr('aria-required',true);
 			jQuery('#jform_javascript_file').addClass('required');
-			jform_vvvvvyqvyn_required = false;
+			jform_vvvvvysvym_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_javascript_file').closest('.control-group').hide();
-		if (!jform_vvvvvyqvyn_required)
+		if (!jform_vvvvvysvym_required)
 		{
 			updateFieldRequired('javascript_file',1);
 			jQuery('#jform_javascript_file').removeAttr('required');
 			jQuery('#jform_javascript_file').removeAttr('aria-required');
 			jQuery('#jform_javascript_file').removeClass('required');
-			jform_vvvvvyqvyn_required = true;
+			jform_vvvvvysvym_required = true;
 		}
 	}
 }
 
-// the vvvvvyr function
+// the vvvvvyt function
-function vvvvvyr(add_js_document_vvvvvyr)
+function vvvvvyt(add_js_document_vvvvvyt)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyr == 1)
+	if (add_js_document_vvvvvyt == 1)
 	{
 		jQuery('#jform_js_document').closest('.control-group').show();
-		if (jform_vvvvvyrvyo_required)
+		if (jform_vvvvvytvyn_required)
 		{
 			updateFieldRequired('js_document',0);
 			jQuery('#jform_js_document').prop('required','required');
 			jQuery('#jform_js_document').attr('aria-required',true);
 			jQuery('#jform_js_document').addClass('required');
-			jform_vvvvvyrvyo_required = false;
+			jform_vvvvvytvyn_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_js_document').closest('.control-group').hide();
-		if (!jform_vvvvvyrvyo_required)
+		if (!jform_vvvvvytvyn_required)
 		{
 			updateFieldRequired('js_document',1);
 			jQuery('#jform_js_document').removeAttr('required');
 			jQuery('#jform_js_document').removeAttr('aria-required');
 			jQuery('#jform_js_document').removeClass('required');
-			jform_vvvvvyrvyo_required = true;
+			jform_vvvvvytvyn_required = true;
 		}
 	}
 }
 
-// the vvvvvys function
+// the vvvvvyu function
-function vvvvvys(add_css_vvvvvys)
+function vvvvvyu(add_css_vvvvvyu)
 {
 	// set the function logic
-	if (add_css_vvvvvys == 1)
+	if (add_css_vvvvvyu == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvysvyp_required)
+		if (jform_vvvvvyuvyo_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvysvyp_required = false;
+			jform_vvvvvyuvyo_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvysvyp_required)
+		if (!jform_vvvvvyuvyo_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvysvyp_required = true;
+			jform_vvvvvyuvyo_required = true;
 		}
 	}
 }
 
-// the vvvvvyt function
+// the vvvvvyv function
-function vvvvvyt(add_php_ajax_vvvvvyt)
+function vvvvvyv(add_php_ajax_vvvvvyv)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyt == 1)
+	if (add_php_ajax_vvvvvyv == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvytvyq_required)
+		if (jform_vvvvvyvvyp_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvytvyq_required = false;
+			jform_vvvvvyvvyp_required = false;
 		}
 
 	}
@@ -342,42 +342,42 @@ function vvvvvyt(add_php_ajax_vvvvvyt)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvytvyq_required)
+		if (!jform_vvvvvyvvyp_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvytvyq_required = true;
+			jform_vvvvvyvvyp_required = true;
 		}
 	}
 }
 
-// the vvvvvyu function
+// the vvvvvyw function
-function vvvvvyu(add_custom_button_vvvvvyu)
+function vvvvvyw(add_custom_button_vvvvvyw)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyu == 1)
+	if (add_custom_button_vvvvvyw == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyuvyr_required)
+		if (jform_vvvvvywvyq_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyuvyr_required = false;
+			jform_vvvvvywvyq_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyuvys_required)
+		if (jform_vvvvvywvyr_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyuvys_required = false;
+			jform_vvvvvywvyr_required = false;
 		}
 
 	}
@@ -385,40 +385,40 @@ function vvvvvyu(add_custom_button_vvvvvyu)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyr_required)
+		if (!jform_vvvvvywvyq_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyuvyr_required = true;
+			jform_vvvvvywvyq_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyuvys_required)
+		if (!jform_vvvvvywvyr_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyuvys_required = true;
+			jform_vvvvvywvyr_required = true;
 		}
 	}
 }
 
-// the vvvvvyv function
+// the vvvvvyx function
-function vvvvvyv(button_position_vvvvvyv)
+function vvvvvyx(button_position_vvvvvyx)
 {
-	if (isSet(button_position_vvvvvyv) && button_position_vvvvvyv.constructor !== Array)
+	if (isSet(button_position_vvvvvyx) && button_position_vvvvvyx.constructor !== Array)
 	{
-		var temp_vvvvvyv = button_position_vvvvvyv;
+		var temp_vvvvvyx = button_position_vvvvvyx;
-		var button_position_vvvvvyv = [];
+		var button_position_vvvvvyx = [];
-		button_position_vvvvvyv.push(temp_vvvvvyv);
+		button_position_vvvvvyx.push(temp_vvvvvyx);
 	}
-	else if (!isSet(button_position_vvvvvyv))
+	else if (!isSet(button_position_vvvvvyx))
 	{
-		var button_position_vvvvvyv = [];
+		var button_position_vvvvvyx = [];
 	}
-	var button_position = button_position_vvvvvyv.some(button_position_vvvvvyv_SomeFunc);
+	var button_position = button_position_vvvvvyx.some(button_position_vvvvvyx_SomeFunc);
 
 
 	// set this function logic
@@ -432,11 +432,11 @@ function vvvvvyv(button_position_vvvvvyv)
 	}
 }
 
-// the vvvvvyv Some function
+// the vvvvvyx Some function
-function button_position_vvvvvyv_SomeFunc(button_position_vvvvvyv)
+function button_position_vvvvvyx_SomeFunc(button_position_vvvvvyx)
 {
 	// set the function logic
-	if (button_position_vvvvvyv == 5)
+	if (button_position_vvvvvyx == 5)
 	{
 		return true;
 	}
@@ -479,6 +479,7 @@ function isSet(val)
 	return false;
 }
 
+
 jQuery(document).ready(function()
 {
 	// get the linked details

admin/models/forms/snippet.xml

@@ -4,225 +4,250 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_SNIPPET_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_SNIPPET_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_SNIPPET_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_SNIPPET_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_SNIPPET_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_SNIPPET_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_SNIPPET_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_SNIPPET_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_SNIPPET_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_SNIPPET_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_SNIPPET_NAME_DESCRIPTION"
-                <!-- Url Field. Type: Url. (joomla)-->
+			class="text_area"
-                <field type="url"
+			readonly="false"
-                       name="url"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_SNIPPET_URL_LABEL"
+			required="true"
-                       size="60"
+			filter="STRING"
-                       maxlength="150"
+			message="COM_COMPONENTBUILDER_SNIPPET_NAME_MESSAGE"
-                       description="COM_COMPONENTBUILDER_SNIPPET_URL_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_SNIPPET_NAME_HINT"
-                       class="text_area"
+		/>
-                       required="true"
+		<!-- Url Field. Type: Url. (joomla) -->
-                       filter="url"
+		<field
-                       validated="url"
+			type="url"
-                       message="COM_COMPONENTBUILDER_SNIPPET_URL_MESSAGE"
+			name="url"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_URL_HINT" />
+			label="COM_COMPONENTBUILDER_SNIPPET_URL_LABEL"
-                <!-- Type Field. Type: Snippettype. (custom)-->
+			size="60"
-                <field type="snippettype"
+			maxlength="150"
-                       name="type"
+			description="COM_COMPONENTBUILDER_SNIPPET_URL_DESCRIPTION"
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL"
+			class="text_area"
-                       description="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION"
+			required="true"
-                       class="list_class"
+			filter="url"
-                       multiple="false"
+			validated="url"
-                       default="0"
+			message="COM_COMPONENTBUILDER_SNIPPET_URL_MESSAGE"
-                       required="true" />
+			hint="COM_COMPONENTBUILDER_SNIPPET_URL_HINT"
-                <!-- Heading Field. Type: Text. (joomla)-->
+		/>
-                <field type="text"
+		<!-- Type Field. Type: Snippettype. (custom) -->
-                       name="heading"
+		<field
-                       label="COM_COMPONENTBUILDER_SNIPPET_HEADING_LABEL"
+			type="snippettype"
-                       size="40"
+			name="type"
-                       maxlength="150"
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_LABEL"
-                       description="COM_COMPONENTBUILDER_SNIPPET_HEADING_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION"
-                       class="text_area"
+			class="list_class"
-                       required="true"
+			multiple="false"
-                       filter="HTML"
+			default="0"
-                       message="COM_COMPONENTBUILDER_SNIPPET_HEADING_MESSAGE"
+			required="true"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_HEADING_HINT" />
+		/>
-                <!-- Library Field. Type: Library. (custom)-->
+		<!-- Heading Field. Type: Text. (joomla) -->
-                <field type="library"
+		<field
-                       name="library"
+			type="text"
-                       label="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL"
+			name="heading"
-                       description="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_SNIPPET_HEADING_LABEL"
-                       class="list_class"
+			size="40"
-                       multiple="false"
+			maxlength="150"
-                       default="0"
+			description="COM_COMPONENTBUILDER_SNIPPET_HEADING_DESCRIPTION"
-                       required="true"
+			class="text_area"
-                       button="true" />
+			required="true"
-                <!-- Contributor_email Field. Type: Text. (joomla)-->
+			filter="HTML"
-                <field type="text"
+			message="COM_COMPONENTBUILDER_SNIPPET_HEADING_MESSAGE"
-                       name="contributor_email"
+			hint="COM_COMPONENTBUILDER_SNIPPET_HEADING_HINT"
-                       label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_LABEL"
+		/>
-                       size="10"
+		<!-- Library Field. Type: Library. (custom) -->
-                       maxlength="50"
+		<field
-                       description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_DESCRIPTION"
+			type="library"
-                       class="text_area"
+			name="library"
-                       readonly="true"
+			label="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_LABEL"
-                       filter="STRING"
+			description="COM_COMPONENTBUILDER_SNIPPET_LIBRARY_DESCRIPTION"
-                       message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_MESSAGE"
+			class="list_class"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_HINT" />
+			multiple="false"
-                <!-- Contributor_website Field. Type: Text. (joomla)-->
+			default="0"
-                <field type="text"
+			required="true"
-                       name="contributor_website"
+			button="true"
-                       label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_LABEL"
+		/>
-                       size="10"
+		<!-- Note_contributor_details Field. Type: Note. A None Database Field. (joomla) -->
-                       maxlength="50"
+		<field type="note" name="note_contributor_details" label="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_LABEL" description="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_DESCRIPTION" heading="h4" class="alert alert-info note_contributor_details" />
-                       description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_DESCRIPTION"
+		<!-- Contributor_email Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="true"
+			type="text"
-                       filter="STRING"
+			name="contributor_email"
-                       message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_MESSAGE"
+			label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_LABEL"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_HINT" />
+			size="10"
-                <!-- Usage Field. Type: Textarea. (joomla)-->
+			maxlength="50"
-                <field type="textarea"
+			description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_DESCRIPTION"
-                       name="usage"
+			class="text_area"
-                       label="COM_COMPONENTBUILDER_SNIPPET_USAGE_LABEL"
+			readonly="true"
-                       rows="11"
+			filter="STRING"
-                       cols="10"
+			message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_MESSAGE"
-                       description="COM_COMPONENTBUILDER_SNIPPET_USAGE_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_EMAIL_HINT"
-                       class="text_area span12"
+		/>
-                       filter="STRING"
+		<!-- Contributor_name Field. Type: Text. (joomla) -->
-                       hint="COM_COMPONENTBUILDER_SNIPPET_USAGE_HINT" />
+		<field
-                <!-- Snippet Field. Type: Textarea. (joomla)-->
+			type="text"
-                <field type="textarea"
+			name="contributor_name"
-                       name="snippet"
+			label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_LABEL"
-                       label="COM_COMPONENTBUILDER_SNIPPET_SNIPPET_LABEL"
+			size="10"
-                       rows="27"
+			maxlength="50"
-                       cols="10"
+			description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_DESCRIPTION"
-                       class="text_area span12"
+			class="text_area"
-                       filter="raw"
+			readonly="true"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_SNIPPET_HINT"
+			filter="STRING"
-                       required="true" />
+			message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_MESSAGE"
-                <!-- Description Field. Type: Textarea. (joomla)-->
+			hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_HINT"
-                <field type="textarea"
+		/>
-                       name="description"
+		<!-- Contributor_website Field. Type: Text. (joomla) -->
-                       label="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_LABEL"
+		<field
-                       rows="11"
+			type="text"
-                       cols="10"
+			name="contributor_website"
-                       description="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_LABEL"
-                       class="text_area span12"
+			size="10"
-                       filter="HTML"
+			maxlength="50"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_HINT" />
+			description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_DESCRIPTION"
-                <!-- Contributor_name Field. Type: Text. (joomla)-->
+			class="text_area"
-                <field type="text"
+			readonly="true"
-                       name="contributor_name"
+			filter="STRING"
-                       label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_LABEL"
+			message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_MESSAGE"
-                       size="10"
+			hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_WEBSITE_HINT"
-                       maxlength="50"
+		/>
-                       description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_DESCRIPTION"
+		<!-- Contributor_company Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="true"
+			type="text"
-                       filter="STRING"
+			name="contributor_company"
-                       message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_MESSAGE"
+			label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_LABEL"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_NAME_HINT" />
+			size="10"
-                <!-- Contributor_company Field. Type: Text. (joomla)-->
+			maxlength="50"
-                <field type="text"
+			description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_DESCRIPTION"
-                       name="contributor_company"
+			class="text_area"
-                       label="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_LABEL"
+			readonly="true"
-                       size="10"
+			filter="STRING"
-                       maxlength="50"
+			message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_MESSAGE"
-                       description="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_HINT"
-                       class="text_area"
+		/>
-                       readonly="true"
+		<!-- Snippet Field. Type: Textarea. (joomla) -->
-                       filter="STRING"
+		<field
-                       message="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_MESSAGE"
+			type="textarea"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_CONTRIBUTOR_COMPANY_HINT" />
+			name="snippet"
-                <!-- Note_contributor_details Field. Type: Note. A None Database Field. (joomla)-->
+			label="COM_COMPONENTBUILDER_SNIPPET_SNIPPET_LABEL"
-                <field type="note"
+			rows="27"
-                       name="note_contributor_details"
+			cols="10"
-                       label="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_LABEL"
+			class="text_area span12"
-                       description="COM_COMPONENTBUILDER_SNIPPET_NOTE_CONTRIBUTOR_DETAILS_DESCRIPTION"
+			filter="raw"
-                       heading="h4"
+			hint="COM_COMPONENTBUILDER_SNIPPET_SNIPPET_HINT"
-                       class="alert alert-info note_contributor_details" />
+			required="true"
-        </fieldset>
+		/>
+		<!-- Usage Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="usage"
+			label="COM_COMPONENTBUILDER_SNIPPET_USAGE_LABEL"
+			rows="11"
+			cols="10"
+			description="COM_COMPONENTBUILDER_SNIPPET_USAGE_DESCRIPTION"
+			class="text_area span12"
+			filter="STRING"
+			hint="COM_COMPONENTBUILDER_SNIPPET_USAGE_HINT"
+		/>
+		<!-- Description Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="description"
+			label="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_LABEL"
+			rows="11"
+			cols="10"
+			description="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_DESCRIPTION"
+			class="text_area span12"
+			filter="HTML"
+			hint="COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_HINT"
+		/>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/snippet_type.xml

@@ -4,110 +4,120 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_SNIPPET_TYPE_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_SNIPPET_TYPE_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_TYPE_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_NAME_DESCRIPTION"
-                <!-- Description Field. Type: Text. (joomla)-->
+			class="text_area"
-                <field type="text"
+			readonly="false"
-                       name="description"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_LABEL"
+			required="true"
-                       size="80"
+			filter="STRING"
-                       maxlength="150"
+			message="COM_COMPONENTBUILDER_SNIPPET_TYPE_NAME_MESSAGE"
-                       description="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_SNIPPET_TYPE_NAME_HINT"
-                       class="text_area"
+		/>
-                       readonly="false"
+		<!-- Description Field. Type: Text. (joomla) -->
-                       disabled="false"
+		<field
-                       required="false"
+			type="text"
-                       filter="STRING"
+			name="description"
-                       message="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_MESSAGE"
+			label="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_LABEL"
-                       hint="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_HINT" />
+			size="80"
-        </fieldset>
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_DESCRIPTION"
+			class="text_area"
+			readonly="false"
+			disabled="false"
+			required="false"
+			filter="STRING"
+			message="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_MESSAGE"
+			hint="COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_HINT"
+		/>
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/forms/template.js

@@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvywvyt_required = false;
+jform_vvvvvyyvys_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyw = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyy = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyw(add_php_view_vvvvvyw);
+	vvvvvyy(add_php_view_vvvvvyy);
 });
 
-// the vvvvvyw function
+// the vvvvvyy function
-function vvvvvyw(add_php_view_vvvvvyw)
+function vvvvvyy(add_php_view_vvvvvyy)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyw == 1)
+	if (add_php_view_vvvvvyy == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvywvyt_required)
+		if (jform_vvvvvyyvys_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvywvyt_required = false;
+			jform_vvvvvyyvys_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvywvyt_required)
+		if (!jform_vvvvvyyvys_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvywvyt_required = true;
+			jform_vvvvvyyvys_required = true;
 		}
 	}
 }
@@ -100,6 +100,7 @@ function isSet(val)
 }
 
 
+
 function getSnippetDetails_server(snippetId){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
 	if(token.length > 0 && snippetId > 0){

admin/models/forms/template.xml

@@ -4,217 +4,221 @@
 	addfieldpath="/administrator/components/com_componentbuilder/models/fields"
 >
 	<fieldset name="details">
-                <!-- Default Fields.-->
+		<!-- Default Fields. -->
-                <!-- Id Field. Type: Text (joomla)-->
+		<!-- Id Field. Type: Text (joomla) -->
-                <field name="id"
+		<field
-                       type="text"
+			name="id"
-                       class="readonly"
+			type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"
-                       label="JGLOBAL_FIELD_ID_LABEL"
+			description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"
-                       description="JGLOBAL_FIELD_ID_DESC"
+			readonly="true"
-                       size="10"
+		/>
-                       default="0" />
+		<!-- Date Created Field. Type: Calendar (joomla) -->
-                <!-- Date Created Field. Type: Calendar (joomla)-->
+		<field
-                <field name="created"
+			name="created"
-                       type="calendar"
+			type="calendar"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL"
+			label="COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC"
+			description="COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC"
-                       size="22"
+			size="22"
-                       format="%Y-%m-%d %H:%M:%S"
+			format="%Y-%m-%d %H:%M:%S"
-                       filter="user_utc" />
+			filter="user_utc"
-                <!-- User Created Field. Type: User (joomla)-->
+		/>
-                <field name="created_by"
+		<!-- User Created Field. Type: User (joomla) -->
-                       type="user"
+		<field
-                       label="COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL"
+			name="created_by"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC" />
+			type="user"
-                <!-- Published Field. Type: List (joomla)-->
+			label="COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL"
-                <field name="published"
+			description="COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC"
-                       type="list"
+		/>
-                       label="JSTATUS">
+		<!-- Published Field. Type: List (joomla) -->
-                        <option value="1">JPUBLISHED</option>
+		<field name="published" type="list" label="JSTATUS"
-                        <option value="0">JUNPUBLISHED</option>
+			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
-                        <option value="2">JARCHIVED</option>
+			filter="intval" size="1" default="1" >
-                        <option value="-2">JTRASHED</option>
+			<option value="1">
-                </field>
+				JPUBLISHED</option>
-                <!-- Date Modified Field. Type: Calendar (joomla)-->
+			<option value="0">
-                <field name="modified"
+				JUNPUBLISHED</option>
-                       type="calendar"
+			<option value="2">
-                       class="readonly"
+				JARCHIVED</option>
-                       label="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_LABEL"
+			<option value="-2">
-                       description="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_DESC"
+				JTRASHED</option>
-                       size="22"
+		</field>
-                       readonly="true"
+		<!-- Date Modified Field. Type: Calendar (joomla) -->
-                       format="%Y-%m-%d %H:%M:%S"
+		<field name="modified" type="calendar" class="readonly"
-                       filter="user_utc" />
+			label="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_DESC"
-                <!-- User Modified Field. Type: User (joomla)-->
+			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
-                <field name="modified_by"
+		<!-- User Modified Field. Type: User (joomla) -->
-                       type="user"
+		<field name="modified_by" type="user"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_LABEL"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_DESC"
+			description="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_DESC"
-                       class="readonly"
+			class="readonly"
-                       readonly="true"
+			readonly="true"
-                       filter="unset" />
+			filter="unset"
-                <!-- Access Field. Type: Accesslevel (joomla)-->
+		/>
-                <field name="access"
+		<!-- Access Field. Type: Accesslevel (joomla) -->
-                       type="accesslevel"
+		<field name="access"
-                       label="JFIELD_ACCESS_LABEL"
+			type="accesslevel"
-                       description="JFIELD_ACCESS_DESC"
+			label="JFIELD_ACCESS_LABEL"
-                       default="1"
+			description="JFIELD_ACCESS_DESC"
-                       required="false" />
+			default="1"
-                <!-- Ordering Field. Type: Numbers (joomla)-->
+			required="false"
-                <field name="ordering"
+		/>
-                       type="number"
+		<!-- Ordering Field. Type: Numbers (joomla) -->
-                       class="inputbox validate-ordering"
+		<field
-                       label="COM_COMPONENTBUILDER_TEMPLATE_ORDERING_LABEL"
+			name="ordering"
-                       description=""
+			type="number"
-                       default="0"
+			class="inputbox validate-ordering"
-                       size="6"
+			label="COM_COMPONENTBUILDER_TEMPLATE_ORDERING_LABEL"
-                       required="false" />
+			description=""
-                <!-- Version Field. Type: Text (joomla)-->
+			default="0"
-                <field name="version"
+			size="6"
-                       type="text"
+			required="false"
-                       class="readonly"
+		/>
-                       label="COM_COMPONENTBUILDER_TEMPLATE_VERSION_LABEL"
+		<!-- Version Field. Type: Text (joomla) -->
-                       description="COM_COMPONENTBUILDER_TEMPLATE_VERSION_DESC"
+		<field
-                       size="6"
+			name="version"
-                       readonly="true"
+			type="text"
-                       filter="unset" />
+			class="readonly"
-                <!-- Dynamic Fields.-->
+			label="COM_COMPONENTBUILDER_TEMPLATE_VERSION_LABEL"
-                <!-- Name Field. Type: Text. (joomla)-->
+			description="COM_COMPONENTBUILDER_TEMPLATE_VERSION_DESC"
-                <field type="text"
+			size="6"
-                       name="name"
+			readonly="true"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_NAME_LABEL"
+			filter="unset"
-                       size="40"
+		/>
-                       maxlength="150"
+		<!-- Dynamic Fields. -->
-                       description="COM_COMPONENTBUILDER_TEMPLATE_NAME_DESCRIPTION"
+		<!-- Name Field. Type: Text. (joomla) -->
-                       class="text_area"
+		<field
-                       readonly="false"
+			type="text"
-                       disabled="false"
+			name="name"
-                       required="true"
+			label="COM_COMPONENTBUILDER_TEMPLATE_NAME_LABEL"
-                       filter="STRING"
+			size="40"
-                       message="COM_COMPONENTBUILDER_TEMPLATE_NAME_MESSAGE"
+			maxlength="150"
-                       hint="COM_COMPONENTBUILDER_TEMPLATE_NAME_HINT" />
+			description="COM_COMPONENTBUILDER_TEMPLATE_NAME_DESCRIPTION"
-                <!-- Alias Field. Type: Text. (joomla)-->
+			class="text_area"
-                <field type="text"
+			readonly="false"
-                       name="alias"
+			disabled="false"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_ALIAS_LABEL"
+			required="true"
-                       size="40"
+			filter="STRING"
-                       maxlength="50"
+			message="COM_COMPONENTBUILDER_TEMPLATE_NAME_MESSAGE"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_ALIAS_DESCRIPTION"
+			hint="COM_COMPONENTBUILDER_TEMPLATE_NAME_HINT"
-                       class="text_area"
+		/>
-                       filter="CMD"
+		<!-- Alias Field. Type: Text. (joomla) -->
-                       message="COM_COMPONENTBUILDER_TEMPLATE_ALIAS_MESSAGE"
+		<field
-                       hint="COM_COMPONENTBUILDER_TEMPLATE_ALIAS_HINT" />
+			type="text"
-                <!-- Description Field. Type: Text. (joomla)-->
+			name="alias"
-                <field type="text"
+			label="COM_COMPONENTBUILDER_TEMPLATE_ALIAS_LABEL"
-                       name="description"
+			size="40"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_LABEL"
+			maxlength="50"
-                       size="80"
+			description="COM_COMPONENTBUILDER_TEMPLATE_ALIAS_DESCRIPTION"
-                       maxlength="150"
+			class="text_area"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_DESCRIPTION"
+			filter="CMD"
-                       class="text_area"
+			message="COM_COMPONENTBUILDER_TEMPLATE_ALIAS_MESSAGE"
-                       readonly="false"
+			hint="COM_COMPONENTBUILDER_TEMPLATE_ALIAS_HINT"
-                       disabled="false"
+		/>
-                       required="true"
+		<!-- Description Field. Type: Text. (joomla) -->
-                       filter="STRING"
+		<field
-                       message="COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_MESSAGE"
+			type="text"
-                       hint="COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_HINT" />
+			name="description"
-                <!-- Snippet Field. Type: Snippets. (custom)-->
+			label="COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_LABEL"
-                <field type="snippets"
+			size="80"
-                       name="snippet"
+			maxlength="150"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_SNIPPET_LABEL"
+			description="COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_DESCRIPTION"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_SNIPPET_DESCRIPTION"
+			class="text_area"
-                       class="list_class"
+			readonly="false"
-                       multiple="false"
+			disabled="false"
-                       required="false"
+			required="true"
-                       button="true" />
+			filter="STRING"
-                <!-- Dynamic_get Field. Type: Dynamicget. (custom)-->
+			message="COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_MESSAGE"
-                <field type="dynamicget"
+			hint="COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_HINT"
-                       name="dynamic_get"
+		/>
-                       label="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_LABEL"
+		<!-- Snippet Field. Type: Snippets. (custom) -->
-                       description="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_DESCRIPTION"
+		<field
-                       multiple="false"
+			type="snippets"
-                       required="false"
+			name="snippet"
-                       button="true" />
+			label="COM_COMPONENTBUILDER_TEMPLATE_SNIPPET_LABEL"
-                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
+			description="COM_COMPONENTBUILDER_TEMPLATE_SNIPPET_DESCRIPTION"
-                <field type="note"
+			class="list_class"
-                       name="note_add_language_string"
+			multiple="false"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_ADD_LANGUAGE_STRING_LABEL"
+			required="false"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
+			button="true"
-                       heading="h4"
+		/>
-                       class="note_add_language_string" />
+		<!-- Php_view Field. Type: Textarea. (joomla) -->
-                <!-- Libraries Field. Type: Libraries. (custom)-->
+		<field
-                <field type="libraries"
+			type="textarea"
-                       name="libraries"
+			name="php_view"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_LABEL"
+			label="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_LABEL"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_DESCRIPTION"
+			rows="17"
-                       class="list_class"
+			cols="5"
-                       multiple="true"
+			description="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_DESCRIPTION"
-                       default="0"
+			class="text_area span12"
-                       required="false"
+			filter="raw"
-                       button="true" />
+			hint="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_HINT"
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+			required="true"
-                <field type="note"
+		/>
-                       name="note_uikit_snippet"
+		<!-- Add_php_view Field. Type: Radio. (joomla) -->
-                       label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_UIKIT_SNIPPET_LABEL"
+		<field
-                       heading="h4"
+			type="radio"
-                       class="snippet-code note_uikit_snippet" />
+			name="add_php_view"
-                <!-- Add_php_view Field. Type: Radio. (joomla)-->
+			label="COM_COMPONENTBUILDER_TEMPLATE_ADD_PHP_VIEW_LABEL"
-                <field type="radio"
+			class="btn-group btn-group-yesno"
-                       name="add_php_view"
+			default="0"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_ADD_PHP_VIEW_LABEL"
+			required="true">
-                       class="btn-group btn-group-yesno"
+			<!-- Option Set. -->
-                       default="0"
+			<option value="1">
-                       required="true">
+				COM_COMPONENTBUILDER_TEMPLATE_YES</option>
-                        <!-- Option Set.-->
+			<option value="0">
-                        <option value="1">COM_COMPONENTBUILDER_TEMPLATE_YES</option>
+				COM_COMPONENTBUILDER_TEMPLATE_NO</option>
-                        <option value="0">COM_COMPONENTBUILDER_TEMPLATE_NO</option>
+		</field>
-                </field>
+		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
-                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
-                <field type="note"
+		<!-- Dynamic_get Field. Type: Dynamicget. (custom) -->
-                       name="note_libraries_selection"
+		<field
-                       label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_LIBRARIES_SELECTION_LABEL"
+			type="dynamicget"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
+			name="dynamic_get"
-                       heading="h4"
+			label="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_LABEL"
-                       class="alert alert-info note_libraries_selection" />
+			description="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_GET_DESCRIPTION"
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
+			multiple="false"
-                <field type="hidden"
+			required="false"
-                       name="not_required"
+			button="true"
-                       default="[]" />
+		/>
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
-                <field type="note"
+		<field
-                       name="note_snippet_usage"
+			type="hidden"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_SNIPPET_USAGE_LABEL"
+			name="not_required"
-                       heading="h4"
+			default="[]"
-                       class="snippet-usage note_snippet_usage" />
+		/>
-                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
+		<!-- Template Field. Type: Textarea. (joomla) -->
-                <field type="note"
+		<field
-                       name="dynamic_values"
+			type="textarea"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL"
+			name="template"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_DESCRIPTION"
+			label="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_LABEL"
-                       heading="h4"
+			rows="20"
-                       class="dynamic_values" />
+			cols="15"
-                <!-- Template Field. Type: Textarea. (joomla)-->
+			class="text_area span12"
-                <field type="textarea"
+			filter="raw"
-                       name="template"
+			hint="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_HINT"
-                       label="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_LABEL"
+			required="true"
-                       rows="20"
+		/>
-                       cols="15"
+		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
-                       class="text_area span12"
+		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
-                       filter="raw"
+		<!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla) -->
-                       hint="COM_COMPONENTBUILDER_TEMPLATE_TEMPLATE_HINT"
+		<field type="note" name="note_uikit_snippet" label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_UIKIT_SNIPPET_LABEL" heading="h4" class="snippet-code note_uikit_snippet" />
-                       required="true" />
+		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
+		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_TEMPLATE_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
-                <field type="textarea"
+		<!-- Libraries Field. Type: Libraries. (custom) -->
-                       name="php_view"
+		<field
-                       label="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_LABEL"
+			type="libraries"
-                       rows="17"
+			name="libraries"
-                       cols="5"
+			label="COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_DESCRIPTION"
-                       class="text_area span12"
+			class="list_class"
-                       filter="raw"
+			multiple="true"
-                       hint="COM_COMPONENTBUILDER_TEMPLATE_PHP_VIEW_HINT"
+			default="0"
-                       required="true" />
+			required="false"
-        </fieldset>
+			button="true"
+		/>
+		<!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_libraries_selection" label="COM_COMPONENTBUILDER_TEMPLATE_NOTE_LIBRARIES_SELECTION_LABEL" description="COM_COMPONENTBUILDER_TEMPLATE_NOTE_LIBRARIES_SELECTION_DESCRIPTION" heading="h4" class="alert alert-info note_libraries_selection" />
+	</fieldset>
 	
 	<!-- Access Control Fields. -->
 	<fieldset name="accesscontrol">

admin/models/import_joomla_components.php

@@ -767,7 +767,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 	protected function moveSmartStuff()
 	{
 		// make sure to first unlock files
-		$this->unLockFiles($this->dir);
+		$this->unLockFiles();
 		// set params
 		$params = JComponentHelper::getParams('com_componentbuilder');
 		// set custom folder path
@@ -796,6 +796,43 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$success = false;
 			}
 		}
+		// now move the dynamic files if found
+		$dynamicDir = str_replace('//', '/', $this->dir . '/dynamic');
+		if (JFolder::exists($dynamicDir))
+		{
+			// get a list of folders
+			$folders = JFolder::folders($dynamicDir);
+			// check if we have files
+			if(ComponentbuilderHelper::checkArray($folders))
+			{
+				foreach ($folders as $folder)
+				{
+					$destination = $this->setDynamicPath($folder);
+					$fullPath = str_replace('//', '/', $dynamicDir . '/' . $folder);
+					if (!JFolder::exists($fullPath) || !JFolder::copy($fullPath, $destination,'',true))
+					{
+						$this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_FOLDER_BSB_WAS_NOT_MOVE_TO_S', $folder, $destination), 'error');
+						$success = false;
+					}
+				}
+			}
+			// get a list of files
+			$files = JFolder::files($dynamicDir);
+			// check if we have files
+			if(ComponentbuilderHelper::checkArray($files))
+			{
+				foreach ($files as $file)
+				{
+					$destination = $this->setDynamicPath($file);
+					$fullPath = str_replace('//', '/', $dynamicDir . '/' . $file);
+					if (!JFile::exists($fullPath) || !JFile::copy($fullPath, $destination))
+					{
+						$this->app->enqueueMessage(JText::sprintf('COM_COMPONENTBUILDER_FILE_BSB_WAS_NOT_MOVE_TO_S', $file, $destination), 'error');
+						$success = false;
+					}
+				}
+			}
+		}
 		return $success;
 	}
 
@@ -812,19 +849,17 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 			$unlocker = new FOFEncryptAes($this->sleutle, 128);
 			// we must first store the current working directory
 			$joomla = getcwd();
-			// setup the type path
+			// to avoid that it decrypt the db and info file again we must move per/folder
-			$customPath = str_replace('//', '/', $this->dir . '/custom');
+			$folders = array('images', 'custom', 'dynamic');
-			// go to the custom folder if found
+			// loop the folders
-			if (JFolder::exists($customPath))
+			foreach ($folders as $folder)
 			{
-				$this->unlock($customPath, $unlocker);
+				$subPath = str_replace('//', '/', $this->dir . '/' . $folder);
-			}
+				// go to the package sub folder if found
-			// setup the type path
+				if (JFolder::exists($subPath))
-			$imagesPath = str_replace('//', '/', $this->dir . '/images');
+				{
-			// go to the custom folder if found
+					$this->unlock($subPath, $unlocker);
-			if (JFolder::exists($imagesPath))
+				}
-			{
-				$this->unlock($imagesPath, $unlocker);
 			}
 			// change back to working dir
 			chdir($joomla);
@@ -983,10 +1018,10 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				foreach($values as $value)
 				{
 					// first check if exist (only add if it does not)
-					if (!$this->getLocalItem($value, $table, 1))
+					if (!$this->getLocalItem($value, $table, 1, 1, true))
 					{
 						// add the diverged data
-						$this->addLocalItem($value, $table);
+						$this->addLocalItem($value, $table, true);
 					}
 				}
 			}
@@ -1223,15 +1258,16 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 	/**
 	* Prep the item
 	*
-	* @param object $item      The item to prep
+	* @param object $item       The item to prep
-	* @param string $type      The type of values
+	* @param string $type        The type of values
-	* @param string $action    The action (add/update)
+	* @param string $action     The action (add/update)
+	* @param bool   $diverged  The diverged data switch
 	*
 	* @return  mixed           false on failure
 	*                          object on success
 	*
 	**/
-	protected function prepItem($item, &$type, $action)
+	protected function prepItem($item, &$type, $action, $diverged = false)
 	{
 		// remove access
 		if (isset($item->access))
@@ -1528,8 +1564,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$item = ComponentbuilderHelper::convertRepeatableFields($item, $updaterR);
 			break;
 			case 'component_admin_views':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1546,8 +1586,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$this->updateSubformsIDs($item, 'component_admin_views', $updaterT);
 			break;
 			case 'component_site_views':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1564,8 +1608,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$this->updateSubformsIDs($item, 'component_site_views', $updaterT);
 			break;
 			case 'component_custom_admin_views':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1582,8 +1630,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$this->updateSubformsIDs($item, 'component_custom_admin_views', $updaterT);
 			break;
 			case 'component_updates':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1593,8 +1645,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$item = ComponentbuilderHelper::convertRepeatableFields($item, $updaterR);
 			break;
 			case 'component_mysql_tweaks':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1611,8 +1667,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$this->updateSubformsIDs($item, 'component_mysql_tweaks', $updaterT);
 			break;
 			case 'component_custom_admin_menus':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1629,8 +1689,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$this->updateSubformsIDs($item, 'component_custom_admin_menus', $updaterT);
 			break;
 			case 'component_config':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1647,8 +1711,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$this->updateSubformsIDs($item, 'component_config', $updaterT);
 			break;
 			case 'component_dashboard':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1658,8 +1726,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				$item = ComponentbuilderHelper::convertRepeatableFields($item, $updaterR);
 			break;
 			case 'component_files_folders':
-				// update the joomla_component ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				if (!$diverged)
+				{
+					// update the joomla_component ID where needed
+					$item = $this->setNewID($item, 'joomla_component', 'joomla_component', $type);
+				}
 				// repeatable fields to update
 				$updaterR = array(
 						// repeatablefield => checker
@@ -1784,8 +1856,12 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 			break;
 			case 'admin_fields':
 			case 'admin_fields_conditions':
-				// update the admin_view ID where needed
+				// diverged id already updated
-				$item = $this->setNewID($item, 'admin_view', 'admin_view', $type);
+				if (!$diverged)
+				{
+					// update the admin_view ID where needed
+					$item = $this->setNewID($item, 'admin_view', 'admin_view', $type);
+				}
 				// set the updater
 				if ('admin_fields' === $type)
 				{
@@ -2006,17 +2082,18 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 	/**
 	* add the local item 
 	*
-	* @param object $item      The item to update
+	* @param object $item       The item to update
-	* @param string $type      The type of values
+	* @param string $type        The type of values
+	* @param bool   $diverged  The diverged data switch
 	*
 	* @return  mixed           false on failure
 	*                          ID int on success
 	*
 	**/
-	protected function addLocalItem(&$item, &$type)
+	protected function addLocalItem(&$item, &$type, $diverged = false)
 	{
 		// prep the item
-		if ($add = $this->prepItem($item, $type, 'add'))
+		if ($add = $this->prepItem($item, $type, 'add', $diverged))
 		{
 			// insert/add the item
 			if ($result = $this->_db->insertObject('#__componentbuilder_' . $type, $add))
@@ -2034,16 +2111,17 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 	/**
 	* Get the local item
 	*
-	* @param object $item      The item to get
+	* @param object $item       The item to get
-	* @param string $type      The type of values
+	* @param string $type        The type of values
-	* @param bool   $retry      The retry switch
+	* @param bool   $retry        The retry switch
-	* @param bool   $get        The query get switch
+	* @param bool   $get          The query get switch
+	* @param bool   $diverged  The diverged data switch
 	*
 	* @return  mixed           false on failure
 	*                          ID int on success
 	*
 	**/
-	protected function getLocalItem(&$item, &$type, $retry = false, $get = 1)
+	protected function getLocalItem(&$item, &$type, $retry = false, $get = 1, $diverged = false)
 	{
 		$query = $this->_db->getQuery(true);
 		$query->select('a.*');
@@ -2154,7 +2232,15 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 					// get by admin_view (since there should only be one of each name)
 					$getter = array('admin_view');
 					$this->specialValue = array();
-					$this->specialValue['admin_view'] = $this->newID['admin_view'][(int) $item->admin_view];
+					// Yet if diverged it makes sense that the ID is updated.
+					if ($diverged)
+					{
+						$this->specialValue['admin_view'] = (int) $item->admin_view;
+					}
+					elseif (isset($this->newID['admin_view'][(int) $item->admin_view]))
+					{
+						$this->specialValue['admin_view'] = $this->newID['admin_view'][(int) $item->admin_view];
+					}
 					break;
 				case 'fieldtype':
 					// get by name (since there should only be one of each name)
@@ -2304,10 +2390,23 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 				case 'component_config':
 				case 'component_dashboard':
 				case 'component_files_folders':
-					// get by admin_view (since there should only be one of each name)
+					// get by joomla_component (since there should only be one of each component)
 					$getter = array('joomla_component');
 					$this->specialValue = array();
-					$this->specialValue['joomla_component'] = $this->newID['joomla_component'][(int) $item->joomla_component];
+					// Yet if diverged it makes sense that the ID is updated.
+					if ($diverged)
+					{
+						$this->specialValue['joomla_component'] = (int) $item->joomla_component;
+					}
+					elseif (isset($this->newID['joomla_component'][(int) $item->joomla_component]))
+					{
+						$this->specialValue['joomla_component'] = $this->newID['joomla_component'][(int) $item->joomla_component];
+					}
+					// (TODO) I have seen this happen, seems dangerous! 
+					else
+					{
+						return false;
+					}
 					break;
 				case 'language_translation':
 						// get by English translation since there should just be one
@@ -2544,6 +2643,34 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 		}
 		return false;
 	}
+
+	/**
+	 * Update constant path with real full path value
+	 * 
+	 * @param   string   $path  The full path
+	 *
+	 * @return  string   The updated path
+	 * 
+	 */
+	protected function setFullPath($path)
+	{
+		return str_replace(array_keys(ComponentbuilderHelper::$constantPaths), array_values(ComponentbuilderHelper::$constantPaths), $path);
+	}
+
+	/**
+	 * Convert the name to a path
+	 * 
+	 * @param   string   $path  The path name
+	 *
+	 * @return  string   The full path	 * 
+	 */
+	protected function setDynamicPath($path)
+	{
+		// now convert to path
+		$path = str_replace('__v_d_m__', '/', $path);
+		// add the full path if possible
+		return str_replace('//', '/', $this->setFullPath($path));
+	}
 	
 	protected function getAlias($name,$type = false)
 	{

admin/models/joomla_component.php

@@ -108,28 +108,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->addcontributors = $addcontributors->toArray();
 			}
 
-			if (!empty($item->readme))
+			if (!empty($item->php_postflight_update))
 			{
-				// base64 Decode readme.
+				// base64 Decode php_postflight_update.
-				$item->readme = base64_decode($item->readme);
+				$item->php_postflight_update = base64_decode($item->php_postflight_update);
-			}
-
-			if (!empty($item->php_postflight_install))
-			{
-				// base64 Decode php_postflight_install.
-				$item->php_postflight_install = base64_decode($item->php_postflight_install);
-			}
-
-			if (!empty($item->php_preflight_install))
-			{
-				// base64 Decode php_preflight_install.
-				$item->php_preflight_install = base64_decode($item->php_preflight_install);
-			}
-
-			if (!empty($item->php_method_uninstall))
-			{
-				// base64 Decode php_method_uninstall.
-				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
 			}
 
 			if (!empty($item->php_preflight_update))
@@ -138,10 +120,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->php_preflight_update = base64_decode($item->php_preflight_update);
 			}
 
-			if (!empty($item->php_postflight_update))
+			if (!empty($item->javascript))
 			{
-				// base64 Decode php_postflight_update.
+				// base64 Decode javascript.
-				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+				$item->javascript = base64_decode($item->javascript);
+			}
+
+			if (!empty($item->css_site))
+			{
+				// base64 Decode css_site.
+				$item->css_site = base64_decode($item->css_site);
 			}
 
 			if (!empty($item->sql))
@@ -150,52 +138,64 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->sql = base64_decode($item->sql);
 			}
 
-			if (!empty($item->php_helper_both))
-			{
-				// base64 Decode php_helper_both.
-				$item->php_helper_both = base64_decode($item->php_helper_both);
-			}
-
 			if (!empty($item->php_helper_admin))
 			{
 				// base64 Decode php_helper_admin.
 				$item->php_helper_admin = base64_decode($item->php_helper_admin);
 			}
 
-			if (!empty($item->php_admin_event))
-			{
-				// base64 Decode php_admin_event.
-				$item->php_admin_event = base64_decode($item->php_admin_event);
-			}
-
 			if (!empty($item->php_helper_site))
 			{
 				// base64 Decode php_helper_site.
 				$item->php_helper_site = base64_decode($item->php_helper_site);
 			}
 
+			if (!empty($item->php_helper_both))
+			{
+				// base64 Decode php_helper_both.
+				$item->php_helper_both = base64_decode($item->php_helper_both);
+			}
+
+			if (!empty($item->php_admin_event))
+			{
+				// base64 Decode php_admin_event.
+				$item->php_admin_event = base64_decode($item->php_admin_event);
+			}
+
 			if (!empty($item->php_site_event))
 			{
 				// base64 Decode php_site_event.
 				$item->php_site_event = base64_decode($item->php_site_event);
 			}
 
-			if (!empty($item->javascript))
-			{
-				// base64 Decode javascript.
-				$item->javascript = base64_decode($item->javascript);
-			}
-
 			if (!empty($item->css_admin))
 			{
 				// base64 Decode css_admin.
 				$item->css_admin = base64_decode($item->css_admin);
 			}
 
-			if (!empty($item->css_site))
+			if (!empty($item->php_preflight_install))
 			{
-				// base64 Decode css_site.
+				// base64 Decode php_preflight_install.
-				$item->css_site = base64_decode($item->css_site);
+				$item->php_preflight_install = base64_decode($item->php_preflight_install);
+			}
+
+			if (!empty($item->php_postflight_install))
+			{
+				// base64 Decode php_postflight_install.
+				$item->php_postflight_install = base64_decode($item->php_postflight_install);
+			}
+
+			if (!empty($item->php_method_uninstall))
+			{
+				// base64 Decode php_method_uninstall.
+				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+			}
+
+			if (!empty($item->readme))
+			{
+				// base64 Decode readme.
+				$item->readme = base64_decode($item->readme);
 			}
 
 			if (!empty($item->buildcompsql))
@@ -207,7 +207,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			// Get the basic encryption.
 			$basickey = ComponentbuilderHelper::getCryptKey('basic');
 			// Get the encryption object.
-			$basic = new FOFEncryptAes($basickey, 128);
+			$basic = new FOFEncryptAes($basickey);
 
 			if (!empty($item->whmcs_key) && $basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
 			{
@@ -278,193 +278,9 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->tags = new JHelperTags;
 				$item->tags->getTagIds($item->id, 'com_componentbuilder.joomla_component');
 			}
-		}
+		}
-		$this->componentsvvvv = $item->id;
 
 		return $item;
-	}
-
-	/**
-	* Method to get list data.
-	*
-	* @return mixed  An array of data items on success, false on failure.
-	*/
-	public function getVwntranslation()
-	{
-		// Get the user object.
-		$user = JFactory::getUser();
-		// Create a new query object.
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-
-		// Select some fields
-		$query->select('a.*');
-
-		// From the componentbuilder_language_translation table
-		$query->from($db->quoteName('#__componentbuilder_language_translation', 'a'));
-
-		// Join over the asset groups.
-		$query->select('ag.title AS access_level');
-		$query->join('LEFT', '#__viewlevels AS ag ON ag.id = a.access');
-		// Filter by access level.
-		if ($access = $this->getState('filter.access'))
-		{
-			$query->where('a.access = ' . (int) $access);
-		}
-		// Implement View Level Access
-		if (!$user->authorise('core.options', 'com_componentbuilder'))
-		{
-			$groups = implode(',', $user->getAuthorisedViewLevels());
-			$query->where('a.access IN (' . $groups . ')');
-		}
-
-		// Order the results by ordering
-		$query->order('a.published  ASC');
-		$query->order('a.ordering  ASC');
-
-		// Load the items
-		$db->setQuery($query);
-		$db->execute();
-		if ($db->getNumRows())
-		{
-			$items = $db->loadObjectList();
-
-			// set values to display correctly.
-			if (ComponentbuilderHelper::checkArray($items))
-			{
-				// get user object.
-				$user = JFactory::getUser();
-				foreach ($items as $nr => &$item)
-				{
-					$access = ($user->authorise('language_translation.access', 'com_componentbuilder.language_translation.' . (int) $item->id) && $user->authorise('language_translation.access', 'com_componentbuilder'));
-					if (!$access)
-					{
-						unset($items[$nr]);
-						continue;
-					}
-
-				}
-			}
-
-			// Filter by componentsvvvv Array Field
-			$componentsvvvv = $this->componentsvvvv;
-			if (ComponentbuilderHelper::checkArray($items) && $componentsvvvv)
-			{
-				foreach ($items as $nr => &$item)
-				{
-					if (ComponentbuilderHelper::checkJson($item->components))
-					{
-						$item->components = json_decode($item->components, true);
-					}
-					elseif (!isset($item->components) || !ComponentbuilderHelper::checkArray($item->components))
-					{
-						unset($items[$nr]);
-						continue;
-					}
-					if (!in_array($componentsvvvv,$item->components))
-					{
-						unset($items[$nr]);
-						continue;
-					}
-				}
-			}
-			else
-			{
-				return false;
-			}
-
-				// show all languages that are already set for this string
-			if (!isset($_export) && ComponentbuilderHelper::checkArray($items))
-			{
-				foreach ($items as $nr => &$item)
-				{
-					$langBucket = array();
-					if (ComponentbuilderHelper::checkJson($item->translation))
-					{
-						$translations = json_decode($item->translation, true);
-						if (ComponentbuilderHelper::checkArray($translations))
-						{
-							foreach ($translations as $language)
-							{
-								if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
-								&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
-								{
-									$langBucket[$language['language']] = $language['language'];
-								}
-							}
-						}
-					}
-					// set how many component use this string
-					$componentCounter = '';
-					if (ComponentbuilderHelper::checkJson($item->components))
-					{
-						$item->components = json_decode($item->components, true);
-					}
-					if (ComponentbuilderHelper::checkArray($item->components))
-					{
-						$componentCounter = ' - <small>' . JText::_('COM_COMPONENTBUILDER_USED_IN') . ' ' . count($item->components) . '</small>';
-					}
-					// load the languages to the string
-					if (ComponentbuilderHelper::checkArray($langBucket))
-					{
-						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
-					}
-					else
-					{
-						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
-					}
-				}
-			}
-			// prep the lang strings for export
-			if (isset($_export) && $_export && ComponentbuilderHelper::checkArray($items))
-			{
-				// insure we have the same order in the languages
-				$languages = ComponentbuilderHelper::getVars('language', 1, 'published', 'langtag');
-				foreach ($items as $nr => &$item)
-				{
-					// remove some values completely
-					unset($item->components);
-					unset($item->params);
-					unset($item->published);
-					unset($item->created_by);
-					unset($item->modified_by);
-					unset($item->created);
-					unset($item->modified);
-					unset($item->version);
-					unset($item->hits);
-					unset($item->access);
-					unset($item->ordering);
-					// set the lang order
-					if ($nr != 0)
-					{
-						foreach ($languages as $lanTag)
-						{
-							$item->{$lanTag} = '';
-						}
-						// now adapt the entranslation
-						if (isset($item->translation) && ComponentbuilderHelper::checkJson($item->translation))
-						{
-							$translations = json_decode($item->translation, true);
-							if (ComponentbuilderHelper::checkArray($translations))
-							{
-								foreach ($translations as $language)
-								{
-									if (isset($language['translation']) && ComponentbuilderHelper::checkString($language['translation'])
-									&& isset($language['language']) && ComponentbuilderHelper::checkString($language['language']))
-									{
-										$item->{$language['language']} = $language['translation'];
-									}
-								}
-							}
-						}
-					}
-					// remove translation
-					unset($item->translation);
-				}
-			}
-			return $items;
-		}
-		return false;
 	} 
 
 	/**
@@ -1247,28 +1063,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['addcontributors'] = '';
 		}
 
-		// Set the readme string to base64 string.
+		// Set the php_postflight_update string to base64 string.
-		if (isset($data['readme']))
+		if (isset($data['php_postflight_update']))
 		{
-			$data['readme'] = base64_encode($data['readme']);
+			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
-		}
-
-		// Set the php_postflight_install string to base64 string.
-		if (isset($data['php_postflight_install']))
-		{
-			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
-		}
-
-		// Set the php_preflight_install string to base64 string.
-		if (isset($data['php_preflight_install']))
-		{
-			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
-		}
-
-		// Set the php_method_uninstall string to base64 string.
-		if (isset($data['php_method_uninstall']))
-		{
-			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
 		}
 
 		// Set the php_preflight_update string to base64 string.
@@ -1277,10 +1075,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
 		}
 
-		// Set the php_postflight_update string to base64 string.
+		// Set the javascript string to base64 string.
-		if (isset($data['php_postflight_update']))
+		if (isset($data['javascript']))
 		{
-			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+			$data['javascript'] = base64_encode($data['javascript']);
+		}
+
+		// Set the css_site string to base64 string.
+		if (isset($data['css_site']))
+		{
+			$data['css_site'] = base64_encode($data['css_site']);
 		}
 
 		// Set the sql string to base64 string.
@@ -1289,52 +1093,64 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['sql'] = base64_encode($data['sql']);
 		}
 
-		// Set the php_helper_both string to base64 string.
-		if (isset($data['php_helper_both']))
-		{
-			$data['php_helper_both'] = base64_encode($data['php_helper_both']);
-		}
-
 		// Set the php_helper_admin string to base64 string.
 		if (isset($data['php_helper_admin']))
 		{
 			$data['php_helper_admin'] = base64_encode($data['php_helper_admin']);
 		}
 
-		// Set the php_admin_event string to base64 string.
-		if (isset($data['php_admin_event']))
-		{
-			$data['php_admin_event'] = base64_encode($data['php_admin_event']);
-		}
-
 		// Set the php_helper_site string to base64 string.
 		if (isset($data['php_helper_site']))
 		{
 			$data['php_helper_site'] = base64_encode($data['php_helper_site']);
 		}
 
+		// Set the php_helper_both string to base64 string.
+		if (isset($data['php_helper_both']))
+		{
+			$data['php_helper_both'] = base64_encode($data['php_helper_both']);
+		}
+
+		// Set the php_admin_event string to base64 string.
+		if (isset($data['php_admin_event']))
+		{
+			$data['php_admin_event'] = base64_encode($data['php_admin_event']);
+		}
+
 		// Set the php_site_event string to base64 string.
 		if (isset($data['php_site_event']))
 		{
 			$data['php_site_event'] = base64_encode($data['php_site_event']);
 		}
 
-		// Set the javascript string to base64 string.
-		if (isset($data['javascript']))
-		{
-			$data['javascript'] = base64_encode($data['javascript']);
-		}
-
 		// Set the css_admin string to base64 string.
 		if (isset($data['css_admin']))
 		{
 			$data['css_admin'] = base64_encode($data['css_admin']);
 		}
 
-		// Set the css_site string to base64 string.
+		// Set the php_preflight_install string to base64 string.
-		if (isset($data['css_site']))
+		if (isset($data['php_preflight_install']))
 		{
-			$data['css_site'] = base64_encode($data['css_site']);
+			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
+		}
+
+		// Set the php_postflight_install string to base64 string.
+		if (isset($data['php_postflight_install']))
+		{
+			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
+		}
+
+		// Set the php_method_uninstall string to base64 string.
+		if (isset($data['php_method_uninstall']))
+		{
+			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
+		}
+
+		// Set the readme string to base64 string.
+		if (isset($data['readme']))
+		{
+			$data['readme'] = base64_encode($data['readme']);
 		}
 
 		// Set the buildcompsql string to base64 string.
@@ -1346,7 +1162,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		// Get the basic encryption key.
 		$basickey = ComponentbuilderHelper::getCryptKey('basic');
 		// Get the encryption object
-		$basic = new FOFEncryptAes($basickey, 128);
+		$basic = new FOFEncryptAes($basickey);
 
 		// Encrypt data whmcs_key.
 		if (isset($data['whmcs_key']) && $basickey)

admin/models/joomla_components.php

@@ -216,6 +216,18 @@ class ComponentbuilderModelJoomla_components extends JModelList
 							unset($items[$nr]);
 							continue;
 						}
+						// make sure old fields are not exported any more
+						unset($item->addconfig);
+						unset($item->addadmin_views);
+						unset($item->addcustom_admin_views);
+						unset($item->addsite_views);
+						unset($item->version_update);
+						unset($item->sql_tweak);
+						unset($item->addcustommenus);
+						unset($item->dashboard_tab);
+						unset($item->php_dashboard_methods);
+						unset($item->addfiles);
+						unset($item->addfolders);
 						// build information data set
 						$this->info['name'][$item->id] = $item->name;
 						$this->info['short_description'][$item->id] = $item->short_description;
@@ -273,17 +285,24 @@ class ComponentbuilderModelJoomla_components extends JModelList
 						// add to pks
 						$pks[] = $item->id;
 					}
+					// array of tables linked to joomla_component
+					$linkedTables = array(
+						'custom_code' => 'component',
+						'component_files_folders' => 'joomla_component',
+						'component_admin_views' => 'joomla_component',
+						'component_config' => 'joomla_component',
+						'component_site_views' => 'joomla_component',
+						'component_custom_admin_views' => 'joomla_component',
+						'component_updates' => 'joomla_component',
+						'component_mysql_tweaks' => 'joomla_component',
+						'component_custom_admin_menus' => 'joomla_component',
+						'component_dashboard' => 'joomla_component' );
 					// load all tables linked to joomla_component
-					$this->setData('custom_code', $pks, 'component');
+					foreach($linkedTables as $table => $field)
-					$this->setData('component_files_folders', $pks, 'joomla_component');
+					{
-					$this->setData('component_admin_views', $pks, 'joomla_component');
+						$this->setData($table, $pks, $field);
-					$this->setData('component_config', $pks, 'joomla_component');
+					}
-					$this->setData('component_site_views', $pks, 'joomla_component');
+						
-					$this->setData('component_custom_admin_views', $pks, 'joomla_component');
-					$this->setData('component_updates', $pks, 'joomla_component');
-					$this->setData('component_mysql_tweaks', $pks, 'joomla_component');
-					$this->setData('component_custom_admin_menus', $pks, 'joomla_component');
-					$this->setData('component_dashboard', $pks, 'joomla_component');
 					// add fields and conditions
 					if (isset($this->exportIDs['admin_view']) && ComponentbuilderHelper::checkArray($this->exportIDs['admin_view']))
 					{
@@ -320,7 +339,8 @@ class ComponentbuilderModelJoomla_components extends JModelList
 					{
 						$this->setData('custom_code', array_values($this->exportIDs['custom_code']), 'id');
 					}
-					// has any data been set
+
+					// has any data been set for this component
 					if (isset($this->smartExport['joomla_component']) && ComponentbuilderHelper::checkArray($this->smartExport['joomla_component']))
 					{
 						// set the folder and move the files of each component to the folder
@@ -553,6 +573,10 @@ class ComponentbuilderModelJoomla_components extends JModelList
 						$this->moveIt($this->getValues($item->addfiles, 'subform', 'file', null), 'file');
 						// build folders
 						$this->moveIt($this->getValues($item->addfolders, 'subform', 'folder', null), 'folder');
+						// build full path files
+						$this->moveIt($this->getValues($item->addfilesfullpath, 'subform', 'filepath', null), 'file', true);
+						// build full path folders
+						$this->moveIt($this->getValues($item->addfoldersfullpath, 'subform', 'folderpath', null), 'folder', true);
 					}
 					// actions to take if table is component_config
 					if ('component_config' === $table)
@@ -596,6 +620,13 @@ class ComponentbuilderModelJoomla_components extends JModelList
 						// add fields
 						$this->setData('field', $this->getValues($item->addfields, 'subform', 'field'), 'id');
 					}
+					// actions to take if table is admin_fields_conditions
+					if ('admin_fields_conditions' === $table)
+					{
+						// add fields
+						$this->setData('field', $this->getValues($item->addconditions, 'subform', 'target_field'), 'id');
+						$this->setData('field', $this->getValues($item->addconditions, 'subform', 'match_field'), 'id');
+					}
 					// actions to take if table is field
 					if ('field' === $table)
 					{
@@ -682,86 +713,91 @@ class ComponentbuilderModelJoomla_components extends JModelList
 	*/
 	protected function smartExportBuilder()
 	{
-		// set db data
+		// check if data is set
-		$data = serialize($this->smartExport);
+		if (isset($this->smartExport) && ComponentbuilderHelper::checkArray($this->smartExport))
-		// lock the data if set
-		if (ComponentbuilderHelper::checkArray($this->key))
 		{
-			// lock the data
+			// set db data
-			$this->key = md5(implode('', $this->key));
+			$data = serialize($this->smartExport);
-			$locker = new FOFEncryptAes($this->key, 128);
+			// lock the data if set
-			$data = $locker->encryptString($data);		
+			if (ComponentbuilderHelper::checkArray($this->key))
-			// Set the key owner information
-			$this->info['getKeyFrom'] = array();
-			$this->info['getKeyFrom']['company'] = $this->params->get('export_company', null);
-			$this->info['getKeyFrom']['owner'] = $this->params->get('export_owner', null);
-			$this->info['getKeyFrom']['email'] = $this->params->get('export_email', null);
-			$this->info['getKeyFrom']['website'] = $this->params->get('export_website', null);
-			$this->info['getKeyFrom']['license'] = $this->params->get('export_license', null);
-			$this->info['getKeyFrom']['copyright'] = $this->params->get('export_copyright', null);
-			// making provision for future changes 
-			if (count($this->exportBuyLinks) == 1)
 			{
-				$this->info['getKeyFrom']['buy_links'] = $this->exportBuyLinks;
+				// lock the data
+				$this->key = md5(implode('', $this->key));
+				$locker = new FOFEncryptAes($this->key, 128);
+				$data = $locker->encryptString($data);		
+				// Set the key owner information
+				$this->info['getKeyFrom'] = array();
+				$this->info['getKeyFrom']['company'] = $this->params->get('export_company', null);
+				$this->info['getKeyFrom']['owner'] = $this->params->get('export_owner', null);
+				$this->info['getKeyFrom']['email'] = $this->params->get('export_email', null);
+				$this->info['getKeyFrom']['website'] = $this->params->get('export_website', null);
+				$this->info['getKeyFrom']['license'] = $this->params->get('export_license', null);
+				$this->info['getKeyFrom']['copyright'] = $this->params->get('export_copyright', null);
+				// making provision for future changes 
+				if (count($this->exportBuyLinks) == 1)
+				{
+					$this->info['getKeyFrom']['buy_links'] = $this->exportBuyLinks;
+				}
+				else
+				{
+					// use global if more then one component is exported, or if none has a buy link
+					$this->info['getKeyFrom']['buy_link'] = $this->params->get('export_buy_link', null);
+				}
+				$this->info['getKeyFrom']['package_links']	= $this->exportPackageLinks;
 			}
 			else
 			{
-				// use global if more then one component is exported, or if none has a buy link
+				// Set the owner information
-				$this->info['getKeyFrom']['buy_link'] = $this->params->get('export_buy_link', null);
+				$data = base64_encode($data);
 			}
-			$this->info['getKeyFrom']['package_links']	= $this->exportPackageLinks;
+			// set the path
-		}
+			$dbPath = $this->packagePath . '/db.vdm';
-		else
+			// write the db data to file in package
-		{
+			if (!ComponentbuilderHelper::writeFile($dbPath, wordwrap($data, 128, "\n", true)))
-			// Set the owner information
-			$data = base64_encode($data);
-		}
-		// set the path
-		$dbPath = $this->packagePath . '/db.vdm';
-		// write the db data to file in package
-		if (!ComponentbuilderHelper::writeFile($dbPath, wordwrap($data, 128, "\n", true)))
-		{
-			return false;
-		}
-		// set info data
-		$locker = new FOFEncryptAes('V4stD3vel0pmEntMethOd@YoUrS3rv!s', 128);
-		$info = $locker->encryptString(json_encode($this->info));
-		// set the path
-		$infoPath = $this->packagePath . '/info.vdm';
-		// write the db data to file in package
-		if (!ComponentbuilderHelper::writeFile($infoPath, wordwrap($info, 128, "\n", true)))
-		{
-				return false;
-		}
-		// lock all files
-		$this->lockFiles();
-		// remove old zip files with the same name
-		if (JFile::exists($this->zipPath))
-		{
-			// remove file if found
-			JFile::delete($this->zipPath);
-		}
-		// zip the folder
-		if (!ComponentbuilderHelper::zip($this->packagePath, $this->zipPath))
-		{
-			return false;
-		}
-		// move to remote server if needed
-		if (2 == $this->backupType)
-		{
-			if (!ComponentbuilderHelper::moveToServer($this->zipPath, $this->packageName.'.zip', $this->backupServer, null, 'joomla_component.export'))
 			{
 				return false;
 			}
-			// remove the local file
+			// set info data
-			JFile::delete($this->zipPath);
+			$locker = new FOFEncryptAes('V4stD3vel0pmEntMethOd@YoUrS3rv!s', 128);
+			$info = $locker->encryptString(json_encode($this->info));
+			// set the path
+			$infoPath = $this->packagePath . '/info.vdm';
+			// write the db data to file in package
+			if (!ComponentbuilderHelper::writeFile($infoPath, wordwrap($info, 128, "\n", true)))
+			{
+					return false;
+			}
+			// lock all files
+			$this->lockFiles();
+			// remove old zip files with the same name
+			if (JFile::exists($this->zipPath))
+			{
+				// remove file if found
+				JFile::delete($this->zipPath);
+			}
+			// zip the folder
+			if (!ComponentbuilderHelper::zip($this->packagePath, $this->zipPath))
+			{
+				return false;
+			}
+			// move to remote server if needed
+			if (2 == $this->backupType)
+			{
+				if (!ComponentbuilderHelper::moveToServer($this->zipPath, $this->packageName.'.zip', $this->backupServer, null, 'joomla_component.export'))
+				{
+					return false;
+				}
+				// remove the local file
+				JFile::delete($this->zipPath);
+			}
+			// remove the folder
+			if (!ComponentbuilderHelper::removeFolder($this->packagePath))
+			{
+				return false;
+			}
+			return true;
 		}
-		// remove the folder
+		return false;
-		if (!ComponentbuilderHelper::removeFolder($this->packagePath))
-		{
-			return false;
-		}
-		return true;
 	}
 
 	/**
@@ -777,19 +813,18 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			$locker = new FOFEncryptAes($this->key, 128);
 			// we must first store the current working directory
 			$joomla = getcwd();
-			// setup the type path
+			// to avoid that it encrypt the db and info file again we must move per/folder
-			$customPath = $this->packagePath . '/custom';
+			$folders = array('images', 'custom', 'dynamic');
-			// go to the custom folder if found
+			// loop the folders
-			if (JFolder::exists($customPath))
+			foreach ($folders as $folder)
 			{
-				$this->lock($customPath, $locker);
+				// the sub path
-			}
+				$subPath = $this->packagePath.'/'.$folder;
-			// setup the type path
+				// go to the package sub folder if found
-			$imagesPath = $this->packagePath . '/images';
+				if (JFolder::exists($subPath))
-			// go to the custom folder if found
+				{
-			if (JFolder::exists($imagesPath))
+					$this->lock($subPath, $locker);
-			{
+				}
-				$this->lock($imagesPath, $locker);
 			}
 			// change back to working dir
 			chdir($joomla);
@@ -823,7 +858,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 	*
 	* @return bool
 	*/
-	protected function moveIt($paths, $type)
+	protected function moveIt($paths, $type, $dynamic = false)
 	{
 		// make sure we have an array
 		if (!ComponentbuilderHelper::checkArray($paths))
@@ -834,11 +869,20 @@ class ComponentbuilderModelJoomla_components extends JModelList
 		if ('file' === $type || 'folder' === $type)
 		{
 			$folderName = 'custom';
+			// if these are full paths use dynamic folder
+			if ($dynamic)
+			{
+				$folderName = 'dynamic';
+			}
 		}
-		if ('image' === $type)
+		elseif ('image' === $type)
 		{
 			$folderName = 'images';
 		}
+		else
+		{
+			return false;
+		}
 		// setup the type path
 		$tmpPath = str_replace('//', '/', $this->packagePath . '/' . $folderName);
 		// create type path if not set
@@ -850,19 +894,31 @@ class ComponentbuilderModelJoomla_components extends JModelList
 		// now move it
 		foreach ($paths as $item)
 		{
+			// make sure we have a string
 			if (ComponentbuilderHelper::checkString($item))
 			{
+				// if the file type
 				if ('file' === $type)
 				{
-					// TODO we must add the new all over files to this... will be a little tricky.
+					// if dynamic paths
-					$tmpFilePath = str_replace('//', '/', $tmpPath.'/'.$item);
+					if ($dynamic)
-					$customFilePath = str_replace('//', '/', $this->customPath.'/'.$item);
+					{
+						$tmpFilePath = $tmpPath.'/'.$this->setDynamicPathName($item);
+						$customFilePath = str_replace('//', '/', $this->setFullPath($item));
+					}
+					else
+					{
+						$tmpFilePath = str_replace('//', '/', $tmpPath.'/'.$item);
+						$customFilePath = str_replace('//', '/', $this->customPath.'/'.$item);
+					}
+					// now check if file exist
 					if (!JFile::exists($tmpFilePath) && JFile::exists($customFilePath))
 					{
 						// move the file to its place
 						JFile::copy($customFilePath, $tmpFilePath);
 					}
 				}
+				// if the image type
 				if ('image' === $type)
 				{
 					$imageName = basename($item);
@@ -882,10 +938,20 @@ class ComponentbuilderModelJoomla_components extends JModelList
 						JFile::copy($customImagePath, $tmpImagePath);
 					}
 				}
+				// if the folder type
 				if ('folder' === $type)
 				{
-					$tmpFolderPath = str_replace('//', '/', $tmpPath.'/'.$item);
+					// if dynamic paths
-					$customFolderPath = str_replace('//', '/', $this->customPath.'/'.$item);
+					if ($dynamic)
+					{
+						$tmpFolderPath = $tmpPath.'/'.$this->setDynamicPathName($item);
+						$customFolderPath = str_replace('//', '/', $this->setFullPath($item));
+					}
+					else
+					{
+						$tmpFolderPath = str_replace('//', '/', $tmpPath.'/'.$item);
+						$customFolderPath = str_replace('//', '/', $this->customPath.'/'.$item);
+					}
 					if (!JFolder::exists($tmpFolderPath) && JFolder::exists($customFolderPath))
 					{
 						// move the folder to its place
@@ -1252,6 +1318,48 @@ class ComponentbuilderModelJoomla_components extends JModelList
 			}
 		}
 	}
+
+	/**
+	 * Convert the path to a name
+	 * 
+	 * @param   string   $path  The full path
+	 *
+	 * @return  string   The path name
+	 * 
+	 */
+	protected function setDynamicPathName($path)
+	{
+		// remove the full path if possible
+		$path = str_replace('//', '/', $this->setConstantPath($path));
+		// now convert to string
+		return str_replace('/', '__v_d_m__', $path);
+	}
+
+	/**
+	 * Update real full path value with constant path string
+	 * 
+	 * @param   string   $path  The full path
+	 *
+	 * @return  string   The updated path
+	 * 
+	 */
+	protected function setConstantPath($path)
+	{
+		return str_replace(array_values(ComponentbuilderHelper::$constantPaths), array_keys(ComponentbuilderHelper::$constantPaths), $path);
+	}
+
+	/**
+	 * Update constant path with real full path value
+	 * 
+	 * @param   string   $path  The full path
+	 *
+	 * @return  string   The updated path
+	 * 
+	 */
+	protected function setFullPath($path)
+	{
+		return str_replace(array_keys(ComponentbuilderHelper::$constantPaths), array_values(ComponentbuilderHelper::$constantPaths), $path);
+	}
 
 	/**
 	* Get the keys of the values to search custom code in
@@ -1604,7 +1712,7 @@ class ComponentbuilderModelJoomla_components extends JModelList
 				// Get the basic encryption key.
 				$basickey = ComponentbuilderHelper::getCryptKey('basic');
 				// Get the encryption object.
-				$basic = new FOFEncryptAes($basickey, 128);
+				$basic = new FOFEncryptAes($basickey);
 
 				// set values to display correctly.
 				if (ComponentbuilderHelper::checkArray($items))
@@ -1620,41 +1728,41 @@ class ComponentbuilderModelJoomla_components extends JModelList
 							continue;
 						}
 
-						// decode readme
+						// decode php_postflight_update
-						$item->readme = base64_decode($item->readme);
+						$item->php_postflight_update = base64_decode($item->php_postflight_update);
-						// decode php_postflight_install
+						// decode php_preflight_update
-						$item->php_postflight_install = base64_decode($item->php_postflight_install);
+						$item->php_preflight_update = base64_decode($item->php_preflight_update);
-						// decode php_preflight_install
+						// decode javascript
-						$item->php_preflight_install = base64_decode($item->php_preflight_install);
+						$item->javascript = base64_decode($item->javascript);
-						// decode php_method_uninstall
+						// decode css_site
-						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
+						$item->css_site = base64_decode($item->css_site);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
+						// decode php_helper_admin
+						$item->php_helper_admin = base64_decode($item->php_helper_admin);
+						// decode php_helper_site
+						$item->php_helper_site = base64_decode($item->php_helper_site);
+						// decode php_helper_both
+						$item->php_helper_both = base64_decode($item->php_helper_both);
+						// decode php_admin_event
+						$item->php_admin_event = base64_decode($item->php_admin_event);
+						// decode php_site_event
+						$item->php_site_event = base64_decode($item->php_site_event);
+						// decode css_admin
+						$item->css_admin = base64_decode($item->css_admin);
 						if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
 						{
 							// decrypt whmcs_key
 							$item->whmcs_key = $basic->decryptString($item->whmcs_key);
 						}
-						// decode php_preflight_update
+						// decode php_preflight_install
-						$item->php_preflight_update = base64_decode($item->php_preflight_update);
+						$item->php_preflight_install = base64_decode($item->php_preflight_install);
-						// decode php_postflight_update
+						// decode php_postflight_install
-						$item->php_postflight_update = base64_decode($item->php_postflight_update);
+						$item->php_postflight_install = base64_decode($item->php_postflight_install);
-						// decode sql
+						// decode php_method_uninstall
-						$item->sql = base64_decode($item->sql);
+						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-						// decode php_helper_both
+						// decode readme
-						$item->php_helper_both = base64_decode($item->php_helper_both);
+						$item->readme = base64_decode($item->readme);
-						// decode php_helper_admin
-						$item->php_helper_admin = base64_decode($item->php_helper_admin);
-						// decode php_admin_event
-						$item->php_admin_event = base64_decode($item->php_admin_event);
-						// decode php_helper_site
-						$item->php_helper_site = base64_decode($item->php_helper_site);
-						// decode php_site_event
-						$item->php_site_event = base64_decode($item->php_site_event);
-						// decode javascript
-						$item->javascript = base64_decode($item->javascript);
-						// decode css_admin
-						$item->css_admin = base64_decode($item->css_admin);
-						// decode css_site
-						$item->css_site = base64_decode($item->css_site);
 						if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
 						{
 							// decrypt export_key

admin/models/layout.php

@@ -103,16 +103,16 @@ class ComponentbuilderModelLayout extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
-			if (!empty($item->layout))
-			{
-				// base64 Decode layout.
-				$item->layout = base64_decode($item->layout);
-			}
-
 			if (!empty($item->php_view))
 			{
 				// base64 Decode php_view.
 				$item->php_view = base64_decode($item->php_view);
+			}
+
+			if (!empty($item->layout))
+			{
+				// base64 Decode layout.
+				$item->layout = base64_decode($item->layout);
 			}
 			
 			if (!empty($item->id))
@@ -839,16 +839,16 @@ class ComponentbuilderModelLayout extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
-		// Set the layout string to base64 string.
-		if (isset($data['layout']))
-		{
-			$data['layout'] = base64_encode($data['layout']);
-		}
-
 		// Set the php_view string to base64 string.
 		if (isset($data['php_view']))
 		{
 			$data['php_view'] = base64_encode($data['php_view']);
+		}
+
+		// Set the layout string to base64 string.
+		if (isset($data['layout']))
+		{
+			$data['layout'] = base64_encode($data['layout']);
 		}
         
 		// Set the Params Items to data

admin/models/layouts.php

@@ -271,10 +271,10 @@ class ComponentbuilderModelLayouts extends JModelList
 							continue;
 						}
 
-						// decode layout
-						$item->layout = base64_decode($item->layout);
 						// decode php_view
 						$item->php_view = base64_decode($item->php_view);
+						// decode layout
+						$item->layout = base64_decode($item->layout);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);