Fixed gh-264 another glitch due to the update of the field area, that caused the language tag selection to break

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.7.1) 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.7.5) 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,13 +126,13 @@ 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*: 30th March, 2018
-+ *Version*: 2.7.1
++ *Last Build*: 14th April, 2018
++ *Version*: 2.7.5
 + *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*: **191428**
-+ *Field count*: **1011**
-+ *File count*: **1197**
++ *Line count*: **182312**
++ *Field count*: **1012**
++ *File count*: **1199**
 + *Folder count*: **193**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://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.7.1) 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.7.5) 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,13 +126,13 @@ 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*: 30th March, 2018
-+ *Version*: 2.7.1
++ *Last Build*: 14th April, 2018
++ *Version*: 2.7.5
 + *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*: **191428**
-+ *Field count*: **1011**
-+ *File count*: **1197**
++ *Line count*: **182312**
++ *Field count*: **1012**
++ *File count*: **1199**
 + *Folder count*: **193**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).

admin/assets/css/admin.css

@@ -26,7 +26,8 @@
 .no-click {
 	pointer-events: none;
 }
-.fieldMedium { width: 130px; }
+.fieldMedium { width: 120px; }
+.fieldMid { width: 80px; }
 .fieldFull { width: 100%; }
 .fieldSmall { width: 60px; }
 code { display: inline-block; margin: 3px;}

admin/assets/css/custom_admin_view.css

@@ -42,4 +42,7 @@ width: 100% !important;
 }
 .jform_dynamic_get_input_width {
 width: 90% !important;
+}
+.uk-scrollable-box {
+height: 380px !important;
 }

admin/assets/css/field.css

@@ -25,6 +25,5 @@
 /* CSS Document */
 
 
-.uk-scrollable-box {
-height: 380px !important;
-}
+.uk-scrollable-box { height: 380px !important; }
+.subform-table-sublayout-section .controls { margin-left: 0px; }

admin/assets/css/layout.css

@@ -36,4 +36,7 @@ width: 100% !important;
 }
 .jform_dynamic_get_input_width {
 width: 90% !important;
+}
+.uk-scrollable-box {
+height: 380px !important;
 }

admin/assets/css/site_view.css

@@ -42,4 +42,7 @@ width: 100% !important;
 }
 .jform_dynamic_get_input_width {
 width: 90% !important;
+}
+.uk-scrollable-box {
+height: 380px !important;
 }

admin/assets/css/template.css

@@ -36,4 +36,7 @@ width: 100% !important;
 }
 .jform_dynamic_get_input_width {
 width: 90% !important;
+}
+.uk-scrollable-box {
+height: 380px !important;
 }

admin/compiler/joomla_3/Helper.php

@@ -110,6 +110,19 @@ abstract class ###Component###Helper
 		###SUBMENU###
 	}###HELPER_CREATEUSER### ###HELPER_UIKIT### ###HELPER_EXEL###
 
+	/**
+	 * Get a Variable 
+	 *
+	 * @param   string   $table        The table from which to get the variable
+	 * @param   string   $where        The value where
+	 * @param   string   $whereString  The target/field string where/name
+	 * @param   string   $what         The return field
+	 * @param   string   $operator     The operator between $whereString/field and $where/value
+	 * @param   string   $main         The component in which the table is found
+	 *
+	 * @return  mix string/int/float
+	 *
+	 */
 	public static function getVar($table, $where = null, $whereString = 'user', $what = 'id', $operator = '=', $main = '###component###')
 	{
 		if(!$where)
@@ -150,6 +163,20 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	 * Get array of variables
+	 *
+	 * @param   string   $table        The table from which to get the variables
+	 * @param   string   $where        The value where
+	 * @param   string   $whereString  The target/field string where/name
+	 * @param   string   $what         The return field
+	 * @param   string   $operator     The operator between $whereString/field and $where/value
+	 * @param   string   $main         The component in which the table is found
+	 * @param   bool     $unique       The switch to return a unique array
+	 *
+	 * @return  array
+	 *
+	 */
 	public static function getVars($table, $where = null, $whereString = 'user', $what = 'id', $operator = 'IN', $main = '###component###', $unique = true)
 	{
 		if(!$where)
@@ -618,28 +645,141 @@ abstract class ###Component###Helper
 		return JAccess::getAssetRules(0);
 	}
 
+	/**
+	 * xmlAppend
+	 *
+	 * @param   SimpleXMLElement   $xml      The XML element reference in which to inject a comment
+	 * @param   mixed              $node     A SimpleXMLElement node to append to the XML element reference, or a stdClass object containing a comment attribute to be injected before the XML node and a fieldXML attribute containing a SimpleXMLElement
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlAppend(&$xml, $node)
+	{
+		if (!$node)
+		{
+			// element was not returned
+			return;
+		}
+		switch (get_class($node))
+		{
+			case 'stdClass':
+				if (property_exists($node, 'comment'))
+				{
+					self::xmlComment($xml, $node->comment);
+				}
+				if (property_exists($node, 'fieldXML'))
+				{
+					self::xmlAppend($xml, $node->fieldXML);
+				}
+				break;
+			case 'SimpleXMLElement':
+				$domXML = dom_import_simplexml($xml);
+				$domNode = dom_import_simplexml($node);
+				$domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
+				$xml = simplexml_import_dom($domXML);
+				break;
+		}
+	}
+
+	/**
+	 * xmlComment
+	 *
+	 * @param   SimpleXMLElement   $xml        The XML element reference in which to inject a comment
+	 * @param   string             $comment    The comment to inject
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlComment(&$xml, $comment)
+	{
+		$domXML = dom_import_simplexml($xml);
+		$domComment = new DOMComment($comment);
+		$nodeTarget = $domXML->ownerDocument->importNode($domComment, true);
+		$domXML->appendChild($nodeTarget);
+		$xml = simplexml_import_dom($domXML);
+	}
+
+	/**
+	 * xmlAddAttributes
+	 *
+	 * @param   SimpleXMLElement   $xml          The XML element reference in which to inject a comment
+	 * @param   array              $attributes   The attributes to apply to the XML element
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlAddAttributes(&$xml, $attributes = array())
+	{
+		foreach ($attributes as $key => $value)
+		{
+			$xml->addAttribute($key, $value);
+		}
+	}
+
+	/**
+	 * xmlAddOptions
+	 *
+	 * @param   SimpleXMLElement   $xml          The XML element reference in which to inject a comment
+	 * @param   array              $options      The options to apply to the XML element
+	 *
+	 * @return  void
+	 *
+	 */
+	public static function xmlAddOptions(&$xml, $options = array())
+	{
+		foreach ($options as $key => $value)
+		{
+			$addOption = $xml->addChild('option');
+			$addOption->addAttribute('value', $key);
+			$addOption[] = $value;
+		}
+	}
+
+	/**
+	 * Render Bool Button
+	 *
+	 * @param   array   $args   All the args for the button
+	 *                             0) name
+	 *                             1) additional (options class) // not used at this time
+	 *                             2) default
+	 *                             3) yes (name)
+	 *                             4) no (name)
+	 *
+	 * @return  string    The input html of the button
+	 *
+	 */
 	public static function renderBoolButton()
 	{
 		$args = func_get_args();
+		// check if there is additional button class
+		$additional = isset($args[1]) ? (string) $args[1] : ''; // not used at this time
+		// start the xml
+		$buttonXML = new SimpleXMLElement('<field/>');
+		// button attributes
+		$buttonAttributes = array(
+			'type' => 'radio',
+			'name' => isset($args[0]) ? self::htmlEscape($args[0]) : 'bool_button',
+			'label' => isset($args[0]) ? self::safeString(self::htmlEscape($args[0]), 'Ww') : 'Bool Button', // not seen anyway
+			'class' => 'btn-group',
+			'filter' => 'INT',
+			'default' => isset($args[2]) ? (int) $args[2] : 0);
+		// load the haskey attributes
+		self::xmlAddAttributes($buttonXML, $buttonAttributes);
+		// set the button options
+		$buttonOptions = array(
+			'1' => isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES',
+			'0' => isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO');
+		// load the button options
+		self::xmlAddOptions($buttonXML, $buttonOptions);
 
 		// get the radio element
 		$button = JFormHelper::loadFieldType('radio');
 
-		// setup the properties
-		$name	 	= self::htmlEscape($args[0]);
-		$additional = isset($args[1]) ? (string) $args[1] : '';
-		$value		= $args[2];
-		$yes 	 	= isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES';
-		$no 	 	= isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO';
-
-		// prepare the xml
-		$element = new SimpleXMLElement('<field name="'.$name.'" type="radio" class="btn-group"><option '.$additional.' value="0">'.$no.'</option><option '.$additional.' value="1">'.$yes.'</option></field>');
-
 		// run
-		$button->setup($element, $value);
+		$button->setup($buttonXML, $buttonAttributes['default']);
 
 		return $button->input;
-
 	}
 
 	/**

admin/compiler/joomla_3/Helper_site.php

@@ -291,30 +291,156 @@ abstract class ###Component###Helper
 		return JAccess::getAssetRules(0);
 	}
 
+	/**
+	 * xmlAppend
+	 *
+	 * @param   SimpleXMLElement   $xml      The XML element reference in which to inject a comment
+	 * @param   mixed              $node     A SimpleXMLElement node to append to the XML element reference, or a stdClass object containing a comment attribute to be injected before the XML node and a fieldXML attribute containing a SimpleXMLElement
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlAppend(&$xml, $node)
+	{
+		if (!$node)
+		{
+			// element was not returned
+			return;
+		}
+		switch (get_class($node))
+		{
+			case 'stdClass':
+				if (property_exists($node, 'comment'))
+				{
+					self::xmlComment($xml, $node->comment);
+				}
+				if (property_exists($node, 'fieldXML'))
+				{
+					self::xmlAppend($xml, $node->fieldXML);
+				}
+				break;
+			case 'SimpleXMLElement':
+				$domXML = dom_import_simplexml($xml);
+				$domNode = dom_import_simplexml($node);
+				$domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
+				$xml = simplexml_import_dom($domXML);
+				break;
+		}
+	}
+
+	/**
+	 * xmlComment
+	 *
+	 * @param   SimpleXMLElement   $xml        The XML element reference in which to inject a comment
+	 * @param   string             $comment    The comment to inject
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlComment(&$xml, $comment)
+	{
+		$domXML = dom_import_simplexml($xml);
+		$domComment = new DOMComment($comment);
+		$nodeTarget = $domXML->ownerDocument->importNode($domComment, true);
+		$domXML->appendChild($nodeTarget);
+		$xml = simplexml_import_dom($domXML);
+	}
+
+	/**
+	 * xmlAddAttributes
+	 *
+	 * @param   SimpleXMLElement   $xml          The XML element reference in which to inject a comment
+	 * @param   array              $attributes   The attributes to apply to the XML element
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlAddAttributes(&$xml, $attributes = array())
+	{
+		foreach ($attributes as $key => $value)
+		{
+			$xml->addAttribute($key, $value);
+		}
+	}
+
+	/**
+	 * xmlAddOptions
+	 *
+	 * @param   SimpleXMLElement   $xml          The XML element reference in which to inject a comment
+	 * @param   array              $options      The options to apply to the XML element
+	 *
+	 * @return  void
+	 *
+	 */
+	public static function xmlAddOptions(&$xml, $options = array())
+	{
+		foreach ($options as $key => $value)
+		{
+			$addOption = $xml->addChild('option');
+			$addOption->addAttribute('value', $key);
+			$addOption[] = $value;
+		}
+	}
+
+	/**
+	 * Render Bool Button
+	 *
+	 * @param   array    $args   All the args for the button
+	 *                             0) name
+	 *                             1) additional (options class) // not used at this time
+	 *                             2) default
+	 *                             3) yes (name)
+	 *                             4) no (name)
+	 *
+	 * @return  string    The input html of the button
+	 *
+	 */
 	public static function renderBoolButton()
 	{
 		$args = func_get_args();
+		// check if there is additional button class
+		$additional = isset($args[1]) ? (string) $args[1] : ''; // not used at this time
+		// start the xml
+		$buttonXML = new SimpleXMLElement('<field/>');
+		// button attributes
+		$buttonAttributes = array(
+			'type' => 'radio',
+			'name' => isset($args[0]) ? self::htmlEscape($args[0]) : 'bool_button',
+			'label' => isset($args[0]) ? self::safeString(self::htmlEscape($args[0]), 'Ww') : 'Bool Button', // not seen anyway
+			'class' => 'btn-group',
+			'filter' => 'INT',
+			'default' => isset($args[2]) ? (int) $args[2] : 0);
+		// load the haskey attributes
+		self::xmlAddAttributes($buttonXML, $buttonAttributes);
+		// set the button options
+		$buttonOptions = array(
+			'1' => isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES',
+			'0' => isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO');
+		// load the button options
+		self::xmlAddOptions($buttonXML, $buttonOptions);
 
 		// get the radio element
 		$button = JFormHelper::loadFieldType('radio');
 
-		// setup the properties
-		$name	 	= self::htmlEscape($args[0]);
-		$additional = isset($args[1]) ? (string) $args[1] : '';
-		$value		= $args[2];
-		$yes 	 	= isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES';
-		$no 	 	= isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO';
-
-		// prepare the xml
-		$element = new SimpleXMLElement('<field name="'.$name.'" type="radio" class="btn-group"><option '.$additional.' value="0">'.$no.'</option><option '.$additional.' value="1">'.$yes.'</option></field>');
-
 		// run
-		$button->setup($element, $value);
+		$button->setup($buttonXML, $buttonAttributes['default']);
 
 		return $button->input;
-
 	}###HELPER_UIKIT### ###HELPER_CREATEUSER###
 
+	/**
+	 * Get a variable 
+	 *
+	 * @param   string   $table        The table from which to get the variable
+	 * @param   string   $where        The value where
+	 * @param   string   $whereString  The target/field string where/name
+	 * @param   string   $what         The return field
+	 * @param   string   $operator     The operator between $whereString/field and $where/value
+	 * @param   string   $main         The component in which the table is found
+	 *
+	 * @return  mix string/int/float
+	 *
+	 */
 	public static function getVar($table, $where = null, $whereString = 'user', $what = 'id', $operator = '=', $main = '###component###')
 	{
 		if(!$where)
@@ -355,6 +481,20 @@ abstract class ###Component###Helper
 		return false;
 	}
 
+	/**
+	 * Get array of variables
+	 *
+	 * @param   string   $table        The table from which to get the variables
+	 * @param   string   $where        The value where
+	 * @param   string   $whereString  The target/field string where/name
+	 * @param   string   $what         The return field
+	 * @param   string   $operator     The operator between $whereString/field and $where/value
+	 * @param   string   $main         The component in which the table is found
+	 * @param   bool     $unique       The switch to return a unique array
+	 *
+	 * @return  array
+	 *
+	 */
 	public static function getVars($table, $where = null, $whereString = 'user', $what = 'id', $operator = 'IN', $main = '###component###', $unique = true)
 	{
 		if(!$where)

admin/compiler/joomla_3/JFormFieldList.php

@@ -43,7 +43,7 @@ class JFormField###Type### extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = '###type###'; ###ADD_BUTTON###
+	public $type = '###type###';###ADD_BUTTON###
 
 	/**
 	 * Method to get a list of options for a list input.

admin/compiler/joomla_3/JTable.php

@@ -265,7 +265,7 @@ class ###Component###Table###View### extends JTable
 						}
 					}
 					// check if there are any view values remaining
-					if (count($_result))
+					if (count( (array) $_result))
 					{
 						$_result = json_encode($_result);
 						$_result = array($_result);

admin/controllers/ajax.json.php

@@ -65,6 +65,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('getValidationRulesTable', 'ajax');
 		$this->registerTask('checkRuleName', 'ajax');
 		$this->registerTask('fieldOptions', 'ajax');
+		$this->registerTask('getFieldPropertyDesc', 'ajax');
 		$this->registerTask('snippetDetails', 'ajax');
 		$this->registerTask('setSnippetGithub', 'ajax');
 		$this->registerTask('getSnippets', 'ajax');
@@ -967,6 +968,45 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
+				case 'getFieldPropertyDesc':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$propertyValue = $jinput->get('property', NULL, 'WORD');
+						$fieldtypeValue = $jinput->get('fieldtype', NULL, 'ALNUM');
+						if($propertyValue && $fieldtypeValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->getFieldPropertyDesc($propertyValue, $fieldtypeValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
 				case 'snippetDetails':
 					try
 					{

admin/controllers/joomla_components.php

@@ -111,8 +111,6 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 
 	public function smartImport()
 	{
-		// Check for request forgeries
-		JSession::checkToken() or die(JText::_('JINVALID_TOKEN'));
 		// check if import is allowed for this user.
 		$user = JFactory::getUser();
 		if ($user->authorise('joomla_component.import', 'com_componentbuilder') && $user->authorise('core.import', 'com_componentbuilder'))

admin/helpers/compiler.php

@@ -170,7 +170,7 @@ class Compiler extends Infusion
 					foreach ($mismatch as $string)
 					{
 						$constant = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
-						$this->app->enqueueMessage(JText::sprintf('The <b>Joomla.JText._(\'%s\')</b> language constant for (%s) does not have a corresponding JText::Script() decalaration.', $constant, $string), 'Warning');
+						$this->app->enqueueMessage(JText::sprintf('The <b>Joomla.JText._(\'%s\')</b> language constant for <b>%s</b> does not have a corresponding <code>JText::script(\'%s\')</code> decalaration, please add it.', $constant, $string, $string), 'Warning');
 					}
 					$this->app->enqueueMessage('<hr />', 'Warning');
 				}
@@ -548,7 +548,7 @@ class Compiler extends Infusion
 						$lineBites[$lineNumber] = (int) mb_strlen($lineContent, '8bit');
 						if (!$found)
 						{
-							$bites = (int) bcadd($lineBites[$lineNumber], $bites);
+							$bites = (int) $this->bcmath('add', $lineBites[$lineNumber], $bites);
 						}
 						if ($found && !$foundEnd)
 						{
@@ -684,12 +684,12 @@ class Compiler extends Infusion
 		// Add the data
 		fwrite($fpFile, $data);
 		// truncate file at the end of the data that was added
-		$remove = bcadd($position, mb_strlen($data, '8bit'));
+		$remove = $this->bcmath('add', $position, mb_strlen($data, '8bit'));
 		ftruncate($fpFile, $remove);
 		// check if this was a replacement of data
 		if ($replace)
 		{
-			$position = bcadd($position, $replace);
+			$position = $this->bcmath('add', $position, $replace);
 		}
 		// move to the position of the data that should remain below the new data
 		fseek($fpTemp, $position);

admin/helpers/compiler/a_Get.php

@@ -250,7 +250,8 @@ class Get
 		'Joomla' . '.JText._(',
 		'JText:' . ':script(',
 		'JText:' . ':_(',
-		'JText:' . ':sprintf('
+		'JText:' . ':sprintf(',
+		'JustTEXT:' . ':_('
 	);
 
 	/**
@@ -3568,11 +3569,11 @@ class Get
 
 	/**
 	 * Set Language Place Holders
-	 * 
+	 *
 	 * @param   string   $content  The content
 	 *
 	 * @return  string The content with the updated Language place holder
-	 * 
+	 *
 	 */
 	public function setLangStrings($content)
 	{
@@ -3591,11 +3592,17 @@ class Get
 		{
 			// insure string is not broken
 			$content = str_replace('COM_###COMPONENT###', $this->langPrefix, $content);
-			// first get the Joomla.JText._()
+			// reset some buckets
+			$langHolders = array();
+			$langCheck = array();
+			$langOnly = array();
+			$jsTEXT = array();
+			$scTEXT = array();
+			// first get the Joomla .JText._()
 			if (in_array('Joomla' . '.JText._(', $langStringTargets))
 			{
 				$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
@@ -3621,50 +3628,89 @@ class Get
 					$this->langMatch = ComponentbuilderHelper::mergeArrays(array($scTEXT, $this->langMatch));
 				}
 			}
+			// now do the little trick for JustTEXT: :_('Just uppercase text');
+			if (in_array('JustTEXT:' . ':_(', $langStringTargets))
+			{
+				$langOnly[] = ComponentbuilderHelper::getAllBetween($content, "JustTEXT:" . ":_('", "')");
+				$langOnly[] = ComponentbuilderHelper::getAllBetween($content, 'JustTEXT:' . ':_("', '")');
+			}
 			// set language data
 			foreach ($langStringTargets as $langStringTarget)
 			{
 				// need some special treatment here
-				if ($langStringTarget === 'Joomla' . '.JText._(' || $langStringTarget === 'JText:' . ':script(')
+				if ($langStringTarget === 'Joomla' . '.JText._(' ||
+					$langStringTarget === 'JText:' . ':script(' ||
+					$langStringTarget === 'JustTEXT:' . ':_(')
 				{
 					continue;
 				}
 				$langCheck[] = ComponentbuilderHelper::getAllBetween($content, $langStringTarget . "'", "'");
 				$langCheck[] = ComponentbuilderHelper::getAllBetween($content, $langStringTarget . '"', '"');
 			}
-			$langArray = ComponentbuilderHelper::mergeArrays($langCheck);
-			if (ComponentbuilderHelper::checkArray($langArray)) //<-- not really needed hmmm
+			// the normal loading of the language strings
+			$langCheck = ComponentbuilderHelper::mergeArrays($langCheck);
+			if (ComponentbuilderHelper::checkArray($langCheck)) //<-- not really needed hmmm
 			{
-				foreach ($langArray as $string)
+				foreach ($langCheck as $string)
 				{
-					// this is there to insure we dont break already added Language strings
-					if (ComponentbuilderHelper::safeString($string, 'U') === $string)
+					if ($keyLang = $this->setLang($string))
 					{
-						continue;
-					}
-					// only load if string is not already set
-					$keyLang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
-					if (!isset($this->langContent[$this->lang][$keyLang]))
-					{
-						$this->langContent[$this->lang][$keyLang] = trim($string);
-					}
-					// load the language targets
-					foreach ($langStringTargets as $langStringTarget)
-					{
-						$langHolders[$langStringTarget . "'" . $string . "'"] = $langStringTarget . "'" . $keyLang . "'";
-						$langHolders[$langStringTarget . '"' . $string . '"'] = $langStringTarget . '"' . $keyLang . '"';
+						// load the language targets
+						foreach ($langStringTargets as $langStringTarget)
+						{
+							$langHolders[$langStringTarget . "'" . $string . "'"] = $langStringTarget . "'" . $keyLang . "'";
+							$langHolders[$langStringTarget . '"' . $string . '"'] = $langStringTarget . '"' . $keyLang . '"';
+						}
 					}
 				}
-				// only continue if we have value to replace
-				if (isset($langHolders) && ComponentbuilderHelper::checkArray($langHolders))
+			}
+			// the uppercase loading only (for arrays and other tricks)
+			if (ComponentbuilderHelper::checkArray($langOnly))
+			{
+				$langOnly = ComponentbuilderHelper::mergeArrays($langOnly);
+				foreach ($langOnly as $string)
 				{
-					$content = $this->setPlaceholders($content, $langHolders);
+					if ($keyLang = $this->setLang($string))
+					{
+						// load the language targets
+						$langHolders["JustTEXT:" . ":_('" . $string . "')"] = "'" . $keyLang . "'";
+						$langHolders['JustTEXT:' . ':_("' . $string . '")'] = '"' . $keyLang . '"';
+					}
 				}
 			}
+			// only continue if we have value to replace
+			if (ComponentbuilderHelper::checkArray($langHolders))
+			{
+				$content = $this->setPlaceholders($content, $langHolders);
+			}
 		}
 		return $content;
 	}
 
+	/**
+	 * Set the language String
+	 * 
+	 * @param   string   $string  The plan text string (English)
+	 *
+	 * @return  string   The key language string (all uppercase)
+	 * 
+	 */
+	public function setLang($string)
+	{
+		// this is there to insure we dont break already added Language strings
+		if (ComponentbuilderHelper::safeString($string, 'U') === $string)
+		{
+			return false;
+		}
+		// only load if string is not already set
+		$keyLang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
+		if (!isset($this->langContent[$this->lang][$keyLang]))
+		{
+			$this->langContent[$this->lang][$keyLang] = trim($string);
+		}
+		return $keyLang;
+	}
+
 	/**
 	 * Set Data Selection of the dynamic get
 	 * 
@@ -5490,13 +5536,12 @@ class Get
 	 * @param   string   $data          The actual data
 	 * @param   array    $placeholder   The placeholders
 	 * @param   int      $action        The action to use
-	 * ===================================================
+	 * 
 	 * THE ACTION OPTIONS ARE
-	 * ===================================================
 	 * 1 -> Just replace (default)
 	 * 2 -> Check if data string has placeholders
 	 * 3 -> Remove placeholders not in data string
-	 * ===================================================
+	 * 
 	 * @param   int      $langSwitch    The lang switch
 	 *
 	 * @return  string
@@ -5665,4 +5710,46 @@ class Get
 		return false;
 	}
 
+	/**
+	 * bc math wrapper (very basic not for accounting)
+	 * 
+	 * @param   string   $type    The type bc math
+	 * @param   int      $val1    The first value
+	 * @param   int      $val2    The second value
+	 *
+	 * @return int
+	 * 
+	 */
+	public function bcmath($type, $val1, $val2)
+	{
+		// build function name
+		$function = 'bc'.$type;
+		// use the bcmath function of available
+		if (function_exists($function))
+		{
+			return $function($val1, $val2);
+		}
+		// if function does not exist we use +-*/ operators (since it realy not that serious)
+		switch($type)
+		{
+			// Multiply two numbers
+			case 'mul':
+				return round($val1 * $val2);
+			break;
+			// Divide of two numbers
+			case 'div':
+				return round($val1 / $val2);
+			break;
+			// Adding two numbers
+			case 'add':
+				return round($val1 + $val2);
+			break;
+			// Subtract one number from the other
+			case 'add':
+				return round($val1 - $val2);
+			break;
+		}
+		return false;
+	}
+
 }

admin/helpers/compiler/b_Structure.php

@@ -1369,6 +1369,8 @@ class Structure extends Get
 				// set new file to object
 				$versionData->move->static->$key_pointer = new stdClass();
 				$versionData->move->static->$key_pointer->naam = $custom['file'];
+				// update the dynamic component name placholders in file names
+				$custom['path'] = $this->setPlaceholders($custom['path'], $this->placeholders);
 				// get the path info
 				$pathInfo = pathinfo($custom['path']);
 				if (isset($pathInfo['extension']) && $pathInfo['extension'])

admin/helpers/compiler/c_Fields.php

@@ -755,8 +755,8 @@ class Fields extends Structure
 		$XML = new simpleXMLElement('<a/>');
 		$fieldSetXML = $XML->addChild('fieldset');
 		$fieldSetXML->addAttribute('name', 'details');
-		$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Default Fields.");
-		$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Id Field. Type: Text (joomla)");
+		ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Default Fields.");
+		ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Id Field. Type: Text (joomla)");
 		// if id is not set
 		if (!isset($this->fieldsNames[$view_name_single]['id']))
 		{
@@ -770,7 +770,7 @@ class Fields extends Structure
 				'default' => 0
 			);
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -787,9 +787,9 @@ class Fields extends Structure
 				'filter' => 'user_utc'
 			);
 			$attributes = array_merge($attributes, $readOnlyXML);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -803,9 +803,9 @@ class Fields extends Structure
 				'description' => $langView . '_CREATED_BY_DESC',
 			);
 			$attributes = array_merge($attributes, $readOnlyXML);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " User Created Field. Type: User (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " User Created Field. Type: User (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -818,9 +818,9 @@ class Fields extends Structure
 				'label' => 'JSTATUS'
 			);
 			$attributes = array_merge($attributes, $readOnlyXML);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Published Field. Type: List (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Published Field. Type: List (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 			foreach (array('JPUBLISHED' => 1, 'JUNPUBLISHED' => 0, 'JARCHIVED' => 2, 'JTRASHED' => -2) as $text => $value)
@@ -844,9 +844,9 @@ class Fields extends Structure
 				'format' => '%Y-%m-%d %H:%M:%S',
 				'filter' => 'user_utc'
 			);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -862,9 +862,9 @@ class Fields extends Structure
 				'readonly' => 'true',
 				'filter' => 'unset'
 			);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -880,9 +880,9 @@ class Fields extends Structure
 				'required' => "false"
 			);
 			$attributes = array_merge($attributes, $readOnlyXML);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -900,9 +900,9 @@ class Fields extends Structure
 				'required' => "false"
 			);
 			$attributes = array_merge($attributes, $readOnlyXML);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -919,9 +919,9 @@ class Fields extends Structure
 				'readonly' => "true",
 				'filter' => 'unset'
 			);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Version Field. Type: Text (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Version Field. Type: Text (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -937,34 +937,34 @@ class Fields extends Structure
 				'rows' => 3,
 				'cols' => 30
 			);
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 			// metadesc
 			$attributes['name'] = 'metadesc';
 			$attributes['label'] = 'JFIELD_META_DESCRIPTION_LABEL';
 			$attributes['description'] = 'JFIELD_META_DESCRIPTION_DESC';
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla)");
 			$fieldXML = $fieldSetXML->addChild('field');
-			$this->xmlAddAttributes($fieldXML, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($fieldXML, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
 		// load the dynamic fields now
 		if (count($dynamicFieldsXML))
 		{
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Dynamic Fields.");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Dynamic Fields.");
 			foreach ($dynamicFieldsXML as $dynamicfield)
 			{
-				$this->xmlAppend($fieldSetXML, $dynamicfield);
+				ComponentbuilderHelper::xmlAppend($fieldSetXML, $dynamicfield);
 			}
 		}
 		// check if metadata is added to this view
 		if (isset($this->metadataBuilder[$view_name_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view_name_single]))
 		{
-			$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadata Fields");
+			ComponentbuilderHelper::xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadata Fields");
 			$fieldsXML = $fieldSetXML->addChild('fields');
 			$fieldsXML->addAttribute('name', 'metadata');
 			$fieldsXML->addAttribute('label', 'JGLOBAL_FIELDSET_METADATA_OPTIONS');
@@ -972,7 +972,7 @@ class Fields extends Structure
 			$fieldsFieldSetXML->addAttribute('name', 'vdmmetadata');
 			$fieldsFieldSetXML->addAttribute('label', 'JGLOBAL_FIELDSET_METADATA_OPTIONS');
 			// robots
-			$this->xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Robots Field. Type: List (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Robots Field. Type: List (joomla)");
 			$robots = $fieldsFieldSetXML->addChild('field');
 			$attributes = array(
 				'name' => 'robots',
@@ -980,7 +980,7 @@ class Fields extends Structure
 				'label' => 'JFIELD_METADATA_ROBOTS_LABEL',
 				'description' => 'JFIELD_METADATA_ROBOTS_DESC'
 			);
-			$this->xmlAddAttributes($robots, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($robots, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 			$options = array(
@@ -997,7 +997,7 @@ class Fields extends Structure
 				$option[] = $text;
 			}
 			// author
-			$this->xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Author Field. Type: Text (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Author Field. Type: Text (joomla)");
 			$author = $fieldsFieldSetXML->addChild('field');
 			$attributes = array(
 				'name' => 'author',
@@ -1006,11 +1006,11 @@ class Fields extends Structure
 				'description' => 'JFIELD_METADATA_AUTHOR_DESC',
 				'size' => 20
 			);
-			$this->xmlAddAttributes($author, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($author, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 			// rights
-			$this->xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla)");
+			ComponentbuilderHelper::xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla)");
 			$rights = $fieldsFieldSetXML->addChild('field');
 			$attributes = array(
 				'name' => 'rights',
@@ -1022,7 +1022,7 @@ class Fields extends Structure
 				'cols' => 30,
 				'rows' => 2
 			);
-			$this->xmlAddAttributes($rights, $attributes);
+			ComponentbuilderHelper::xmlAddAttributes($rights, $attributes);
 			// count the static field created
 			$this->fieldCount++;
 		}
@@ -1581,7 +1581,7 @@ class Fields extends Structure
 				}
 				elseif ($property === 'option')
 				{
-					$this->xmlComment($field->fieldXML, $this->setLine(__LINE__) . " Option Set.");
+					ComponentbuilderHelper::xmlComment($field->fieldXML, $this->setLine(__LINE__) . " Option Set.");
 					if (strpos($value, ',') !== false)
 					{
 						// mulitpal options
@@ -1644,7 +1644,7 @@ class Fields extends Structure
 			}
 			if (!$field->fieldXML->count())
 			{
-				$this->xmlComment($field->fieldXML, $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings.");
+				ComponentbuilderHelper::xmlComment($field->fieldXML, $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings.");
 			}
 		}
 		elseif ($setType === 'plain')
@@ -1733,12 +1733,12 @@ class Fields extends Structure
 								if ($this->defaultField($r_typeName, 'option'))
 								{
 									// now add to the field set
-									$this->xmlAppend($fieldSetXML, $this->setField('option', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
+									ComponentbuilderHelper::xmlAppend($fieldSetXML, $this->setField('option', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 								}
 								elseif ($this->defaultField($r_typeName, 'plain'))
 								{
 									// now add to the field set
-									$this->xmlAppend($fieldSetXML, $this->setField('plain', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
+									ComponentbuilderHelper::xmlAppend($fieldSetXML, $this->setField('plain', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 								}
 								elseif (ComponentbuilderHelper::checkArray($r_fieldValues['custom']))
 								{
@@ -1746,7 +1746,7 @@ class Fields extends Structure
 									$custom = $r_fieldValues['custom'];
 									unset($r_fieldValues['custom']);
 									// now add to the field set
-									$this->xmlAppend($fieldSetXML, $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
+									ComponentbuilderHelper::xmlAppend($fieldSetXML, $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 									// set lang (just incase)
 									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
 									// add to lang array
@@ -1794,7 +1794,7 @@ class Fields extends Structure
 						'name' => 'list_' . $fieldAttributes['name'] . '_modal',
 						'repeat' => 'true'
 					);
-					$this->xmlAddAttributes($form, $attributes);
+					ComponentbuilderHelper::xmlAddAttributes($form, $attributes);
 
 					if (strpos($fieldAttributes['fields'], ',') !== false)
 					{
@@ -1830,12 +1830,12 @@ class Fields extends Structure
 									if ($this->defaultField($r_typeName, 'option'))
 									{
 										// now add to the field set
-										$this->xmlAppend($form, $this->setField('option', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
+										ComponentbuilderHelper::xmlAppend($form, $this->setField('option', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 									}
 									elseif ($this->defaultField($r_typeName, 'plain'))
 									{
 										// now add to the field set
-										$this->xmlAppend($form, $this->setField('plain', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
+										ComponentbuilderHelper::xmlAppend($form, $this->setField('plain', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 									}
 									elseif (ComponentbuilderHelper::checkArray($r_fieldValues['custom']))
 									{
@@ -1843,7 +1843,7 @@ class Fields extends Structure
 										$custom = $r_fieldValues['custom'];
 										unset($r_fieldValues['custom']);
 										// now add to the field set
-										$this->xmlAppend($form, $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
+										ComponentbuilderHelper::xmlAppend($form, $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 										// set lang (just incase)
 										$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
 										// add to lang array
@@ -2160,6 +2160,15 @@ class Fields extends Structure
 				{
 					// dont load the button to repeatable
 					$xmlValue = 'false';
+					// do not add button
+					$fieldAttributes['custom']['add_button'] = 'false';
+				}
+				elseif ($property['name'] === 'button' && $setCustom)
+				{
+					// dont load the button to repeatable
+					$xmlValue = (string) ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'button="', '"'));
+					// add to custom values
+					$fieldAttributes['custom']['add_button'] = (ComponentbuilderHelper::checkString($xmlValue) || 1 == $xmlValue) ? $xmlValue: 'false';
 				}
 				elseif ($property['name'] === 'required' && $repeatable)
 				{
@@ -2334,7 +2343,14 @@ class Fields extends Structure
 	 */
 	public function setBuilders($langLabel, $langView, $view_name_single, $view_name_list, $name, $view, $field, $typeName, $multiple, $custom = false, $options = false)
 	{
-		if ($typeName === 'tag')
+		// dbSwitch
+		$dbSwitch = true;
+		if (isset($field['list']) && $field['list'] == 2)
+		{
+			// do not add this field to the database
+			$dbSwitch = false;
+		}
+		elseif ($typeName === 'tag')
 		{
 			// set tags for this view but don't load to DB
 			$this->tagsBuilder[$view_name_single] = $view_name_single;
@@ -2393,12 +2409,12 @@ class Fields extends Structure
 			$this->historyBuilder[$view_name_single] = $view_name_single;
 		}
 		// set Alias (only one title per view)
-		if (isset($field['alias']) && $field['alias'] && !isset($this->aliasBuilder[$view_name_single]))
+		if ($dbSwitch && isset($field['alias']) && $field['alias'] && !isset($this->aliasBuilder[$view_name_single]))
 		{
 			$this->aliasBuilder[$view_name_single] = $name;
 		}
 		// set Titles (only one title per view)
-		if (isset($field['title']) && $field['title'] && !isset($this->titleBuilder[$view_name_single]))
+		if ($dbSwitch && isset($field['title']) && $field['title'] && !isset($this->titleBuilder[$view_name_single]))
 		{
 			$this->titleBuilder[$view_name_single] = $name;
 		}
@@ -2458,7 +2474,7 @@ class Fields extends Structure
 			$this->hiddenFieldsBuilder[$view_name_single] .= ',"' . $name . '"';
 		}
 		// set all int fields of this view
-		if ($field['settings']->datatype === 'INT' || $field['settings']->datatype === 'TINYINT' || $field['settings']->datatype === 'BIGINT')
+		if ($dbSwitch && ($field['settings']->datatype === 'INT' || $field['settings']->datatype === 'TINYINT' || $field['settings']->datatype === 'BIGINT'))
 		{
 			if (!isset($this->intFieldsBuilder[$view_name_single]))
 			{
@@ -2484,7 +2500,7 @@ class Fields extends Structure
 		}
 		// TODO we may need to add a switch instead (since now it uses the first editor field)
 		// set the main(biggest) text field of this view
-		if ($typeName === 'editor')
+		if ($dbSwitch && $typeName === 'editor')
 		{
 			if (!isset($this->maintextBuilder[$view_name_single]) || !ComponentbuilderHelper::checkString($this->maintextBuilder[$view_name_single]))
 			{
@@ -2516,7 +2532,7 @@ class Fields extends Structure
 			$this->setScriptMediaSwitch[$typeName] = $typeName;
 		}
 		// setup gategory for this view
-		if ($typeName === 'category')
+		if ($dbSwitch && $typeName === 'category')
 		{
 			if (isset($this->catOtherName[$view_name_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$view_name_list]))
 			{
@@ -2533,12 +2549,12 @@ class Fields extends Structure
 			$this->catCodeBuilder[$view_name_single] = array('code' => $name, 'views' => $otherViews, 'view' => $otherView);
 		}
 		// setup checkbox for this view
-		if ($typeName === 'checkbox' || (ComponentbuilderHelper::checkArray($custom) && isset($custom['extends']) && $custom['extends'] === 'checkboxes'))
+		if ($dbSwitch && ($typeName === 'checkbox' || (ComponentbuilderHelper::checkArray($custom) && isset($custom['extends']) && $custom['extends'] === 'checkboxes')))
 		{
 			$this->checkboxBuilder[$view_name_single][] = $name;
 		}
 		// setup checkboxes and other json items for this view
-		if (($typeName === 'subform' || $typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && $typeName != 'tag')
+		if ($dbSwitch && (($typeName === 'subform' || $typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && $typeName != 'tag'))
 		{
 			switch ($field['settings']->store)
 			{
@@ -2605,7 +2621,7 @@ class Fields extends Structure
 			}
 		}
 		// build the data for the export & import methods $typeName === 'repeatable' ||
-		if (($typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && !ComponentbuilderHelper::checkArray($options))
+		if ($dbSwitch && (($typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && !ComponentbuilderHelper::checkArray($options)))
 		{
 			$this->getItemsMethodEximportStringFixBuilder[$view_name_single][] = array('name' => $name, 'type' => $typeName, 'translation' => false, 'custom' => $custom, 'method' => $field['settings']->store);
 		}
@@ -2617,18 +2633,18 @@ class Fields extends Structure
 			$this->selectionTranslationFixBuilder[$view_name_list][$name] = $options;
 		}
 		// build the sort values
-		if ((isset($field['sort']) && $field['sort'] == 1) && (isset($field['list']) && $field['list'] == 1) && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
+		if ($dbSwitch && (isset($field['sort']) && $field['sort'] == 1) && (isset($field['list']) && $field['list'] == 1) && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
 		{
 			$this->sortBuilder[$view_name_list][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom, 'options' => $options);
 		}
 		// build the search values
-		if (isset($field['search']) && $field['search'] == 1)
+		if ($dbSwitch && isset($field['search']) && $field['search'] == 1)
 		{
 			$_list = (isset($field['list'])) ? $field['list'] : 0;
 			$this->searchBuilder[$view_name_list][] = array('type' => $typeName, 'code' => $name, 'custom' => $custom, 'list' => $_list);
 		}
 		// build the filter values
-		if ((isset($field['filter']) && $field['filter'] == 1) && (isset($field['list']) && $field['list'] == 1) && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
+		if ($dbSwitch && (isset($field['filter']) && $field['filter'] == 1) && (isset($field['list']) && $field['list'] == 1) && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
 		{
 			$this->filterBuilder[$view_name_list][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'database' => $view_name_single, 'function' => ComponentbuilderHelper::safeString($name, 'F'), 'custom' => $custom, 'options' => $options);
 		}
@@ -2647,6 +2663,16 @@ class Fields extends Structure
 		$this->setLayoutBuilder($view_name_single, $tabName, $name, $field);
 	}
 
+	/**
+	 * set Custom Field Type File
+	 *
+	 * @param   array   $data              The field complete data set
+	 * @param   string  $view_name_list    The list view code name
+	 * @param   string  $view_name_single  The single view code name
+	 *
+	 * @return  void
+	 *
+	 */
 	public function setCustomFieldTypeFile($data, $view_name_list, $view_name_single)
 	{
 		// make sure it is not already been build or if it is prime
@@ -2700,11 +2726,12 @@ class Fields extends Structure
 			{
 				$phpCode = 'return null;';
 			}
+			// catch empty stuff
 			if (!ComponentbuilderHelper::checkString($phpCode))
 			{
 				$phpCode = 'return null;';
 			}
-
+			// some house cleaning for users
 			if ($data['custom']['extends'] === 'user')
 			{
 				// now load the php xclude script
@@ -2761,10 +2788,203 @@ class Fields extends Structure
 			// ###type### <<<DYNAMIC>>>
 			$this->fileContentDynamic['customfield_' . $data['type']]['###type###'] = $data['custom']['type'];
 			// ###type### <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_' . $data['type']]['###ADD_BUTTON###'] = $this->setAddButttonToListField($data['custom']['view'], $data['custom']['views']);
+			$this->fileContentDynamic['customfield_' . $data['type']]['###ADD_BUTTON###'] = $this->setAddButtonToListField($data['custom']);
 		}
 	}
 
+	/**
+	 * set Add Button To List Field (getInput tweak)
+	 *
+	 * @param   array  $fieldData   The field custom data
+	 *
+	 * @return  string of getInput class on success empty string otherwise
+	 *
+	 */
+	protected function setAddButtonToListField($fieldData)
+	{
+		// make sure hte view values are set
+		if (isset($fieldData['add_button']) && ($fieldData['add_button'] === 'true' || 1 == $fieldData['add_button']) &&
+			isset($fieldData['view']) && isset($fieldData['views']) &&
+			ComponentbuilderHelper::checkString($fieldData['view']) && ComponentbuilderHelper::checkString($fieldData['views']))
+		{		
+			// check that the component value is set
+			if (!isset($fieldData['component']) || !ComponentbuilderHelper::checkString($fieldData['component']))
+			{
+				$fieldData['component'] = "com_" . $this->fileContentStatic['###component###'];
+			}
+			// check that the componet has the com_ value in it
+			if (strpos($fieldData['component'], 'com_') === false || strpos($fieldData['component'], '=') !== false)
+			{
+				$fieldData['component'] = "com_" . $fieldData['component'];
+			}
+			// make sure the component is update if ### or [[[ component placeholder is used
+			if (strpos($fieldData['component'], '###') !== false || strpos($fieldData['component'], '[[[') !== false ) // should not be needed... but
+			{
+				$fieldData['component'] = $this->setPlaceholders($fieldData['component'], $this->placeholders);
+			}
+			// get core permissions
+			$coreLoad = false;
+			// add ref tags
+			$refLoad = true;
+			if (isset($this->permissionCore[$fieldData['view']]))
+			{
+				// get the core permission naming array
+				$core = $this->permissionCore[$fieldData['view']];
+				// set switch to activate easy update
+				$coreLoad = true;
+				// since the view is local to the component use this component name
+				$component = "com_" . $this->fileContentStatic['###component###'];
+			}
+			else
+			{
+				// fall back on the field component
+				$component = $fieldData['component'];
+			}
+			// check if we should add ref tags
+			if ($fieldData['component'] !== $component)
+			{
+				// do not add ref tags
+				$refLoad = false;
+			}
+			// start building the add buttons/s
+			$addButton = array();
+			$addButton[] = PHP_EOL . PHP_EOL . "\t/**";
+			$addButton[] = "\t * Override to add new button";
+			$addButton[] = "\t *";
+			$addButton[] = "\t * @return  string  The field input markup.";
+			$addButton[] = "\t *";
+			$addButton[] = "\t * @since   3.2";
+			$addButton[] = "\t */";
+			$addButton[] = "\tprotected function getInput()";
+			$addButton[] = "\t{";
+			$addButton[] = "\t\t//" . $this->setLine(__LINE__) . " see if we should add buttons";
+			$addButton[] = "\t\t\$setButton = \$this->getAttribute('button');";
+			$addButton[] = "\t\t//" . $this->setLine(__LINE__) . " get html";
+			$addButton[] = "\t\t\$html = parent::getInput();";
+			$addButton[] = "\t\t//" . $this->setLine(__LINE__) . " if true set button";
+			$addButton[] = "\t\tif (\$setButton === 'true')";
+			$addButton[] = "\t\t{";
+			$addButton[] = "\t\t\t\$button = array();";
+			$addButton[] = "\t\t\t\$script = array();";
+			$addButton[] = "\t\t\t\$buttonName = \$this->getAttribute('name');";
+			$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " get the input from url";
+			$addButton[] = "\t\t\t\$app = JFactory::getApplication();";
+			$addButton[] = "\t\t\t\$jinput = \$app->input;";
+			$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " get the view name & id";
+			$addButton[] = "\t\t\t\$values = \$jinput->getArray(array(";
+			$addButton[] = "\t\t\t\t'id' => 'int',";
+			$addButton[] = "\t\t\t\t'view' => 'word'";
+			$addButton[] = "\t\t\t));";
+			$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " check if new item";
+			$addButton[] = "\t\t\t\$ref = '';";
+			$addButton[] = "\t\t\t\$refJ = '';";
+			if ($refLoad)
+			{
+				$addButton[] = "\t\t\tif (!is_null(\$values['id']) && strlen(\$values['view']))";
+				$addButton[] = "\t\t\t{";
+				$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " only load referal if not new item.";
+				$addButton[] = "\t\t\t\t\$ref = '&amp;ref=' . \$values['view'] . '&amp;refid=' . \$values['id'];";
+				$addButton[] = "\t\t\t\t\$refJ = '&ref=' . \$values['view'] . '&refid=' . \$values['id'];";
+				$addButton[] = "\t\t\t}";
+			}
+			else
+			{
+				$addButton[] = "\t\t\tif (!is_null(\$values['id']) && strlen(\$values['view']))";
+				$addButton[] = "\t\t\t{";
+				$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " get the return value.";
+				$addButton[] = "\t\t\t\t\$_uri = (string) JUri::getInstance();";
+				$addButton[] = "\t\t\t\t\$_return = urlencode(base64_encode(\$_uri));";
+				$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " load return value.";
+				$addButton[] = "\t\t\t\t\$ref = '&amp;return=' . \$_return;";
+				$addButton[] = "\t\t\t\t\$refJ = '&return=' . \$_return;";
+				$addButton[] = "\t\t\t}";
+			}
+			$addButton[] = "\t\t\t\$user = JFactory::getUser();";
+			$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " only add if user allowed to create " . $fieldData['view'];	
+			// check if the item has permissions.
+			if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($fieldData['view'], $this->permissionBuilder['global'][$core['core.create']]))
+			{
+				$addButton[] = "\t\t\tif (\$user->authorise('" . $core['core.create'] . "', '" . $component . "') && \$app->isAdmin()) // TODO for now only in admin area.";
+			}
+			else
+			{
+				$addButton[] = "\t\t\tif (\$user->authorise('core.create', '" . $component . "') && \$app->isAdmin()) // TODO for now only in admin area.";
+			}
+			$addButton[] = "\t\t\t{";
+			$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " build Create button";
+			$addButton[] = "\t\t\t\t\$buttonNamee = trim(\$buttonName);";
+			$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
+			$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
+			$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
+			$addButton[] = "\t\t\t\t\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
+			$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Create\" class=\"btn btn-small btn-success hasTooltip\" title=\"'.JText:" . ":sprintf('" . $this->langPrefix . "_CREATE_NEW_S', \$buttonNamee).'\" style=\"border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;\"";
+			$addButton[] = "\t\t\t\t\thref=\"index.php?option=" . $fieldData['component'] . "&amp;view=" . $fieldData['view'] . "&amp;layout=edit'.\$ref.'\" >";
+			$addButton[] = "\t\t\t\t\t<span class=\"icon-new icon-white\"></span></a>';";
+			$addButton[] = "\t\t\t}";
+			$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " only add if user allowed to edit " . $fieldData['view'];
+			// check if the item has permissions.
+			if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($fieldData['view'], $this->permissionBuilder['global'][$core['core.edit']]))
+			{
+				$addButton[] = "\t\t\tif ((\$buttonName === '" . $fieldData['view'] . "' || \$buttonName === '" . $fieldData['views'] . "') && \$user->authorise('" . $core['core.edit'] . "', '" . $component . "') && \$app->isAdmin()) // TODO for now only in admin area.";
+			}
+			else
+			{
+				$addButton[] = "\t\t\tif ((\$buttonName === '" . $fieldData['view'] . "' || \$buttonName === '" . $fieldData['views'] . "')  && \$user->authorise('core.edit', '" . $component . "') && \$app->isAdmin()) // TODO for now only in admin area.";
+			}
+			$addButton[] = "\t\t\t{";
+			$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " build edit button";
+			$addButton[] = "\t\t\t\t\$buttonNamee = trim(\$buttonName);";
+			$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
+			$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
+			$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
+			$addButton[] = "\t\t\t\t\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
+			$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.JText:" . ":sprintf('" . $this->langPrefix . "_EDIT_S', \$buttonNamee).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
+			$addButton[] = "\t\t\t\t\t<span class=\"icon-edit\"></span></a>';";
+			$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " build script";
+			$addButton[] = "\t\t\t\t\$script[] = \"";
+			$addButton[] = "\t\t\t\t\tjQuery(document).ready(function() {";
+			$addButton[] = "\t\t\t\t\t\tjQuery('#adminForm').on('change', '#jform_\".\$buttonName.\"',function (e) {";
+			$addButton[] = "\t\t\t\t\t\t\te.preventDefault();";
+			$addButton[] = "\t\t\t\t\t\t\tvar \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
+			$addButton[] = "\t\t\t\t\t\t\t\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
+			$addButton[] = "\t\t\t\t\t\t});";
+			$addButton[] = "\t\t\t\t\t\tvar \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
+			$addButton[] = "\t\t\t\t\t\t\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
+			$addButton[] = "\t\t\t\t\t});";
+			$addButton[] = "\t\t\t\t\tfunction \".\$buttonName.\"Button(value) {";
+			$addButton[] = "\t\t\t\t\t\tif (value > 0) {"; // TODO not ideal since value may not be an (int)
+			$addButton[] = "\t\t\t\t\t\t\t// hide the create button";
+			$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Create').hide();";
+			$addButton[] = "\t\t\t\t\t\t\t// show edit button";
+			$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').show();";
+			$addButton[] = "\t\t\t\t\t\t\tvar url = 'index.php?option=" . $fieldData['component'] . "&view=" . $fieldData['views'] . "&task=" . $fieldData['view'] . ".edit&id='+value+'\".\$refJ.\"';"; // TODO this value may not be the ID
+			$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').attr('href', url);";
+			$addButton[] = "\t\t\t\t\t\t} else {";
+			$addButton[] = "\t\t\t\t\t\t\t// show the create button";
+			$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Create').show();";
+			$addButton[] = "\t\t\t\t\t\t\t// hide edit button";
+			$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').hide();";
+			$addButton[] = "\t\t\t\t\t\t}";
+			$addButton[] = "\t\t\t\t\t}\";";
+			$addButton[] = "\t\t\t}";
+			$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " check if button was created for " . $fieldData['view'] . " field.";
+			$addButton[] = "\t\t\tif (is_array(\$button) && count(\$button) > 0)";
+			$addButton[] = "\t\t\t{";
+			$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " Load the needed script.";
+			$addButton[] = "\t\t\t\t\$document = JFactory::getDocument();";
+			$addButton[] = "\t\t\t\t\$document->addScriptDeclaration(implode(' ',\$script));";
+			$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " return the button attached to input field.";
+			$addButton[] = "\t\t\t\treturn '<div class=\"input-append\">' .\$html . implode('',\$button).'</div>';";
+			$addButton[] = "\t\t\t}";
+			$addButton[] = "\t\t}";
+			$addButton[] = "\t\treturn \$html;";
+			$addButton[] = "\t}";
+
+			return implode(PHP_EOL, $addButton);
+		}
+		return '';
+	}
+
 	/**
 	 * default Fields
 	 *
@@ -2817,78 +3037,6 @@ class Fields extends Structure
 		return false;
 	}
 
-	/**
-	 * xmlComment
-	 *
-	 * @param   SimpleXMLElement   $xml The XML element reference in which to inject a comment
-	 * @param   string  $comment The comment to inject
-	 *
-	 * @return  null
-	 *
-	 */
-	public function xmlComment(&$xml, $comment)
-	{
-		$domXML = dom_import_simplexml($xml);
-		$domComment = new DOMComment($comment);
-		$nodeTarget = $domXML->ownerDocument->importNode($domComment, true);
-		$domXML->appendChild($nodeTarget);
-		$xml = simplexml_import_dom($domXML);
-	}
-
-	/**
-	 * xmlAddAttributes
-	 *
-	 * @param   SimpleXMLElement   $xml The XML element reference in which to inject a comment
-	 * @param   array  $attributes The attributes to apply to the XML element
-	 *
-	 * @return  null
-	 *
-	 */
-	public function xmlAddAttributes(&$xml, $attributes = array())
-	{
-		foreach ($attributes as $key => $value)
-		{
-			$xml->addAttribute($key, $value);
-		}
-	}
-
-	/**
-	 * xmlAppend
-	 *
-	 * @param   SimpleXMLElement   $xml The XML element reference in which to inject a comment
-	 * @param   mixed  $node A SimpleXMLElement node to append to the XML element reference, or a stdClass object containing a comment attribute to be injected before the XML node and a fieldXML attribute containing a SimpleXMLElement
-	 *
-	 * @return  null
-	 *
-	 */
-	public function xmlAppend(&$xml, $node)
-	{
-		if (!$node)
-		{
-			// element was not returned
-			return;
-		}
-		switch (get_class($node))
-		{
-			case 'stdClass':
-				if (property_exists($node, 'comment'))
-				{
-					$this->xmlComment($xml, $node->comment);
-				}
-				if (property_exists($node, 'fieldXML'))
-				{
-					$this->xmlAppend($xml, $node->fieldXML);
-				}
-				break;
-			case 'SimpleXMLElement':
-				$domXML = dom_import_simplexml($xml);
-				$domNode = dom_import_simplexml($node);
-				$domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
-				$xml = simplexml_import_dom($domXML);
-				break;
-		}
-	}
-
 	/**
 	 * xmlPrettyPrint
 	 *

admin/helpers/compiler/e_Interpretation.php

@@ -8676,136 +8676,6 @@ class Interpretation extends Fields
 		}
 	}
 
-	public function setAddButttonToListField($targetView, $targetViews)
-	{
-		$addButton = array();
-		$addButton[] = PHP_EOL . "\t/**";
-		$addButton[] = "\t * Override to add new button";
-		$addButton[] = "\t *";
-		$addButton[] = "\t * @return  string  The field input markup.";
-		$addButton[] = "\t *";
-		$addButton[] = "\t * @since   3.2";
-		$addButton[] = "\t */";
-		$addButton[] = "\tprotected function getInput()";
-		$addButton[] = "\t{";
-		$addButton[] = "\t\t//" . $this->setLine(__LINE__) . " see if we should add buttons";
-		$addButton[] = "\t\t\$setButton = \$this->getAttribute('button');";
-		$addButton[] = "\t\t//" . $this->setLine(__LINE__) . " get html";
-		$addButton[] = "\t\t\$html = parent::getInput();";
-		$addButton[] = "\t\t//" . $this->setLine(__LINE__) . " if true set button";
-		$addButton[] = "\t\tif (\$setButton === 'true')";
-		$addButton[] = "\t\t{";
-		$addButton[] = "\t\t\t\$button = array();";
-		$addButton[] = "\t\t\t\$script = array();";
-		$addButton[] = "\t\t\t\$buttonName = \$this->getAttribute('name');";
-		$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " get the input from url";
-		$addButton[] = "\t\t\t\$app = JFactory::getApplication();";
-		$addButton[] = "\t\t\t\$jinput = \$app->input;";
-		$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " get the view name & id";
-		$addButton[] = "\t\t\t\$values = \$jinput->getArray(array(";
-		$addButton[] = "\t\t\t\t'id' => 'int',";
-		$addButton[] = "\t\t\t\t'view' => 'word'";
-		$addButton[] = "\t\t\t));";
-		$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " check if new item";
-		$addButton[] = "\t\t\t\$ref = '';";
-		$addButton[] = "\t\t\t\$refJ = '';";
-		$addButton[] = "\t\t\tif (!is_null(\$values['id']) && strlen(\$values['view']))";
-		$addButton[] = "\t\t\t{";
-		$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " only load referal if not new item.";
-		$addButton[] = "\t\t\t\t\$ref = '&ref=' . \$values['view'] . '&refid=' . \$values['id'];";
-		$addButton[] = "\t\t\t\t\$refJ = '&ref=' . \$values['view'] . '&refid=' . \$values['id'];";
-		$addButton[] = "\t\t\t}";
-		$addButton[] = "\t\t\t\$user = JFactory::getUser();";
-		$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " only add if user allowed to create " . $targetView;
-		// get core permissions
-		$coreLoad = false;
-		if (isset($this->permissionCore[$targetView]))
-		{
-			$core = $this->permissionCore[$targetView];
-			$coreLoad = true;
-		}
-		// check if the item has permissions.
-		if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($targetView, $this->permissionBuilder['global'][$core['core.create']]))
-		{
-			$addButton[] = "\t\t\tif (\$user->authorise('" . $core['core.create'] . "', 'com_" . $this->fileContentStatic['###component###'] . "') && \$app->isAdmin()) // TODO for now only in admin area.";
-		}
-		else
-		{
-			$addButton[] = "\t\t\tif (\$user->authorise('core.create', 'com_" . $this->fileContentStatic['###component###'] . "') && \$app->isAdmin()) // TODO for now only in admin area.";
-		}
-		$addButton[] = "\t\t\t{";
-		$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " build Create button";
-		$addButton[] = "\t\t\t\t\$buttonNamee = trim(\$buttonName);";
-		$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
-		$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
-		$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
-		$addButton[] = "\t\t\t\t\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
-		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Create\" class=\"btn btn-small btn-success hasTooltip\" title=\"'.JText:" . ":sprintf('" . $this->langPrefix . "_CREATE_NEW_S', \$buttonNamee).'\" style=\"border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;\"";
-		$addButton[] = "\t\t\t\t\thref=\"index.php?option=com_" . $this->fileContentStatic['###component###'] . "&amp;view=" . $targetView . "&amp;layout=edit'.\$ref.'\" >";
-		$addButton[] = "\t\t\t\t\t<span class=\"icon-new icon-white\"></span></a>';";
-		$addButton[] = "\t\t\t}";
-		$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " only add if user allowed to edit " . $targetView;
-		// check if the item has permissions.
-		if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($targetView, $this->permissionBuilder['global'][$core['core.edit']]))
-		{
-			$addButton[] = "\t\t\tif ((\$buttonName === '" . $targetView . "' || \$buttonName === '" . $targetViews . "') && \$user->authorise('" . $core['core.edit'] . "', 'com_" . $this->fileContentStatic['###component###'] . "') && \$app->isAdmin()) // TODO for now only in admin area.";
-		}
-		else
-		{
-			$addButton[] = "\t\t\tif ((\$buttonName === '" . $targetView . "' || \$buttonName === '" . $targetViews . "')  && \$user->authorise('core.edit', 'com_" . $this->fileContentStatic['###component###'] . "') && \$app->isAdmin()) // TODO for now only in admin area.";
-		}
-		$addButton[] = "\t\t\t{";
-		$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " build edit button";
-		$addButton[] = "\t\t\t\t\$buttonNamee = trim(\$buttonName);";
-		$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
-		$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
-		$addButton[] = "\t\t\t\t\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
-		$addButton[] = "\t\t\t\t\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
-		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.JText:" . ":sprintf('" . $this->langPrefix . "_EDIT_S', \$buttonNamee).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
-		$addButton[] = "\t\t\t\t\t<span class=\"icon-edit\"></span></a>';";
-		$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " build script";
-		$addButton[] = "\t\t\t\t\$script[] = \"";
-		$addButton[] = "\t\t\t\t\tjQuery(document).ready(function() {";
-		$addButton[] = "\t\t\t\t\t\tjQuery('#adminForm').on('change', '#jform_\".\$buttonName.\"',function (e) {";
-		$addButton[] = "\t\t\t\t\t\t\te.preventDefault();";
-		$addButton[] = "\t\t\t\t\t\t\tvar \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
-		$addButton[] = "\t\t\t\t\t\t\t\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
-		$addButton[] = "\t\t\t\t\t\t});";
-		$addButton[] = "\t\t\t\t\t\tvar \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
-		$addButton[] = "\t\t\t\t\t\t\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
-		$addButton[] = "\t\t\t\t\t});";
-		$addButton[] = "\t\t\t\t\tfunction \".\$buttonName.\"Button(value) {";
-		$addButton[] = "\t\t\t\t\t\tif (value > 0) {"; // TODO not ideal since value may not be an (int)
-		$addButton[] = "\t\t\t\t\t\t\t// hide the create button";
-		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Create').hide();";
-		$addButton[] = "\t\t\t\t\t\t\t// show edit button";
-		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').show();";
-		$addButton[] = "\t\t\t\t\t\t\tvar url = 'index.php?option=com_" . $this->fileContentStatic['###component###'] . "&view=" . $targetViews . "&task=" . $targetView . ".edit&id='+value+'\".\$refJ.\"';"; // TODO this value may not be the ID
-		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').attr('href', url);";
-		$addButton[] = "\t\t\t\t\t\t} else {";
-		$addButton[] = "\t\t\t\t\t\t\t// show the create button";
-		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Create').show();";
-		$addButton[] = "\t\t\t\t\t\t\t// hide edit button";
-		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').hide();";
-		$addButton[] = "\t\t\t\t\t\t}";
-		$addButton[] = "\t\t\t\t\t}\";";
-		$addButton[] = "\t\t\t}";
-		$addButton[] = "\t\t\t//" . $this->setLine(__LINE__) . " check if button was created for " . $targetView . " field.";
-		$addButton[] = "\t\t\tif (is_array(\$button) && count(\$button) > 0)";
-		$addButton[] = "\t\t\t{";
-		$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " Load the needed script.";
-		$addButton[] = "\t\t\t\t\$document = JFactory::getDocument();";
-		$addButton[] = "\t\t\t\t\$document->addScriptDeclaration(implode(' ',\$script));";
-		$addButton[] = "\t\t\t\t//" . $this->setLine(__LINE__) . " return the button attached to input field.";
-		$addButton[] = "\t\t\t\treturn '<div class=\"input-append\">' .\$html . implode('',\$button).'</div>';";
-		$addButton[] = "\t\t\t}";
-		$addButton[] = "\t\t}";
-		$addButton[] = "\t\treturn \$html;";
-		$addButton[] = "\t}";
-
-		return implode(PHP_EOL, $addButton);
-	}
-
 	public function setFilterQuery($viewName_list)
 	{
 		if (isset($this->filterBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->filterBuilder[$viewName_list]))
@@ -9686,7 +9556,7 @@ class Interpretation extends Fields
 		{
 			if (ComponentbuilderHelper::typeField($type, 'list') || ComponentbuilderHelper::typeField($type, 'dynamic') || !ComponentbuilderHelper::typeField($type))
 			{
-				$optionsArray = explode(PHP_EOL, $options);
+				$optionsArray = array_map('trim', (array) explode(PHP_EOL, $options));
 				if (!ComponentbuilderHelper::checkArray($optionsArray))
 				{
 					$optionsArray[] = $optionsArray;
@@ -9695,7 +9565,7 @@ class Interpretation extends Fields
 				{
 					if (strpos($option, '|') !== false)
 					{
-						list($option) = explode('|', $option);
+						list($option) = array_map('trim', (array) explode('|', $option));
 					}
 					if ($option != 'dynamic_list')
 					{
@@ -9712,7 +9582,7 @@ class Interpretation extends Fields
 				{
 					if (strpos($keywords, ',') !== false)
 					{
-						$keywords = explode(',', $keywords);
+						$keywords = array_map('trim', (array) explode(',', $keywords));
 						foreach ($keywords as $keyword)
 						{
 							$buket['keywords'][] = trim($keyword);

admin/helpers/compiler/f_Infusion.php

@@ -1162,8 +1162,7 @@ class Infusion extends Interpretation
 	}
 
 	/**
-	 * Build the lang values and insert to fiel
-	 * 
+	 * Build the language values and insert into file
 	 *
 	 * @return  boolean  on success
 	 * 
@@ -1211,14 +1210,16 @@ class Infusion extends Interpretation
 			$langXML = array();
 			foreach ($this->languages as $tag => $areas)
 			{
+				// trim the tag
+				$tag = trim($tag);
 				foreach ($areas as $area => $languageStrings)
 				{
 					// only log messages for none en-GB translations
 					if ('en-GB' !== $tag)
 					{
 						$langStringNr = count($languageStrings);
-						$langStringSum = bcmul($langStringNr, 100);
-						$percentage = bcdiv($langStringSum, $mainLangLoader[$area]);
+						$langStringSum = $this->bcmath('mul', $langStringNr, 100);
+						$percentage = $this->bcmath('div', $langStringSum, $mainLangLoader[$area]);
 						$stringNAme = ($langStringNr == 1) ? '(string ' . $tag . ' translated)' : '(strings ' . $tag . ' translated)';
 						// force load if debug lines are added
 						if (!$this->debugLinenr)
@@ -1264,13 +1265,11 @@ class Infusion extends Interpretation
 					// count the file created
 					$this->fileCount++;
 					// add content to it
-					$lang = '';
-					foreach ($languageStrings as $place => $string)
-					{
-						$lang .= $place . '="' . $string . '"' . PHP_EOL;
-					}
+					$lang = array_map(function ($langstring, $placeholder) {
+						return $placeholder . '="' . $langstring . '"';
+					}, $languageStrings, array_keys($languageStrings));
 					// add to language file
-					$this->writeFile($path . '/' . $fileName, $lang);
+					$this->writeFile($path . '/' . $fileName, implode(PHP_EOL, $lang));
 					// set the line counter
 					$this->lineCount = $this->lineCount + substr_count($lang, PHP_EOL);
 					// build xml strings
@@ -1304,5 +1303,4 @@ class Infusion extends Interpretation
 			}
 		}
 	}
-
 }

admin/helpers/componentbuilder.php

@@ -1187,12 +1187,12 @@ abstract class ComponentbuilderHelper
 	);
 
 	/**
-	*	Get the snippet contributor details
+	* Get the snippet contributor details
 	* 
-	*	@param  string   $filename   The file name
-	*	@param  string   $type         The type of file
+	* @param  string   $filename   The file name
+	* @param  string   $type         The type of file
 	*
-	*	@return  array    On success the contributor details
+	* @return  array    On success the contributor details
 	* 
 	*/
 	public static function getContributorDetails($filename, $type = 'snippet')
@@ -1245,11 +1245,11 @@ abstract class ComponentbuilderHelper
 	}
 
 	/**
-	*	Get the library files
+	* Get the library files
 	* 
-	*	@param  int   $id   The library id to target
+	* @param  int   $id   The library id to target
 	*
-	*	@return  array    On success the array of files that belong to this library
+	* @return  array    On success the array of files that belong to this library
 	* 
 	*/
 	public static function getLibraryFiles($id)
@@ -1578,13 +1578,90 @@ abstract class ComponentbuilderHelper
 		$extruder = new Extrusion($data);
 	}
 
+	public static function getFieldOptions($value, $type, $settings = array(), $xml = null)
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+		$query->select($db->quoteName(array('properties', 'short_description', 'description')));
+		$query->from($db->quoteName('#__componentbuilder_fieldtype'));
+		$query->where($db->quoteName('published') . ' = 1');
+		$query->where($db->quoteName($type) . ' = '. $value);
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+		$db->execute();
+		if ($db->getNumRows())
+		{
+			$result = $db->loadObject();
+			$properties = json_decode($result->properties,true);
+			$field = array(
+				'subform' => array(),
+				'nameListOptions' => array(),
+				'values' => "<field ", 
+				'values_description' => '<table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">', 
+				'short_description' => $result->short_description, 
+				'description' => $result->description);
+			// number pointer
+			$nr = 0;
+			// value to check since there are false and null values even 0 in the values returned
+			$confirmation = '8qvZHoyuFYQqpj0YQbc6F3o5DhBlmS-_-a8pmCZfOVSfANjkmV5LG8pCdAY2JNYu6cB';
+			// set the headers
+			$field['values_description'] .= '<thead><tr><th class="uk-text-right">'.JText::_('COM_COMPONENTBUILDER_PROPERTY').'</th><th>'.JText::_('COM_COMPONENTBUILDER_EXAMPLE').'</th><th>'.JText::_('COM_COMPONENTBUILDER_DESCRIPTION').'</th></thead><tbody>';
+			foreach ($properties as $property)
+			{
+				$example = (isset($property['example']) && self::checkString($property['example'])) ? self::shorten($property['example'], 30) : '';
+				$field['values_description'] .= '<tr><td class="uk-text-right"><code>'.$property['name'].'</code></td><td>'.$example.'</td><td>'.$property['description'].'</td></tr>';
+				// check if we should load the value
+				$value = self::getValueFromXMLstring($xml, $property['name'], $confirmation);
+				if(self::checkArray($settings) && isset($settings[$property['name']]))
+				{
+					// add the xml values
+					$field['values'] .= "\n\t".$property['name'].'="'.$settings[$property['name']].'" ';
+					// add the json values
+					$field['subform']['properties'.$nr] = array('name' => $property['name'], 'value' => $settings[$property['name']]);
+					// add the name List Options as set
+					$field['nameListOptionsSet'][$property['name']] = $property['name'];
+				}
+				elseif (!$xml || $confirmation !== $value)
+				{
+					// add the xml values
+					$field['values'] .= "\n\t" . $property['name'] . '="'. ($confirmation !== $value) ? $value : $property['example'] .'" ';
+					// add the json values
+					$field['subform']['properties' . $nr] = array('name' => $property['name'], 'value' => ($confirmation !== $value) ? $value : $property['example'], 'desc' => $property['description']);
+				}
+				// add the name List Options
+				$field['nameListOptions'][$property['name']] = $property['name'];
+				// increment the number
+				$nr++;
+			}
+			$field['values'] .= "\n/>";
+			$field['values_description'] .= '</tbody></table>';
+			// return found field options
+			return $field;
+		}
+		return false;
+	}
+
+	public static function getValueFromXMLstring($xml, $get, $confirmation)
+	{
+		if (self::checkString($xml))
+		{
+			return self::getBetween($xml, $get.'="', '"', $confirmation);
+		}
+		return $confirmation;
+	}
+
+
 	/**
-	*	The zipper method
+	* The zipper method
 	* 
-	*	@param  string   $workingDIR    The directory where the items must be zipped
-	*	@param  string   $filepath          The path to where the zip file must be placed
+	* @param  string   $workingDIR    The directory where the items must be zipped
+	* @param  string   $filepath          The path to where the zip file must be placed
 	*
-	*	@return  bool true   On success
+	* @return  bool true   On success
 	* 
 	*/
 	public static function zip($workingDIR, &$filepath)
@@ -1630,13 +1707,13 @@ abstract class ComponentbuilderHelper
 
 
 	/**
-	*	Write a file to the server
-	* 
-	*	@param  string   $path    The path and file name where to safe the data
-	*	@param  string   $data    The data to safe
+	* Write a file to the server
+	*
+	* @param  string   $path    The path and file name where to safe the data
+	* @param  string   $data    The data to safe
+	*
+	* @return  bool true   On success
 	*
-	*	@return  bool true   On success
-	* 
 	*/
 	public static function writeFile($path, $data)
 	{
@@ -1660,49 +1737,6 @@ abstract class ComponentbuilderHelper
 		}
 		return $klaar;
 	}
-	
-	public static function getFieldOptions($value, $type, $settings = array())
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		 
-		// Create a new query object.
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('properties', 'short_description', 'description')));
-		$query->from($db->quoteName('#__componentbuilder_fieldtype'));
-		$query->where($db->quoteName('published') . ' = 1');
-		$query->where($db->quoteName($type) . ' = '. $value);
-		 
-		// Reset the query using our newly populated query object.
-		$db->setQuery($query);
-		$db->execute();
-		if ($db->getNumRows())
-		{
-			$result = $db->loadObject();
-			$properties = json_decode($result->properties,true);
-			$field = array('values' => "<field ", 'values_description' => '<table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">', 'short_description' => $result->short_description, 'description' => $result->description);
-			// set the headers
-			$field['values_description'] .= '<thead><tr><th class="uk-text-right">'.JText::_('COM_COMPONENTBUILDER_PROPERTY').'</th><th>'.JText::_('COM_COMPONENTBUILDER_EXAMPLE').'</th><th>'.JText::_('COM_COMPONENTBUILDER_DESCRIPTION').'</th></thead><tbody>';
-			foreach ($properties as $property)
-			{
-				$example = (isset($property['example']) && self::checkString($property['example'])) ? self::shorten($property['example'], 30) : '';
-				$field['values_description'] .= '<tr><td class="uk-text-right"><code>'.$property['name'].'</code></td><td>'.$example.'</td><td>'.$property['description'].'</td></tr>';
-				if(isset($settings[$property['name']]))
-				{
-					$field['values'] .= "\n\t".$property['name'].'="'.$settings[$property['name']].'" ';
-				}
-				else
-				{
-					$field['values'] .= "\n\t".$property['name'].'="'.$property['example'].'" ';
-				}
-			}
-			$field['values'] .= "\n/>";
-			$field['values_description'] .= '</tbody></table>';
-			// return found field options
-			return $field;
-		}
-		return false;
-	}
 
 	/**
 	* 	the basic localkey
@@ -1792,16 +1826,17 @@ abstract class ComponentbuilderHelper
 	}
 
 	/**
-	*	get between
+	* get between
 	* 
-	*	@param  string          $content    The content to search
-	*	@param  string          $start        The starting value
-	*	@param  string          $end         The ending value
+	* @param  string          $content    The content to search
+	* @param  string          $start        The starting value
+	* @param  string          $end         The ending value
+	* @param  string          $default     The default value if none found
 	*
-	*	@return  string          On success / empty string on failure 
+	* @return  string          On success / empty string on failure 
 	* 
 	*/
-	public static function getBetween($content, $start, $end)
+	public static function getBetween($content, $start, $end, $default = '')
 	{
 		$r = explode($start, $content);
 		if (isset($r[1]))
@@ -1809,17 +1844,17 @@ abstract class ComponentbuilderHelper
 			$r = explode($end, $r[1]);
 			return $r[0];
 		}
-		return '';
+		return $default;
 	}
 
 	/**
-	* 	get all between
+	* get all between
 	* 
-	*	@param  string          $content    The content to search
-	*	@param  string          $start        The starting value
-	*	@param  string          $end         The ending value
+	* @param  string          $content    The content to search
+	* @param  string          $start        The starting value
+	* @param  string          $end         The ending value
 	*
-	*	@return  array          On success
+	* @return  array          On success
 	* 
 	*/
 	public static function getAllBetween($content, $start, $end)
@@ -2037,17 +2072,17 @@ abstract class ComponentbuilderHelper
 	}
 
 	/**
-	*	Get the file path or url
-	* 
-	*	@param  string   $type              The (url/path) type to return
-	*	@param  string   $target            The Params Target name (if set)
-	*	@param  string   $fileType          The kind of filename to generate (if not set no file name is generated)
-	*	@param  string   $key               The key to adjust the filename (if not set ignored)
-	*	@param  string   $default           The default path if not set in Params (fallback path)
-	*	@param  bool     $createIfNotSet    The switch to create the folder if not found
+	* Get the file path or url
+	*
+	* @param  string   $type              The (url/path) type to return
+	* @param  string   $target            The Params Target name (if set)
+	* @param  string   $fileType          The kind of filename to generate (if not set no file name is generated)
+	* @param  string   $key               The key to adjust the filename (if not set ignored)
+	* @param  string   $default           The default path if not set in Params (fallback path)
+	* @param  bool     $createIfNotSet    The switch to create the folder if not found
+	*
+	* @return  string    On success the path or url is returned based on the type requested
 	*
-	*	@return  string    On success the path or url is returned based on the type requested
-	* 
 	*/
 	public static function getFilePath($type = 'path', $target = 'filepath', $fileType = null, $key = '', $default = JPATH_SITE . '/images/', $createIfNotSet = true)
 	{
@@ -2149,13 +2184,13 @@ abstract class ComponentbuilderHelper
 
 
 	/**
-	*	get the content of a file
-	* 
-	*	@param  string          $path    The path to the file
-	*	@param  string/bool   $none   The return value if no content was found
+	* get the content of a file
+	*
+	* @param  string          $path    The path to the file
+	* @param  string/bool   $none   The return value if no content was found
+	*
+	* @return  string   On success
 	*
-	*	@return  string   On success
-	* 
 	*/
 	public static function getFileContents($path, $none = '')
 	{
@@ -3183,6 +3218,19 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
+	/**
+	 * Get a Variable 
+	 *
+	 * @param   string   $table        The table from which to get the variable
+	 * @param   string   $where        The value where
+	 * @param   string   $whereString  The target/field string where/name
+	 * @param   string   $what         The return field
+	 * @param   string   $operator     The operator between $whereString/field and $where/value
+	 * @param   string   $main         The component in which the table is found
+	 *
+	 * @return  mix string/int/float
+	 *
+	 */
 	public static function getVar($table, $where = null, $whereString = 'user', $what = 'id', $operator = '=', $main = 'componentbuilder')
 	{
 		if(!$where)
@@ -3223,6 +3271,20 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
+	/**
+	 * Get array of variables
+	 *
+	 * @param   string   $table        The table from which to get the variables
+	 * @param   string   $where        The value where
+	 * @param   string   $whereString  The target/field string where/name
+	 * @param   string   $what         The return field
+	 * @param   string   $operator     The operator between $whereString/field and $where/value
+	 * @param   string   $main         The component in which the table is found
+	 * @param   bool     $unique       The switch to return a unique array
+	 *
+	 * @return  array
+	 *
+	 */
 	public static function getVars($table, $where = null, $whereString = 'user', $what = 'id', $operator = 'IN', $main = 'componentbuilder', $unique = true)
 	{
 		if(!$where)
@@ -3691,28 +3753,141 @@ abstract class ComponentbuilderHelper
 		return JAccess::getAssetRules(0);
 	}
 
+	/**
+	 * xmlAppend
+	 *
+	 * @param   SimpleXMLElement   $xml      The XML element reference in which to inject a comment
+	 * @param   mixed              $node     A SimpleXMLElement node to append to the XML element reference, or a stdClass object containing a comment attribute to be injected before the XML node and a fieldXML attribute containing a SimpleXMLElement
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlAppend(&$xml, $node)
+	{
+		if (!$node)
+		{
+			// element was not returned
+			return;
+		}
+		switch (get_class($node))
+		{
+			case 'stdClass':
+				if (property_exists($node, 'comment'))
+				{
+					self::xmlComment($xml, $node->comment);
+				}
+				if (property_exists($node, 'fieldXML'))
+				{
+					self::xmlAppend($xml, $node->fieldXML);
+				}
+				break;
+			case 'SimpleXMLElement':
+				$domXML = dom_import_simplexml($xml);
+				$domNode = dom_import_simplexml($node);
+				$domXML->appendChild($domXML->ownerDocument->importNode($domNode, true));
+				$xml = simplexml_import_dom($domXML);
+				break;
+		}
+	}
+
+	/**
+	 * xmlComment
+	 *
+	 * @param   SimpleXMLElement   $xml        The XML element reference in which to inject a comment
+	 * @param   string             $comment    The comment to inject
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlComment(&$xml, $comment)
+	{
+		$domXML = dom_import_simplexml($xml);
+		$domComment = new DOMComment($comment);
+		$nodeTarget = $domXML->ownerDocument->importNode($domComment, true);
+		$domXML->appendChild($nodeTarget);
+		$xml = simplexml_import_dom($domXML);
+	}
+
+	/**
+	 * xmlAddAttributes
+	 *
+	 * @param   SimpleXMLElement   $xml          The XML element reference in which to inject a comment
+	 * @param   array              $attributes   The attributes to apply to the XML element
+	 *
+	 * @return  null
+	 *
+	 */
+	public static function xmlAddAttributes(&$xml, $attributes = array())
+	{
+		foreach ($attributes as $key => $value)
+		{
+			$xml->addAttribute($key, $value);
+		}
+	}
+
+	/**
+	 * xmlAddOptions
+	 *
+	 * @param   SimpleXMLElement   $xml          The XML element reference in which to inject a comment
+	 * @param   array              $options      The options to apply to the XML element
+	 *
+	 * @return  void
+	 *
+	 */
+	public static function xmlAddOptions(&$xml, $options = array())
+	{
+		foreach ($options as $key => $value)
+		{
+			$addOption = $xml->addChild('option');
+			$addOption->addAttribute('value', $key);
+			$addOption[] = $value;
+		}
+	}
+
+	/**
+	 * Render Bool Button
+	 *
+	 * @param   array   $args   All the args for the button
+	 *                             0) name
+	 *                             1) additional (options class) // not used at this time
+	 *                             2) default
+	 *                             3) yes (name)
+	 *                             4) no (name)
+	 *
+	 * @return  string    The input html of the button
+	 *
+	 */
 	public static function renderBoolButton()
 	{
 		$args = func_get_args();
+		// check if there is additional button class
+		$additional = isset($args[1]) ? (string) $args[1] : ''; // not used at this time
+		// start the xml
+		$buttonXML = new SimpleXMLElement('<field/>');
+		// button attributes
+		$buttonAttributes = array(
+			'type' => 'radio',
+			'name' => isset($args[0]) ? self::htmlEscape($args[0]) : 'bool_button',
+			'label' => isset($args[0]) ? self::safeString(self::htmlEscape($args[0]), 'Ww') : 'Bool Button', // not seen anyway
+			'class' => 'btn-group',
+			'filter' => 'INT',
+			'default' => isset($args[2]) ? (int) $args[2] : 0);
+		// load the haskey attributes
+		self::xmlAddAttributes($buttonXML, $buttonAttributes);
+		// set the button options
+		$buttonOptions = array(
+			'1' => isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES',
+			'0' => isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO');
+		// load the button options
+		self::xmlAddOptions($buttonXML, $buttonOptions);
 
 		// get the radio element
 		$button = JFormHelper::loadFieldType('radio');
 
-		// setup the properties
-		$name	 	= self::htmlEscape($args[0]);
-		$additional = isset($args[1]) ? (string) $args[1] : '';
-		$value		= $args[2];
-		$yes 	 	= isset($args[3]) ? self::htmlEscape($args[3]) : 'JYES';
-		$no 	 	= isset($args[4]) ? self::htmlEscape($args[4]) : 'JNO';
-
-		// prepare the xml
-		$element = new SimpleXMLElement('<field name="'.$name.'" type="radio" class="btn-group"><option '.$additional.' value="0">'.$no.'</option><option '.$additional.' value="1">'.$yes.'</option></field>');
-
 		// run
-		$button->setup($element, $value);
+		$button->setup($buttonXML, $buttonAttributes['default']);
 
 		return $button->input;
-
 	}
 
 	/**

admin/helpers/extrusion/b_builder.php

@@ -277,13 +277,13 @@ class Builder extends Mapping
 	protected function setFieldXML(&$field, $fieldId)
 	{
 		// load the field settings
-		$settings			= array();
-		$settings['name']		= $field['name'];
-		$settings['description']	= 'The '.strtolower($field['label']) . ' is set here.';
-		$settings['message']		= "Error! Please add some ".strtolower($field['label'])." here.";
-		$settings['label']		= $field['label'];
-		$settings['default']		= ($field['default'] == 'Other') ? $field['defaultOther'] : $field['default'];
-		$settings['hint']		= $field['label'] .' Here!';
+		$settings = array();
+		$settings['name'] = $field['name'];
+		$settings['description'] = 'The '.strtolower($field['label']) . ' is set here.';
+		$settings['message'] = "Error! Please add some ".strtolower($field['label'])." here.";
+		$settings['label'] = $field['label'];
+		$settings['default'] = ($field['default'] == 'Other') ? $field['defaultOther'] : $field['default'];
+		$settings['hint'] = $field['label'] .' Here!';
 		// okay set the xml field values
 		if ($fieldOptions = ComponentbuilderHelper::getFieldOptions($fieldId, 'id', $settings))
 		{

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

@@ -9,8 +9,9 @@ COM_COMPONENTBUILDER_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text_field)"
 COM_COMPONENTBUILDER_ADD_ACCESS="Add Access"
 COM_COMPONENTBUILDER_ADD_CORRESPONDING_LINE_NUMBERS_TO_THE_DYNAMIC_COMMENTS_SO_TO_SEE_WHERE_IN_THE_COMPILER_THE_LINES_OF_CODE_WAS_BUILD_THIS_WILL_HELP_IF_YOU_NEED_TO_GET_MORE_TECHNICAL_WITH_AN_ISSUE_ON_GITHUB_OR_EVEN_FOR_YOUR_OWN_DEBUGGING="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github, or even for your own debugging."
 COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders"
+COM_COMPONENTBUILDER_ADD_KEY_HERE="add key here"
 COM_COMPONENTBUILDER_ADD_MENU="Add Menu"
-COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT="Add to Backup Folder & Sales Server <small>(if set)</small>"
+COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_SMALLIF_SETSMALL="Add to Backup Folder &amp; Sales Server <small>(if set)</small>"
 COM_COMPONENTBUILDER_ADD_TO_REPOSITORY_FOLDER="Add to Repository Folder"
 COM_COMPONENTBUILDER_ADMINS_FIELDS="Admins Fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS="Admins Fields Access"
@@ -92,6 +93,7 @@ COM_COMPONENTBUILDER_ADMINS_FIELDS_N_ITEMS_UNFEATURED="%s Admins Fields unfeatur
 COM_COMPONENTBUILDER_ADMINS_FIELDS_N_ITEMS_UNFEATURED_1="%s Admin Fields unfeatured."
 COM_COMPONENTBUILDER_ADMINS_FIELDS_N_ITEMS_UNPUBLISHED="%s Admins Fields unpublished."
 COM_COMPONENTBUILDER_ADMINS_FIELDS_N_ITEMS_UNPUBLISHED_1="%s Admin Fields unpublished."
+COM_COMPONENTBUILDER_ADMIN_BEHAVIOUR="Admin Behaviour"
 COM_COMPONENTBUILDER_ADMIN_FIELDS="Admin Fields"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ABOVE_TABS="Above Tabs"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS="Addfields"
@@ -167,6 +169,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_BY_DESC="The user that created this Ad
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_DATE_DESC="The date this Admin Fields was created."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_CREATED_DATE_LABEL="Created Date"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_DEFAULT="Default"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_EDIT="Editing the Admin Fields"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_EDITING="Editing"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ERROR_UNIQUE_ALIAS="Another Admin Fields has the same alias."
@@ -182,14 +185,15 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_LEFT_IN_TAB="Left in Tab"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_LEFT_OF_TABS="Left of Tabs"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_DESCRIPTION="Select if the field is to be used as a link to a single record, if shown."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_LINK_LABEL="Link"
-COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_DESCRIPTION="Select if this field should show in the list view."
-COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_LABEL="Admin List"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_DESCRIPTION="behaviour"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_LABEL="Admin"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_BY_DESC="The last user that modified this Admin Fields."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_DATE_DESC="The date this Admin Fields was modified."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW="A New Admin Fields"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE="None"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE_DB="None DB"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_DESCRIPTION="id, asset_id, state, access, ordering, created_by, created, modified_by, modified, checked_out, checked_out_time, version, hits, metakey, metadesc, metadata (you don't need to add them again)<br />For more help <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=32m28s' target='_blank'>please watch this tutorial</a>."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_NOTE_ON_VIEWS_LABEL="The following fields are added by default to all views."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDERING_LABEL="Ordering"
@@ -206,6 +210,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_RIGHT_OF_TABS="Right of Tabs"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Admin Fields to customise the alias."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_DESCRIPTION="Select if the field is to be searchable in list view, if shown."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL="Searchable"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_SHOW_IN_LIST_VIEW="Show in list view"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION="Select if the field should be sortable in list view, if shown."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL="Sortable"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_STATUS="Status"
@@ -217,7 +222,6 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_LABEL="Title"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_UNDERNEATH_TABS="Underneath Tabs"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_DESC="A count of the number of times this Admin Fields has been revised."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL="Revision"
-COM_COMPONENTBUILDER_ADMIN_LIST="Admin List"
 COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access"
@@ -3223,13 +3227,15 @@ COM_COMPONENTBUILDER_DASHBOARD_TEMPLATE_ADD="Add&nbsp;Template<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_VALIDATION_RULES="Validation Rules<br /><br />"
 COM_COMPONENTBUILDER_DATE="Date"
 COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)"
+COM_COMPONENTBUILDER_DEFAULT="Default"
 COM_COMPONENTBUILDER_DEFAULT_LINK="Default (link)"
 COM_COMPONENTBUILDER_DEFAULT_VIEW="Default View"
 COM_COMPONENTBUILDER_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_DETAILS="Details"
+COM_COMPONENTBUILDER_DISPLAY_SWITCH_FOR_DYNAMIC_PLACEMENT_IN_RELATION_TO_THE_USE_OF_THE_FIELD_IN_MENU_AND_GLOBAL_CONFIGURATION_OPTIONS="Display switch for dynamic placement in relation to the use of the field in menu and global configuration options."
 COM_COMPONENTBUILDER_DIVERGED="Diverged"
 COM_COMPONENTBUILDER_DIVERGED_MEANS_YOUR_BLOCAL_SNIPPETB_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_A_BDIVERGEDB_FROM_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_IN_THAT_IT_DOES_NOT_HAVE_THE_SAME_BCREATIONB_OR_BMODIFIED_DATEB="Diverged means your <b>local snippet</b> (with the same name, library and type) has a <b>diverged</b> from the community snippet (with the same name, library and type) in that it does not have the same <b>creation</b> or <b>modified date</b>."
-COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install"
+COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install."
 COM_COMPONENTBUILDER_DOWNLOAD="download"
 COM_COMPONENTBUILDER_DO_NOT_ADD="Do not add"
 COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get"
@@ -3581,6 +3587,7 @@ COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
 COM_COMPONENTBUILDER_EXPORT_DATA_DESC=" Allows users in this group to export data."
 COM_COMPONENTBUILDER_EXPORT_FAILED="Export Failed"
 COM_COMPONENTBUILDER_EXPORT_FAILED_PLEASE_TRY_AGAIN_LATTER="Export failed, please try again latter!"
+COM_COMPONENTBUILDER_EXTRA_PROPERTIES_LIKE_LISTCLASS_ESCAPE_DISPLAY_VALIDATEBR_SMALLHERE_YOU_CAN_SET_THE_EXTRA_PROPERTIES_FOR_THIS_FIELDSMALL="Extra properties like (listclass, escape, display, validate)<br /><small>Here you can set the extra properties for this field</small>"
 COM_COMPONENTBUILDER_FIELD="Field"
 COM_COMPONENTBUILDER_FIELDS="Fields"
 COM_COMPONENTBUILDER_FIELDS_ACCESS="Fields Access"
@@ -3781,11 +3788,11 @@ COM_COMPONENTBUILDER_FIELD_DATALENGHT_OTHER_MESSAGE="Error! Please add other dat
 COM_COMPONENTBUILDER_FIELD_DATATYPE="Datatype"
 COM_COMPONENTBUILDER_FIELD_DATATYPE_DESCRIPTION="The data type for mysql"
 COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL="Data Type"
+COM_COMPONENTBUILDER_FIELD_DATA_BASE="Data Base"
 COM_COMPONENTBUILDER_FIELD_DATE="DATE"
 COM_COMPONENTBUILDER_FIELD_DATETIME="DATETIME"
 COM_COMPONENTBUILDER_FIELD_DECIMAL="DECIMAL"
 COM_COMPONENTBUILDER_FIELD_DEFAULT="Default"
-COM_COMPONENTBUILDER_FIELD_DETAILS="Details"
 COM_COMPONENTBUILDER_FIELD_DOUBLE="DOUBLE"
 COM_COMPONENTBUILDER_FIELD_EDIT="Editing the Field"
 COM_COMPONENTBUILDER_FIELD_ELEVEN="11"
@@ -3914,6 +3921,8 @@ 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_SELECT_FIELD_TYPE_DESCRIPTION="Please select a field type that you would like to build."
+COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_LABEL="Building a field"
 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 />
 <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>"
@@ -3932,6 +3941,7 @@ COM_COMPONENTBUILDER_FIELD_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_FIELD_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_FIELD_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Field to customise the alias."
 COM_COMPONENTBUILDER_FIELD_SCRIPTS="Scripts"
+COM_COMPONENTBUILDER_FIELD_SET_PROPERTIES="Set Properties"
 COM_COMPONENTBUILDER_FIELD_SEVEN="7"
 COM_COMPONENTBUILDER_FIELD_SIXTY_FOUR="64"
 COM_COMPONENTBUILDER_FIELD_STATUS="Status"
@@ -3944,15 +3954,13 @@ COM_COMPONENTBUILDER_FIELD_TIME="TIME"
 COM_COMPONENTBUILDER_FIELD_TINYINT="TINYINT"
 COM_COMPONENTBUILDER_FIELD_TWO_HUNDRED_AND_FIFTY_FIVE="255"
 COM_COMPONENTBUILDER_FIELD_TWO_THOUSAND_AND_FORTY_EIGHT="2048"
+COM_COMPONENTBUILDER_FIELD_TYPE_INFO="Type Info"
 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"
-COM_COMPONENTBUILDER_FIELD_XML_LABEL="XML field definition (Please set the field details here to fit your needs)"
 COM_COMPONENTBUILDER_FIELD_YES="Yes"
 COM_COMPONENTBUILDER_FIELD_ZERO="0"
 COM_COMPONENTBUILDER_FILE="File"
@@ -5304,7 +5312,7 @@ COM_COMPONENTBUILDER_LOCAL="Local"
 COM_COMPONENTBUILDER_LOCAL_GET="Local (get)"
 COM_COMPONENTBUILDER_LOCAL_SNIPPET="Local snippet"
 COM_COMPONENTBUILDER_MAIN_MENU="Main Menu"
-COM_COMPONENTBUILDER_MATCH_BEHAVIOR="Match Behavior"
+COM_COMPONENTBUILDER_MATCH_BEHAVIOUR="Match Behaviour"
 COM_COMPONENTBUILDER_MATCH_FIELD="Match Field"
 COM_COMPONENTBUILDER_MATCH_OPTIONS="Match Options"
 COM_COMPONENTBUILDER_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD="Max Length (only 4 text_field)"
@@ -5319,6 +5327,7 @@ COM_COMPONENTBUILDER_NEW_ISSUE="New Issue"
 COM_COMPONENTBUILDER_NEW_MEANS_THAT_WE_COULD_NOT_FIND_A_LOCAL_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_AND_SO_HAVE_MARKED_THIS_SNIPPET_AS_NEW="New means that we could not find a local snippet with the same name, library and type, and so have marked this snippet as new."
 COM_COMPONENTBUILDER_NEW_NOTICE="New Notice"
 COM_COMPONENTBUILDER_NO="No"
+COM_COMPONENTBUILDER_NONE_DB="None DB"
 COM_COMPONENTBUILDER_NOTRANSLATION="no-translation"
 COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!"
 COM_COMPONENTBUILDER_NOT_SET="not set"
@@ -5326,17 +5335,20 @@ COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!"
 COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S="No cronjob path found for (%s)"
 COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_SINCE_INCORRECT_TYPE_REQUESTED="No cronjob path found since incorrect type requested."
+COM_COMPONENTBUILDER_NO_DESCRIPTION_FOUND="No description found."
 COM_COMPONENTBUILDER_NO_FILES_LINKED="No Files Linked"
 COM_COMPONENTBUILDER_NO_FOUND="No Found"
 COM_COMPONENTBUILDER_NO_ITEM_FOUND="No Item Found"
 COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="No keys were found. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key."
 COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION="No need to get it since it is already in sync with your local version"
+COM_COMPONENTBUILDER_NO_RESULTS_MATCH="No results match"
 COM_COMPONENTBUILDER_NO_SNIPPETS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No snippets were selected, please make a selection and try again!"
 COM_COMPONENTBUILDER_NO_S_FOUND="No %s Found"
 COM_COMPONENTBUILDER_NO_S_HAVE_BEEN_LINKED_TO_THIS_VIEW_SOON_AS_THIS_IS_DONE_IT_WILL_BE_DISPLAYED_HERE="No %s have been linked to this view. Soon as this is done it will be displayed here."
 COM_COMPONENTBUILDER_NO_TYPE="No Type"
 COM_COMPONENTBUILDER_NO_VALIDATION_RULES_FOUND="No validation rules found."
 COM_COMPONENTBUILDER_OFFICIAL_VDM_PACKAGES="Official VDM Packages"
+COM_COMPONENTBUILDER_ONLY_USE_THE_BNONE_DBB_OPTION_IF_YOU_ARE_PLANNING_ON_TARGETING_THIS_FIELD_WITH_JAVASCRIPTCUSTOM_PHP_TO_MOVE_ITS_VALUE_INTO_ANOTHER_FIELD_THAT_DOES_GET_SAVED_TO_THE_DATABASE="Only use the <b>None DB</b> option if you are planning on targeting this field with JavaScript/Custom PHP to move its value into another field that does get saved to the database."
 COM_COMPONENTBUILDER_ON_GITHUB="on Github"
 COM_COMPONENTBUILDER_OPEN="Open"
 COM_COMPONENTBUILDER_OPENED="opened"
@@ -5350,6 +5362,7 @@ COM_COMPONENTBUILDER_ORDER_IN_LIST_VIEWS="Order in list views"
 COM_COMPONENTBUILDER_OUT_OF_DATE="Out of Date"
 COM_COMPONENTBUILDER_OWNER_DETAILS_WAS_SET="Owner details was set"
 COM_COMPONENTBUILDER_OWNER_S="Owner: %s"
+COM_COMPONENTBUILDER_PACKAGE="Package"
 COM_COMPONENTBUILDER_PACKAGES_FROM_VAST_DEVELOPMENT_METHOD="Packages from Vast Development Method"
 COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS="Package Owner Details"
 COM_COMPONENTBUILDER_PACKAGE_OWNER_DETAILS_NOT_FOUND="Package owner details not found!"
@@ -5366,11 +5379,14 @@ COM_COMPONENTBUILDER_PLEASE_SELECT_A_COMPONENT_THAT_YOU_WOULD_LIKE_TO_COMPILE="P
 COM_COMPONENTBUILDER_PLEASE_TRY_AGAIN_LATER="Please try again later"
 COM_COMPONENTBUILDER_PLEASE_WAIT_CLEARING_THE_TMP_FOLDER="Please wait! Clearing the tmp folder"
 COM_COMPONENTBUILDER_PLEASE_WAIT_LOADING="Please wait, loading"
+COM_COMPONENTBUILDER_PROPERTIESBR_SMALLHERE_YOU_CAN_SET_THE_PROPERTIES_FOR_THIS_FIELDSMALL="Properties<br /><small>Here you can set the properties for this field.</small>"
 COM_COMPONENTBUILDER_PROPERTY="Property"
+COM_COMPONENTBUILDER_PROPERTY_ALREADY_SELECTED_TRY_ANOTHER="Property already selected, try another."
+COM_COMPONENTBUILDER_PROPERTY_NAME="Property Name"
+COM_COMPONENTBUILDER_PROPERTY_VALUE="Property Value"
 COM_COMPONENTBUILDER_PUBLIC_ACCESS="Public Access"
 COM_COMPONENTBUILDER_PUBLISHED="Published"
 COM_COMPONENTBUILDER_PUBLISHING="Publishing"
-COM_COMPONENTBUILDER_QUIET="Quiet"
 COM_COMPONENTBUILDER_READY_TO_COMPILE_A_COMPONENT="Ready to compile a component"
 COM_COMPONENTBUILDER_RELEASED_THIS="released this"
 COM_COMPONENTBUILDER_RENAME="Rename"
@@ -5387,9 +5403,11 @@ COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
 COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another."
 COM_COMPONENTBUILDER_SBR_YOU_CAN_ADD_AN_BACCESS_TOKENB_TO_GETBIBLE_GLOBAL_OPTIONS_TO_MAKE_AUTHENTICATED_REQUESTS_AN_ACCESS_TOKEN_WITH_ONLY_PUBLIC_ACCESS_WILL_DO="%s<br />You can add an <b>access token<b/> to getBible global options to make authenticated requests. An access token with only public access will do."
 COM_COMPONENTBUILDER_SEARCHABLE="Searchable"
+COM_COMPONENTBUILDER_SEE_ALL_IMPORT_INFO="See All Import Info"
+COM_COMPONENTBUILDER_SELECTION="selection"
 COM_COMPONENTBUILDER_SELECT_AN_OPTION="Select an option"
+COM_COMPONENTBUILDER_SELECT_A_PROPERTY="Select a property"
 COM_COMPONENTBUILDER_SELECT_A_SNIPPET="select a snippet"
-COM_COMPONENTBUILDER_SELECT_IF_THE_IMPORT_SHOULD_BE_SHOWING_MORE_ELABORATE_OR_LESS_QUIET_INFORMATION_DURING_IMPORT="Select if the import should be showing more (elaborate) or less (quiet) information during import."
 COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to compile"
 COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_YOUR_WOULD_LIKE_TO_IMPORT="Select the component your would like to import."
 COM_COMPONENTBUILDER_SELECT_THE_PACKAGE_TO_IMPORT="Select the package to import"
@@ -5540,12 +5558,16 @@ COM_COMPONENTBUILDER_SERVER_USERNAME_LABEL="Username<br /><small>(encrypted fiel
 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"
+COM_COMPONENTBUILDER_SET_A_CLASS_VALUE_FOR_THE_LIST_VIEW_OF_THIS_FIELD="Set a class value for the list view of this field."
 COM_COMPONENTBUILDER_SHARE_SNIPPETS="Share Snippets"
 COM_COMPONENTBUILDER_SHOULD_JCB_INSERT_THE_CUSTOM_CODE_PLACEHOLDERS_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_CUSTOM_CODE="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
 COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_REPOSITORY_FOLDER="Should the component be moved to your local repository folder?"
 COM_COMPONENTBUILDER_SHOULD_THE_ZIPPED_PACKAGE_OF_THE_COMPONENT_BE_MOVED_TO_THE_LOCAL_BACKUP_AND_REMOTE_SALES_SERVER_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_THOSE_VALUES_SET="Should the zipped package of the component be moved to the local backup and remote sales server? This is only applicable if this component has those values set."
+COM_COMPONENTBUILDER_SHOULD_THIS_FIELD_BE_ESCAPED_IN_THE_LIST_VIEW="Should this field be escaped in the list view."
+COM_COMPONENTBUILDER_SHOULD_WE_BE_SHOWING_MORE_ELABORATE_INFORMATION_DURING_IMPORT="Should we be showing more elaborate information during import."
 COM_COMPONENTBUILDER_SHOULD_WE_FORCE_THE_UPDATE_OF_ALL_LOCAL_DATA_EVEN_IF_IT_IS_NEWER_THEN_THE_DATA_BEING_IMPORTED="Should we force the update of all local data, even if it is newer then the data being imported."
 COM_COMPONENTBUILDER_SHOW="Show"
+COM_COMPONENTBUILDER_SHOW_IN_LIST_VIEW="Show in list view"
 COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_BIMPORT_PROCESSB_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_BDOES_NOTB_HAVE_THE_KEY_THEY_CAN_SEE_BWHERE_TO_GET_ITB="Since the owner details are displayed during <b>import process</b> before adding the key, this way if the user/dev <b>does not</b> have the key they can see <b>where to get it</b>."
 COM_COMPONENTBUILDER_SINCE_THE_OWNER_DETAILS_ARE_DISPLAYED_DURING_IMPORT_PROCESS_BEFORE_ADDING_THE_KEY_THIS_WAY_IF_THE_USERDEV_DOES_NOT_HAVE_THE_KEY_THEY_CAN_SEE_WHERE_TO_GET_IT="Since the owner details are displayed during import process before adding the key, this way if the user/dev does not have the key they can see where to get it."
 COM_COMPONENTBUILDER_SITE_VIEW="Site View"
@@ -6235,7 +6257,7 @@ COM_COMPONENTBUILDER_S_BEING_IMPORTED="%s Being Imported"
 COM_COMPONENTBUILDER_S_NOT_LINKED="%s Not Linked"
 COM_COMPONENTBUILDER_S_PLEASE_WAIT_THE_COMPONENT_IS_BEING_COMPILED="%s, please wait! The component is being compiled"
 COM_COMPONENTBUILDER_TAB="Tab"
-COM_COMPONENTBUILDER_TARGET_BEHAVIOR="Target Behavior"
+COM_COMPONENTBUILDER_TARGET_BEHAVIOUR="Target Behaviour"
 COM_COMPONENTBUILDER_TARGET_FIELDS="Target Field/s"
 COM_COMPONENTBUILDER_TARGET_PATH="Target Path"
 COM_COMPONENTBUILDER_TARGET_RELATION="Target Relation"
@@ -6365,12 +6387,16 @@ COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOU
 COM_COMPONENTBUILDER_THERE_WAS_AN_ERROR_GETTING_THE_PACKAGE_INFO="There was an error getting the package info."
 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_THESE_ARE_THE_SAME_PACKAGES_FOUND_ON_A_S_GITHUBA_AND_CAN_BE_IMPORTED_BY_SIMPLY_MAKING_A_SELECTION_AND_THEN_CLICKING_THE_GET_PACKAGE_BUTTONBR_SOME_OF_THESE_PACKAGES_WOULD_REQUIRE_A_KEY_SINCE_THEY_ARE_NOT_FREE_A_S_GET_A_KEY_TODAYA="These are the same packages found on <a %s >gitHub</a> and can be imported by simply making a selection and then clicking the [Get Package] button.<br />Some of these packages would require a key, since they are not free. <a %s >Get a key today!</a>."
+COM_COMPONENTBUILDER_THESE_OPTIONS_ARE_NOT_AVAILABLE_TO_THE_FIELD_IF_BNONE_DBB_OPTION_IS_SELECTED="These options are not available to the field if <b>None DB</b> option is selected."
+COM_COMPONENTBUILDER_THESE_OPTIONS_ARE_ONLY_AVAILABLE_TO_THE_FIELD_IF_BSHOW_IN_LIST_VIEWB_OPTION_IS_SELECTED="These options are only available to the field if <b>Show in list view</b> option is selected."
 COM_COMPONENTBUILDER_THE_AVAILABLE_VALIDATION_RULES_FOR_THE_VALIDATE_ATTRIBUTE_ARE="The available validation rules for the validate attribute are:"
+COM_COMPONENTBUILDER_THE_BNONE_DBB_OPTION_WILL_REMOVE_THIS_FIELD_FROM_BEING_SAVED_IN_THE_DATABASE="The <b>None DB</b> option will remove this field from being saved in the database."
 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_BSHOW_IN_LIST_VIEWB_OPTION_WILL_ADD_THIS_FIELD_TO_THE_ADMIN_LIST_VIEW="The <b>Show in list view</b> option will Add this field to the admin list view."
 COM_COMPONENTBUILDER_THE_COMPONENT_ADMIN_VIEWS="The component admin views"
 COM_COMPONENTBUILDER_THE_COMPONENT_CONFIG="The component config"
 COM_COMPONENTBUILDER_THE_COMPONENT_CUSTOM_ADMIN_MENUS="The component custom admin menus"
@@ -6405,6 +6431,7 @@ COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
 COM_COMPONENTBUILDER_TITLE="Title"
 COM_COMPONENTBUILDER_TOTAL_DOWNLOADS="total downloads"
 COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE="To add simply copy and past the snippet into your code."
+COM_COMPONENTBUILDER_TO_ADD_VALIDATION_TO_A_FIELD_IF_VALIDATION_IS_NOT_PART_OF_FIELD_TYPE_PROPERTIES_LOADED_ABOVE_SO_IF_YOU_HAVE_VALIDATION_SET_AS_A_FIELD_PROPERTY_THIS_EXTRA_PROPERTY_WILL_NOT_BE_NEEDED="To add validation to a field if validation is not part of field type properties loaded above. So if you have validation set as a field property this extra property will not be needed."
 COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the <b>JCB Global Options</b>, go to the <b>Company</b> tab and add the correct company details there."
 COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_JCB_GLOBAL_OPTIONS_GO_TO_THE_COMPANY_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the JCB Global Options, go to the Company tab and add the correct company details there."
 COM_COMPONENTBUILDER_TO_SHARE_THESE_SNIPPETS_WITH_THE_REST_OF_THE_JCB_COMMUNITY="To share these snippets with the rest of the JCB community,"
@@ -6417,6 +6444,7 @@ COM_COMPONENTBUILDER_TYPE_ASC="Type (Asc)"
 COM_COMPONENTBUILDER_TYPE_DESC="Type (Desc)"
 COM_COMPONENTBUILDER_TYPE_ERROR="Type Error"
 COM_COMPONENTBUILDER_TYPE_NAME="Type - Name"
+COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options"
 COM_COMPONENTBUILDER_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)"
 COM_COMPONENTBUILDER_UNDERNEATH_TABS="Underneath Tabs"
 COM_COMPONENTBUILDER_UPDATE="Update"
@@ -6512,6 +6540,7 @@ COM_COMPONENTBUILDER_VALIDATION_RULE_SHORT_DESCRIPTION_MESSAGE="Error! Please ad
 COM_COMPONENTBUILDER_VALIDATION_RULE_STATUS="Status"
 COM_COMPONENTBUILDER_VALIDATION_RULE_VERSION_DESC="A count of the number of times this Validation Rule has been revised."
 COM_COMPONENTBUILDER_VALIDATION_RULE_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_VALUE="Value"
 COM_COMPONENTBUILDER_VDM_NOTICE_BOARD="VDM Notice Board"
 COM_COMPONENTBUILDER_VDM_PACKAGES="VDM Packages"
 COM_COMPONENTBUILDER_VERSION="Version"
@@ -6551,4 +6580,4 @@ COM_COMPONENTBUILDER_ZIPPED_FILE_LOCATION="Zipped File Location"
 COM_COMPONENTBUILDER__SELECT_COMPONENT_="- Select Component -"
 COM_COMPONENTBUILDER__SELECT_PACKAGE_="- Select Package -"
 COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_CREATE_S=", since you don't have permission to create %s!"
-COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_EDIT_S=", since you don't have permission to edit %s!"
+COM_COMPONENTBUILDER__SINCE_YOU_DONT_HAVE_PERMISSION_TO_EDIT_S=", since you don't have permission to edit %s!"

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

@@ -790,4 +790,4 @@ COM_COMPONENTBUILDER_VALIDATION_RULES_EXPORT_DESC="Allows the users in this grou
 COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT="Validation Rules Import"
 COM_COMPONENTBUILDER_VALIDATION_RULES_IMPORT_DESC="Allows the users in this group to import import validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU="Validation Rules Submenu"
-COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to update the submenu of the validation rule"
+COM_COMPONENTBUILDER_VALIDATION_RULES_SUBMENU_DESC="Allows the users in this group to update the submenu of the validation rule"

admin/layouts/field/data_base_left.php

@@ -13,7 +13,7 @@
 	@version		2.7.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		details_left.php
+	@subpackage		data_base_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,18 +30,11 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
-	'fieldtype',
-	'name',
-	'catid',
 	'datatype',
 	'datalenght',
 	'datalenght_other',
 	'datadefault',
-	'datadefault_other',
-	'indexes',
-	'null_switch',
-	'store',
-	'note_whmcs_encryption'
+	'datadefault_other'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/field/data_base_right.php

@@ -13,7 +13,7 @@
 	@version		2.7.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		details_right.php
+	@subpackage		data_base_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
@@ -30,7 +30,10 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
-	'helpnote'
+	'indexes',
+	'null_switch',
+	'store',
+	'note_whmcs_encryption'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/field/set_properties_above.php

@@ -0,0 +1,43 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.7.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		set_properties_above.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 = array(
+	'fieldtype',
+	'name',
+	'catid'
+);
+
+?>
+<div class="form-inline form-inline-header">
+	<?php foreach($fields as $field){
+		echo $form->renderField($field);
+	} ?>
+</div>

admin/layouts/field/set_properties_fullwidth.php

@@ -13,7 +13,7 @@
 	@version		2.7.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		details_fullwidth.php
+	@subpackage		set_properties_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
@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
-	'xml',
+	'note_select_field_type',
 	'note_filter_information'
 );
 

admin/layouts/field/set_properties_under.php

@@ -13,7 +13,7 @@
 	@version		2.7.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		details_under.php
+	@subpackage		set_properties_under.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/field/type_info_fullwidth.php

@@ -0,0 +1,49 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.7.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		type_info_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');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'helpnote',
+	'xml'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>

admin/layouts/fieldtype/fields_fullwidth.php

@@ -61,10 +61,10 @@ $can = ComponentbuilderHelper::getActions('field');
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL'); ?>
 		</th>
 		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'); ?>
+			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'); ?>
 		</th>
 		<th data-breakpoints="all" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'); ?>
+			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'); ?>
 		</th>
 		<th width="10" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STATUS'); ?>
@@ -104,6 +104,9 @@ $can = ComponentbuilderHelper::getActions('field');
 		<td>
 			<?php echo JText::_($item->null_switch); ?>
 		</td>
+		<td>
+			<?php echo JText::_($item->store); ?>
+		</td>
 		<td class="nowrap">
 			<?php if ($user->authorise('core.edit', 'com_componentbuilder.fields.category.' . (int)$item->catid)): ?>
 				<a href="index.php?option=com_categories&task=category.edit&id=<?php echo (int)$item->catid; ?>&extension=com_componentbuilder.fields"><?php echo $displayData->escape($item->category_title); ?></a>
@@ -111,9 +114,6 @@ $can = ComponentbuilderHelper::getActions('field');
 				<?php echo $displayData->escape($item->category_title); ?>
 			<?php endif; ?>
 		</td>
-		<td>
-			<?php echo JText::_($item->store); ?>
-		</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');  ?>">

admin/models/ajax.php

@@ -387,7 +387,7 @@ class ComponentbuilderModelAjax extends JModelList
 				'type' => 'setURLType',
 				// Admin View
 				'field' => 'setItemNames',
-				'list' => 'setYesNo',
+				'list' => 'setAdminBehaviour',
 				'title' => 'setYesNo',
 				'alias' => 'setYesNo',
 				'sort' => 'setYesNo',
@@ -433,7 +433,7 @@ class ComponentbuilderModelAjax extends JModelList
 			'update' => JText::_('COM_COMPONENTBUILDER_UPDATE'),
 			// Admin View (fields)
 			'field' => JText::_('COM_COMPONENTBUILDER_FIELD'),
-			'list' => JText::_('COM_COMPONENTBUILDER_ADMIN_LIST'),
+			'list' => JText::_('COM_COMPONENTBUILDER_ADMIN_BEHAVIOUR'),
 			'order_list' => JText::_('COM_COMPONENTBUILDER_ORDER_IN_LIST_VIEWS'),
 			'title' => JText::_('COM_COMPONENTBUILDER_TITLE'),
 			'alias' => JText::_('COM_COMPONENTBUILDER_ALIAS'),
@@ -447,10 +447,10 @@ class ComponentbuilderModelAjax extends JModelList
 			'order_edit' => JText::_('COM_COMPONENTBUILDER_ORDER_IN_EDIT'),
 			// Admin View (conditions)
 			'target_field' => JText::_('COM_COMPONENTBUILDER_TARGET_FIELDS'),
-			'target_behavior' => JText::_('COM_COMPONENTBUILDER_TARGET_BEHAVIOR'),
+			'target_behavior' => JText::_('COM_COMPONENTBUILDER_TARGET_BEHAVIOUR'),
 			'target_relation' => JText::_('COM_COMPONENTBUILDER_TARGET_RELATION'),
 			'match_field' => JText::_('COM_COMPONENTBUILDER_MATCH_FIELD'),
-			'match_behavior' => JText::_('COM_COMPONENTBUILDER_MATCH_BEHAVIOR'),
+			'match_behavior' => JText::_('COM_COMPONENTBUILDER_MATCH_BEHAVIOUR'),
 			'match_options' => JText::_('COM_COMPONENTBUILDER_MATCH_OPTIONS'),
 			// Joomla Component
 			'menu' => JText::_('COM_COMPONENTBUILDER_ADD_MENU'),
@@ -889,6 +889,22 @@ class ComponentbuilderModelAjax extends JModelList
 		return $this->user->authorise($view.'.edit', 'com_componentbuilder.'.$view.'.' . (int) $id);
 	}
 
+	protected function setAdminBehaviour($header, $value)
+	{
+		switch ($value)
+		{
+			case 1:
+				return JText::_('COM_COMPONENTBUILDER_SHOW_IN_LIST_VIEW');
+			break;
+			case 2:
+				return JText::_('COM_COMPONENTBUILDER_NONE_DB');
+			break;
+			default:
+				return JText::_('COM_COMPONENTBUILDER_DEFAULT');
+			break;
+		}
+	}
+
 	protected $tabNames = array();
 
 	protected function setTabName($header, $value)
@@ -1366,10 +1382,10 @@ class ComponentbuilderModelAjax extends JModelList
 				$templateString[] = "<td><b>".$result->name."</b></td><td><code>&lt;?php echo \$this->loadTemplate('".ComponentbuilderHelper::safeString($result->alias)."'); ?&gt;</code></td>";
 			}
 			// build the table
-			$table = '<h2>'.JText::_('COM_COMPONENTBUILDER_TEMPLATE_CODE_SNIPPETS').'</h2><table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">';
+			$table = '<h2>'.JText::_('COM_COMPONENTBUILDER_TEMPLATE_CODE_SNIPPETS').'</h2><div class="uk-scrollable-box"><table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">';
 			$table .= '<caption>'.JText::_('COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE').'</caption>';
 			$table .= '<thead><tr><th>'.JText::_('COM_COMPONENTBUILDER_NAME_OF_DYNAMICGET').'</th><th>'.JText::_('COM_COMPONENTBUILDER_SNIPPET').'</th></thead>';
-			$table .= '<tbody><tr>'.implode("</tr><tr>",$templateString)."</tr></tbody></table>";
+			$table .= '<tbody><tr>'.implode("</tr><tr>",$templateString)."</tr></tbody></table></div>";
 		}
 		return $table;
 	}
@@ -1424,10 +1440,10 @@ class ComponentbuilderModelAjax extends JModelList
 				}
 			}
 			// build the table
-			$table = '<h2>'.JText::_('COM_COMPONENTBUILDER_LAYOUT_CODE_SNIPPETS').'</h2><table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">';
+			$table = '<h2>'.JText::_('COM_COMPONENTBUILDER_LAYOUT_CODE_SNIPPETS').'</h2><div class="uk-scrollable-box"><table class="uk-table uk-table-hover uk-table-striped uk-table-condensed">';
 			$table .= '<caption>'.JText::_('COM_COMPONENTBUILDER_TO_ADD_SIMPLY_COPY_AND_PAST_THE_SNIPPET_INTO_YOUR_CODE').'</caption>';
 			$table .= '<thead><tr><th>'.JText::_('COM_COMPONENTBUILDER_NAME_OF_DYNAMICGET').'</th><th>'.JText::_('COM_COMPONENTBUILDER_SNIPPET').'</th></thead>';
-			$table .= '<tbody><tr>'.implode("</tr><tr>",$layoutString)."</tr></tbody></table>";
+			$table .= '<tbody><tr>'.implode("</tr><tr>",$layoutString)."</tr></tbody></table></div>";
 		}
 		return $table;
 	}
@@ -2200,14 +2216,244 @@ class ComponentbuilderModelAjax extends JModelList
 	}
 
 	// Used in field
-	public function getFieldOptions($id)
+	// the current extras available
+	protected $extraFieldProperties = array(
+			'listclass' => 'COM_COMPONENTBUILDER_SET_A_CLASS_VALUE_FOR_THE_LIST_VIEW_OF_THIS_FIELD',
+			'escape' => 'COM_COMPONENTBUILDER_SHOULD_THIS_FIELD_BE_ESCAPED_IN_THE_LIST_VIEW',
+			'display' => 'COM_COMPONENTBUILDER_DISPLAY_SWITCH_FOR_DYNAMIC_PLACEMENT_IN_RELATION_TO_THE_USE_OF_THE_FIELD_IN_MENU_AND_GLOBAL_CONFIGURATION_OPTIONS',
+			'validate' => 'COM_COMPONENTBUILDER_TO_ADD_VALIDATION_TO_A_FIELD_IF_VALIDATION_IS_NOT_PART_OF_FIELD_TYPE_PROPERTIES_LOADED_ABOVE_SO_IF_YOU_HAVE_VALIDATION_SET_AS_A_FIELD_PROPERTY_THIS_EXTRA_PROPERTY_WILL_NOT_BE_NEEDED');
+
+	public function getFieldOptions($fieldtype)
 	{
-		if ($field = ComponentbuilderHelper::getFieldOptions($id, 'id'))
+		// get the xml
+		$xml = $this->getFieldXML($fieldtype);
+		// now get the field options
+		if ($field = ComponentbuilderHelper::getFieldOptions($fieldtype, 'id', null, $xml))
 		{
+			// get subform field properties object
+			$properties = $this->buildFieldOptionsSubform($field['subform'], $field['nameListOptions']);
+			// load the extra options
+			$extraValues = $this->getFieldExtraValues($xml, $field['nameListOptions']);
+			// set the nameListOption
+			$extraNameListOption = $this->extraFieldProperties;
+			array_walk($extraNameListOption, function (&$value, $key) {
+				$value = $key;
+			});
+			// get subform field object
+			$extras = $this->buildFieldOptionsSubform($extraValues, $extraNameListOption, 'extraproperties',  'COM_COMPONENTBUILDER_EXTRA_PROPERTIES_LIKE_LISTCLASS_ESCAPE_DISPLAY_VALIDATEBR_SMALLHERE_YOU_CAN_SET_THE_EXTRA_PROPERTIES_FOR_THIS_FIELDSMALL');
+			// load the html 
+			$field['subform'] = '<div class="control-label prop_removal">'. $properties->label . '</div><div class="controls prop_removal">' . $properties->input . '</div>';
+			$field['extra'] = '<div class="control-label prop_removal">'. $extras->label . '</div><div class="controls prop_removal">' . $extras->input . '</div>';
 			// return found field options
 			return $field;
 		}
 		return false;
+	}
+
+	protected function getFieldExtraValues($xml, $options)
+	{
+		// get the value
+		$values = array();
+		// value to check since there are false and null values even 0 in the values returned
+		$confirmation = '8qvZHoyuFYQqpj0YQbc6F3o5DhBlmS-_-a8pmCZfOVSfANjkmV5LG8pCdAY2JNYu6cB';
+		$nr = 0;
+		foreach ($this->extraFieldProperties as $extra => $desc)
+		{
+			if (!in_array($extra, $options))
+			{
+				$value =  ComponentbuilderHelper::getValueFromXMLstring($xml, $extra, $confirmation);
+				if ($confirmation !== $value)
+				{
+					$values['extraproperties' . $nr] = array('name' => $extra, 'value' => $value, 'desc' => JText::_($desc));
+					$nr++;
+				}
+			}
+		}
+		// return only if extras founb
+		if (ComponentbuilderHelper::checkArray($values))
+		{
+			return $values;
+		}
+		return null;
+	}
+
+	protected function buildFieldOptionsSubform($values, $nameListOptions = null, $name = 'properties', $label = 'COM_COMPONENTBUILDER_PROPERTIESBR_SMALLHERE_YOU_CAN_SET_THE_PROPERTIES_FOR_THIS_FIELDSMALL')
+	{
+		// get the subform
+		$subform = JFormHelper::loadFieldType('subform', true);
+		// start building the subform field XML
+		$subformXML = new SimpleXMLElement('<field/>');
+		// subform attributes
+		$subformAttribute = array(
+			'type' => 'subform',
+			'name' => $name,
+			'label' => $label,
+			'layout' => 'joomla.form.field.subform.repeatable-table',
+			'multiple' => 'true',
+			'icon' => 'list',
+			'max' =>  (ComponentbuilderHelper::checkArray($nameListOptions)) ? (int) count($nameListOptions) : 4);
+		// load the subform attributes
+		ComponentbuilderHelper::xmlAddAttributes($subformXML, $subformAttribute);
+		// now add the subform child form
+		$childForm = $subformXML->addChild('form');
+		// child form attributes
+		$childFormAttribute = array(
+			'hidden' => 'true',
+			'name' => 'list_properties',
+			'repeat' => 'true');
+		// load the child form attributes
+		ComponentbuilderHelper::xmlAddAttributes($childForm, $childFormAttribute);
+
+		// start building the name field XML
+		$nameXML = new SimpleXMLElement('<field/>');
+		// subform attributes
+		$nameAttribute = array(
+			'type' => (ComponentbuilderHelper::checkArray($nameListOptions)) ? 'list' : 'text',
+			'name' => 'name',
+			'label' => 'COM_COMPONENTBUILDER_PROPERTY',
+			'size' => '40',
+			'maxlength' => '150',
+			'class' => (ComponentbuilderHelper::checkArray($nameListOptions)) ? 'list_class field_list_name_options' : 'text_area',
+			'filter' => 'STRING');
+		// add the hint only if not name list and description if name list is an array
+		if (ComponentbuilderHelper::checkArray($nameListOptions))
+		{
+			$nameAttribute['description'] = 'COM_COMPONENTBUILDER_SELECTION';
+			$nameAttribute['multiple'] = 'false';
+			$nameAttribute['onchange'] = "getFieldPropertyDesc(this, '".$name."')";
+		}
+		else
+		{
+			$nameAttribute['hint'] = 'COM_COMPONENTBUILDER_PROPERTY_NAME';
+		}
+		// load the subform attributes
+		ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
+		// add name list if found
+		if (ComponentbuilderHelper::checkArray($nameListOptions))
+		{
+			ComponentbuilderHelper::xmlAddOptions($nameXML, $nameListOptions);
+		}
+		// now add the fields to the child form
+		ComponentbuilderHelper::xmlAppend($childForm, $nameXML);
+
+		// start building the name field XML
+		$valueXML = new SimpleXMLElement('<field/>');
+		// subform attributes
+		$valueAttribute = array(
+			'type' => 'textarea',
+			'name' => 'value',
+			'label' => 'COM_COMPONENTBUILDER_VALUE',
+			'rows' => '1',
+			'cols' => '15',
+			'class' => 'text_area  span12',
+			'filter' => 'STRING',
+			'hint' => 'COM_COMPONENTBUILDER_PROPERTY_VALUE');
+		// load the subform attributes
+		ComponentbuilderHelper::xmlAddAttributes($valueXML, $valueAttribute);
+		// now add the fields to the child form
+		ComponentbuilderHelper::xmlAppend($childForm, $valueXML);
+
+		// start building the desc field XML
+		$descXML = new SimpleXMLElement('<field/>');
+		// subform attributes
+		$descAttribute = array(
+			'type' => 'textarea',
+			'name' => 'desc',
+			'label' => 'COM_COMPONENTBUILDER_DESCRIPTION',
+			'rows' => '3',
+			'cols' => '25',
+			'readonly' => 'true',
+			'class' => 'text_area span12',
+			'filter' => 'WORD',
+			'hint' => 'COM_COMPONENTBUILDER_SELECT_A_PROPERTY');
+		// load the desc attributes
+		ComponentbuilderHelper::xmlAddAttributes($descXML, $descAttribute);
+		// now add the fields to the child form
+		ComponentbuilderHelper::xmlAppend($childForm, $descXML);
+
+		// setup subform with values
+		$subform->setup($subformXML, $values);
+
+		// return subfrom object
+		return $subform;
+	}
+
+	public function getFieldPropertyDesc($_property, $fieldtype)
+	{
+		if (is_numeric($fieldtype))
+		{
+			// Get a db connection.
+			$db = JFactory::getDbo();
+
+			// Create a new query object.
+			$query = $db->getQuery(true);
+			$query->select($db->quoteName(array('properties', 'short_description', 'description')));
+			$query->from($db->quoteName('#__componentbuilder_fieldtype'));
+			$query->where($db->quoteName('id') . ' = '. (int) $fieldtype);
+
+			// Reset the query using our newly populated query object.
+			$db->setQuery($query);
+			$db->execute();
+			if ($db->getNumRows())
+			{
+				// get the result
+				$result = $db->loadObject();
+				// get the xml
+				$xml = $this->getFieldXML($fieldtype);
+				// open the properties
+				$properties = json_decode($result->properties,true);
+				// value to check since there are false and null values even 0 in the values returned
+				$confirmation = '8qvZHoyuFYQqpj0YQbc6F3o5DhBlmS-_-a8pmCZfOVSfANjkmV5LG8pCdAY2JNYu6cB';
+				// make sure we have an array
+				if (ComponentbuilderHelper::checkArray($properties))
+				{
+					foreach ($properties as $property)
+					{
+						if(isset($property['name']) && $_property === $property['name'])
+						{
+							// check if we should load the value
+							$value = ComponentbuilderHelper::getValueFromXMLstring($xml, $property['name'], $confirmation);
+							if ($confirmation === $value)
+							{
+								$value = (isset($property['example']) && ComponentbuilderHelper::checkString($property['example'])) ? $property['example'] : '';
+							}
+							// return the found values
+							return array('value' => $value, 'desc' => $property['description']);
+						}
+					}
+				}
+			}
+		}
+		elseif (isset($this->extraFieldProperties[$_property]))
+		{
+			return array('value' => '', 'desc' => JText::_($this->extraFieldProperties[$_property]));
+		}
+		return false;
+	}
+
+	protected function getFieldXML($fieldtype)
+	{
+		// reset xml to null
+		$xml = null;
+		// get the view name & id
+		$global = $this->getViewID();
+		// get the xml if this view already has it set
+		if (!is_null($global['a_id']) && $global['a_id'] > 0 && isset($global['a_view']) && 'field' === $global['a_view'])
+		{
+			// first check field type
+			$_fieldType = ComponentbuilderHelper::getVar('field', $global['a_id'], 'id', 'fieldtype');
+			// only continue if field type is the same
+			if ($fieldtype == $_fieldType)
+			{
+				$xmlDB = ComponentbuilderHelper::getVar('field', $global['a_id'], 'id', 'xml');
+				// check if it is a string
+				if (ComponentbuilderHelper::checkString($xmlDB))
+				{
+					$xml = json_decode($xmlDB);
+				}
+			}
+		}
+		return $xml;
 	}
 
 	// Used in get_snippets

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||importjcbpackages||index.php?option=com_componentbuilder&view=import_joomla_components&target=smartPackage', '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.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.servers', 'png.help_documents')
+			'main' => array('png.compiler', 'png.joomla_component.add', 'png.joomla_components', 'png.admin_view.add', 'png.admin_views', 'png||importjcbpackages||index.php?option=com_componentbuilder&view=joomla_components&task=joomla_components.smartImport', '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.snippets', 'png.get_snippets', 'png.validation_rules', 'png.field.add', 'png.fields', 'png.fields.catid', 'png.fieldtype.add', 'png.fieldtypes', 'png.fieldtypes.catid', 'png.language_translations', 'png.servers', 'png.help_documents')
 		);
 		// view access array
 		$viewAccess = array(

admin/models/field.php

@@ -106,10 +106,10 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->xml = json_decode($item->xml);
 			}
 
-			if (!empty($item->css_view))
+			if (!empty($item->javascript_view_footer))
 			{
-				// base64 Decode css_view.
-				$item->css_view = base64_decode($item->css_view);
+				// base64 Decode javascript_view_footer.
+				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 			}
 
 			if (!empty($item->css_views))
@@ -118,10 +118,10 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->css_views = base64_decode($item->css_views);
 			}
 
-			if (!empty($item->javascript_view_footer))
+			if (!empty($item->css_view))
 			{
-				// base64 Decode javascript_view_footer.
-				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+				// base64 Decode css_view.
+				$item->css_view = base64_decode($item->css_view);
 			}
 
 			if (!empty($item->javascript_views_footer))
@@ -889,16 +889,65 @@ class ComponentbuilderModelField extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
+		// get the properties
+		$properties = $input->get('properties', null, 'ARRAY');
+		// get the extra properties
+		$extraproperties = $input->get('extraproperties', null, 'ARRAY');
+		// make sure we have an array
+		if (ComponentbuilderHelper::checkArray($properties))
+		{
+			// set the bucket
+			$bucket = array();
+			foreach($properties as $property)
+			{
+				// make sure we have the correct values
+				if (ComponentbuilderHelper::checkArray($property) && isset($property['name']) && ComponentbuilderHelper::checkString($property['name']) && isset($property['value']))
+				{
+					// fix the name (TODO)
+					// $property['name'] = ComponentbuilderHelper::safeString($property['name']);
+					// some fixes, just in case (more can be added)
+					switch ($property['name'])
+					{
+						// fix the values
+						case 'name':
+						case 'type':
+							$property['value'] = ComponentbuilderHelper::safeString($property['value']);
+						break;
+					}
+					// load the property
+					$bucket[] = "\t".$property['name'].'="'. str_replace('"', """, $property['value']).'"';
+				}
+			}
+			// make sure we have an array
+			if (ComponentbuilderHelper::checkArray($extraproperties))
+			{
+				foreach($extraproperties as $xproperty)
+				{
+					// make sure we have the correct values
+					if (ComponentbuilderHelper::checkArray($xproperty) && isset($xproperty['name']) && ComponentbuilderHelper::checkString($xproperty['name']) && isset($xproperty['value']))
+					{
+						// load the extra property
+						$bucket[] = "\t".ComponentbuilderHelper::safeString($xproperty['name']).'="'. str_replace('"', """, $xproperty['value']).'"';
+					}
+				}
+			}
+			// if the bucket has been loaded
+			if (ComponentbuilderHelper::checkArray($bucket))
+			{
+				$data['xml'] = "<field\n".implode("\n", $bucket)."\n/>";
+			}
+		}
+
 		// Set the xml string to JSON string.
 		if (isset($data['xml']))
 		{
 			$data['xml'] = (string) json_encode($data['xml']);
 		}
 
-		// Set the css_view string to base64 string.
-		if (isset($data['css_view']))
+		// Set the javascript_view_footer string to base64 string.
+		if (isset($data['javascript_view_footer']))
 		{
-			$data['css_view'] = base64_encode($data['css_view']);
+			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
 		}
 
 		// Set the css_views string to base64 string.
@@ -907,10 +956,10 @@ class ComponentbuilderModelField extends JModelAdmin
 			$data['css_views'] = base64_encode($data['css_views']);
 		}
 
-		// Set the javascript_view_footer string to base64 string.
-		if (isset($data['javascript_view_footer']))
+		// Set the css_view string to base64 string.
+		if (isset($data['css_view']))
 		{
-			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
+			$data['css_view'] = base64_encode($data['css_view']);
 		}
 
 		// Set the javascript_views_footer string to base64 string.

admin/models/fields.php

@@ -49,10 +49,10 @@ class ComponentbuilderModelFields extends JModelList
 				'a.datatype','datatype',
 				'a.indexes','indexes',
 				'a.null_switch','null_switch',
+				'a.store','store',
 				'c.title','category_title',
 				'c.id', 'category_id',
-				'a.catid', 'catid',
-				'a.store','store'
+				'a.catid', 'catid'
 			);
 		}
 
@@ -88,6 +88,9 @@ class ComponentbuilderModelFields extends JModelList
 		$null_switch = $this->getUserStateFromRequest($this->context . '.filter.null_switch', 'filter_null_switch');
 		$this->setState('filter.null_switch', $null_switch);
 
+		$store = $this->getUserStateFromRequest($this->context . '.filter.store', 'filter_store');
+		$this->setState('filter.store', $store);
+
 		$category = $app->getUserStateFromRequest($this->context . '.filter.category', 'filter_category');
 		$this->setState('filter.category', $category);
 
@@ -95,10 +98,7 @@ class ComponentbuilderModelFields extends JModelList
 		$this->setState('filter.category_id', $categoryId);
 
 		$catid = $app->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid');
-		$this->setState('filter.catid', $catid);
-
-		$store = $this->getUserStateFromRequest($this->context . '.filter.store', 'filter_store');
-		$this->setState('filter.store', $store);
+		$this->setState('filter.catid', $catid);
         
 		$sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
 		$this->setState('filter.sorting', $sorting);
@@ -313,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.catid LIKE '.$search.' OR a.xml 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.store LIKE '.$search.' OR a.catid LIKE '.$search.' OR a.xml LIKE '.$search.')');
 			}
 		}
 
@@ -431,12 +431,12 @@ class ComponentbuilderModelFields extends JModelList
 							continue;
 						}
 
-						// decode css_view
-						$item->css_view = base64_decode($item->css_view);
-						// decode css_views
-						$item->css_views = base64_decode($item->css_views);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode css_views
+						$item->css_views = base64_decode($item->css_views);
+						// decode css_view
+						$item->css_view = base64_decode($item->css_view);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 						// unset the values we don't want exported.
@@ -504,10 +504,10 @@ class ComponentbuilderModelFields extends JModelList
 		$id .= ':' . $this->getState('filter.datatype');
 		$id .= ':' . $this->getState('filter.indexes');
 		$id .= ':' . $this->getState('filter.null_switch');
+		$id .= ':' . $this->getState('filter.store');
 		$id .= ':' . $this->getState('filter.category');
 		$id .= ':' . $this->getState('filter.category_id');
-		$id .= ':' . $this->getState('filter.catid');
-		$id .= ':' . $this->getState('filter.store');
+		$id .= ':' . $this->getState('filter.catid');
 
 		return parent::getStoreId($id);
 	}

admin/models/fields/adminsviews.php

@@ -40,107 +40,7 @@ class JFormFieldAdminsviews extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'adminsviews'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create admin_view
-			if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_view&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit admin_view
-			if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_views&task=admin_view.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$buttonName."Create').show();
-							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
-						}
-					}";
-			}
-			// check if button was created for admin_view field.
-			if (is_array($button) && count($button) > 0)
-			{
-				// Load the needed script.
-				$document = JFactory::getDocument();
-				$document->addScriptDeclaration(implode(' ',$script));
-				// return the button attached to input field.
-				return '<div class="input-append">' .$html . implode('',$button).'</div>';
-			}
-		}
-		return $html;
-	}
+	public $type = 'adminsviews';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/adminviewfolderlist.php

@@ -40,107 +40,7 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'adminviewfolderlist'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create 
-			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=&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit 
-			if (($buttonName === '' || $buttonName === '')  && $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=&task=.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  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;
-	}
+	public $type = 'adminviewfolderlist';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/adminviews.php

@@ -40,107 +40,7 @@ class JFormFieldAdminviews extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'adminviews'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create admin_view
-			if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_view&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit admin_view
-			if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_views&task=admin_view.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$buttonName."Create').show();
-							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
-						}
-					}";
-			}
-			// check if button was created for admin_view field.
-			if (is_array($button) && count($button) > 0)
-			{
-				// Load the needed script.
-				$document = JFactory::getDocument();
-				$document->addScriptDeclaration(implode(' ',$script));
-				// return the button attached to input field.
-				return '<div class="input-append">' .$html . implode('',$button).'</div>';
-			}
-		}
-		return $html;
-	}
+	public $type = 'adminviews';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/adminviewsreadonly.php

@@ -40,107 +40,7 @@ class JFormFieldAdminviewsreadonly extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'adminviewsreadonly'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create admin_view
-			if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_view&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit admin_view
-			if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_views&task=admin_view.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$buttonName."Create').show();
-							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
-						}
-					}";
-			}
-			// check if button was created for admin_view field.
-			if (is_array($button) && count($button) > 0)
-			{
-				// Load the needed script.
-				$document = JFactory::getDocument();
-				$document->addScriptDeclaration(implode(' ',$script));
-				// return the button attached to input field.
-				return '<div class="input-append">' .$html . implode('',$button).'</div>';
-			}
-		}
-		return $html;
-	}
+	public $type = 'adminviewsreadonly';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/aliasbuilder.php

@@ -40,107 +40,7 @@ class JFormFieldAliasbuilder extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'aliasbuilder'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create field
-			if ($user->authorise('field.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=field&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit field
-			if (($buttonName === 'field' || $buttonName === 'fields') && $user->authorise('field.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=fields&task=field.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 field 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;
-	}
+	public $type = 'aliasbuilder';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/articles.php

@@ -40,107 +40,7 @@ class JFormFieldArticles extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'articles'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create article
-			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=article&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit article
-			if (($buttonName === 'article' || $buttonName === 'articles')  && $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=articles&task=article.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 article 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;
-	}
+	public $type = 'articles';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/component.php

@@ -40,7 +40,8 @@ class JFormFieldComponent extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'component'; 
+	public $type = 'component';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/componentadminmenus.php

@@ -40,107 +40,7 @@ class JFormFieldComponentadminmenus extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'componentadminmenus'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create admin_view
-			if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_view&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit admin_view
-			if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_views&task=admin_view.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$buttonName."Create').show();
-							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
-						}
-					}";
-			}
-			// check if button was created for admin_view field.
-			if (is_array($button) && count($button) > 0)
-			{
-				// Load the needed script.
-				$document = JFactory::getDocument();
-				$document->addScriptDeclaration(implode(' ',$script));
-				// return the button attached to input field.
-				return '<div class="input-append">' .$html . implode('',$button).'</div>';
-			}
-		}
-		return $html;
-	}
+	public $type = 'componentadminmenus';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/componentadminviews.php

@@ -40,107 +40,7 @@ class JFormFieldComponentadminviews extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'componentadminviews'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create admin_view
-			if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_view&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit admin_view
-			if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_views&task=admin_view.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$buttonName."Create').show();
-							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
-						}
-					}";
-			}
-			// check if button was created for admin_view field.
-			if (is_array($button) && count($button) > 0)
-			{
-				// Load the needed script.
-				$document = JFactory::getDocument();
-				$document->addScriptDeclaration(implode(' ',$script));
-				// return the button attached to input field.
-				return '<div class="input-append">' .$html . implode('',$button).'</div>';
-			}
-		}
-		return $html;
-	}
+	public $type = 'componentadminviews';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/components.php

@@ -40,107 +40,7 @@ class JFormFieldComponents extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'components'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create joomla_component
-			if ($user->authorise('joomla_component.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=joomla_component&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit joomla_component
-			if (($buttonName === 'joomla_component' || $buttonName === 'joomla_components') && $user->authorise('joomla_component.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=joomla_components&task=joomla_component.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 joomla_component 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;
-	}
+	public $type = 'components';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/customadminviews.php

@@ -40,107 +40,7 @@ class JFormFieldCustomadminviews extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'customadminviews'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create 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;
-	}
+	public $type = 'customadminviews';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/customfilelist.php

@@ -40,107 +40,7 @@ class JFormFieldCustomfilelist extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'customfilelist'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create 
-			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=&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit 
-			if (($buttonName === '' || $buttonName === '')  && $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=&task=.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  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;
-	}
+	public $type = 'customfilelist';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/customfolderlist.php

@@ -40,107 +40,7 @@ class JFormFieldCustomfolderlist extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'customfolderlist'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create 
-			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=&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit 
-			if (($buttonName === '' || $buttonName === '')  && $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=&task=.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  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;
-	}
+	public $type = 'customfolderlist';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/customgets.php

@@ -40,107 +40,7 @@ class JFormFieldCustomgets extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'customgets'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create dynamic_get
-			if ($user->authorise('dynamic_get.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=dynamic_get&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit dynamic_get
-			if (($buttonName === 'dynamic_get' || $buttonName === 'dynamic_gets') && $user->authorise('dynamic_get.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=dynamic_gets&task=dynamic_get.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 dynamic_get 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;
-	}
+	public $type = 'customgets';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/dbtables.php

@@ -40,107 +40,7 @@ class JFormFieldDbtables extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'dbtables'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create 
-			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=&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit 
-			if (($buttonName === '' || $buttonName === '')  && $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=&task=.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  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;
-	}
+	public $type = 'dbtables';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/dynamicdashboard.php

@@ -40,107 +40,7 @@ class JFormFieldDynamicdashboard extends JFormFieldList
 	 *
 	 * @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 = '&ref=' . $values['view'] . '&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;
-	}
+	public $type = 'dynamicdashboard';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/dynamicget.php

@@ -40,7 +40,8 @@ class JFormFieldDynamicget extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'dynamicget'; 
+	public $type = 'dynamicget';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/dynamicgets.php

@@ -40,107 +40,7 @@ class JFormFieldDynamicgets extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'dynamicgets'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create dynamic_get
-			if ($user->authorise('dynamic_get.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=dynamic_get&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit dynamic_get
-			if (($buttonName === 'dynamic_get' || $buttonName === 'dynamic_gets') && $user->authorise('dynamic_get.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=dynamic_gets&task=dynamic_get.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 dynamic_get 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;
-	}
+	public $type = 'dynamicgets';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/existingvalidationrules.php

@@ -40,107 +40,7 @@ class JFormFieldExistingvalidationrules extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'existingvalidationrules'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create validation_rule
-			if ($user->authorise('validation_rule.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=validation_rule&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit validation_rule
-			if (($buttonName === 'validation_rule' || $buttonName === 'validation_rules') && $user->authorise('validation_rule.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=validation_rules&task=validation_rule.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 validation_rule 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;
-	}
+	public $type = 'existingvalidationrules';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/fields.php

@@ -40,107 +40,7 @@ class JFormFieldFields extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'fields'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create field
-			if ($user->authorise('field.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=field&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit field
-			if (($buttonName === 'field' || $buttonName === 'fields') && $user->authorise('field.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=fields&task=field.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 field 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;
-	}
+	public $type = 'fields';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/fieldtypes.php

@@ -40,7 +40,8 @@ class JFormFieldFieldtypes extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'fieldtypes'; 
+	public $type = 'fieldtypes';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/filebehaviour.php

@@ -40,107 +40,7 @@ class JFormFieldFilebehaviour extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'filebehaviour'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create 
-			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=&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit 
-			if (($buttonName === '' || $buttonName === '')  && $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=&task=.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  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;
-	}
+	public $type = 'filebehaviour';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/joomlacomponents.php

@@ -40,107 +40,7 @@ class JFormFieldJoomlacomponents extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'joomlacomponents'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create joomla_component
-			if ($user->authorise('joomla_component.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=joomla_component&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit joomla_component
-			if (($buttonName === 'joomla_component' || $buttonName === 'joomla_components') && $user->authorise('joomla_component.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=joomla_components&task=joomla_component.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 joomla_component 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;
-	}
+	public $type = 'joomlacomponents';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/lang.php

@@ -40,107 +40,7 @@ class JFormFieldLang extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'lang'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create language
-			if ($user->authorise('language.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=language&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit language
-			if (($buttonName === 'language' || $buttonName === 'languages') && $user->authorise('language.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=languages&task=language.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 language 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;
-	}
+	public $type = 'lang';
 
 	/**
 	 * Method to get a list of options for a list input.
@@ -163,7 +63,7 @@ class JFormFieldLang extends JFormFieldList
 			$options[] = JHtml::_('select.option', '', 'Select an option');
 			foreach($items as $item)
 			{
-				$options[] = JHtml::_('select.option', $item->langtag, $item->language_name . ' (' .$item->langtag.')');
+				$options[] = JHtml::_('select.option', trim($item->langtag), $item->language_name . ' (' .$item->langtag.')');
 			}
 		}
 		return $options;

admin/models/fields/libconfigfield.php

@@ -40,107 +40,7 @@ class JFormFieldLibconfigfield extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'libconfigfield'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create field
-			if ($user->authorise('field.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=field&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit field
-			if (($buttonName === 'field' || $buttonName === 'fields') && $user->authorise('field.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=fields&task=field.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 field 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;
-	}
+	public $type = 'libconfigfield';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/libraries.php

@@ -40,7 +40,8 @@ class JFormFieldLibraries extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'libraries'; 
+	public $type = 'libraries';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/librariesx.php

@@ -40,7 +40,8 @@ class JFormFieldLibrariesx extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'librariesx'; 
+	public $type = 'librariesx';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/library.php

@@ -40,7 +40,8 @@ class JFormFieldLibrary extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'library'; 
+	public $type = 'library';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/libraryfiles.php

@@ -40,107 +40,7 @@ class JFormFieldLibraryfiles extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'libraryfiles'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create 
-			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=&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit 
-			if (($buttonName === '' || $buttonName === '')  && $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=&task=.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  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;
-	}
+	public $type = 'libraryfiles';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/libraryreadonly.php

@@ -40,107 +40,7 @@ class JFormFieldLibraryreadonly extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'libraryreadonly'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create library
-			if ($user->authorise('library.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=library&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit library
-			if (($buttonName === 'library' || $buttonName === 'libraries') && $user->authorise('library.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=libraries&task=library.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 library 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;
-	}
+	public $type = 'libraryreadonly';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/maingets.php

@@ -40,7 +40,8 @@ class JFormFieldMaingets extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'maingets'; 
+	public $type = 'maingets';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/matchfield.php

@@ -40,107 +40,7 @@ class JFormFieldMatchfield extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'matchfield'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create field
-			if ($user->authorise('field.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=field&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit field
-			if (($buttonName === 'field' || $buttonName === 'fields') && $user->authorise('field.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=fields&task=field.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 field 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;
-	}
+	public $type = 'matchfield';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/servers.php

@@ -40,7 +40,8 @@ class JFormFieldServers extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'servers'; 
+	public $type = 'servers';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/siteviewfolderlist.php

@@ -40,107 +40,7 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'siteviewfolderlist'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create 
-			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=&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit 
-			if (($buttonName === '' || $buttonName === '')  && $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=&task=.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  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;
-	}
+	public $type = 'siteviewfolderlist';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/siteviews.php

@@ -40,107 +40,7 @@ class JFormFieldSiteviews extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'siteviews'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create site_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=site_view&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit site_view
-			if (($buttonName === 'site_view' || $buttonName === 'site_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=site_views&task=site_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 site_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;
-	}
+	public $type = 'siteviews';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/snippets.php

@@ -40,7 +40,8 @@ class JFormFieldSnippets extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'snippets'; 
+	public $type = 'snippets';
+
 	/**
 	 * Override to add new button
 	 *

admin/models/fields/snippettype.php

@@ -40,107 +40,7 @@ class JFormFieldSnippettype extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'snippettype'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create snippet_type
-			if ($user->authorise('snippet_type.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=snippet_type&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit snippet_type
-			if (($buttonName === 'snippet_type' || $buttonName === 'snippet_types') && $user->authorise('snippet_type.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=snippet_types&task=snippet_type.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 snippet_type 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;
-	}
+	public $type = 'snippettype';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/targetfields.php

@@ -40,107 +40,7 @@ class JFormFieldTargetfields extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'targetfields'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create field
-			if ($user->authorise('field.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=field&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit field
-			if (($buttonName === 'field' || $buttonName === 'fields') && $user->authorise('field.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=fields&task=field.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 field 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;
-	}
+	public $type = 'targetfields';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/fields/viewtabs.php

@@ -40,107 +40,7 @@ class JFormFieldViewtabs extends JFormFieldList
 	 *
 	 * @var		string
 	 */
-	public $type = 'viewtabs'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create admin_view
-			if ($user->authorise('admin_view.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_view&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit admin_view
-			if (($buttonName === 'admin_view' || $buttonName === 'admin_views') && $user->authorise('admin_view.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<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=admin_views&task=admin_view.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$buttonName."Create').show();
-							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
-						}
-					}";
-			}
-			// check if button was created for admin_view field.
-			if (is_array($button) && count($button) > 0)
-			{
-				// Load the needed script.
-				$document = JFactory::getDocument();
-				$document->addScriptDeclaration(implode(' ',$script));
-				// return the button attached to input field.
-				return '<div class="input-append">' .$html . implode('',$button).'</div>';
-			}
-		}
-		return $html;
-	}
+	public $type = 'viewtabs';
 
 	/**
 	 * Method to get a list of options for a list input.

admin/models/forms/admin_fields.xml

@@ -105,8 +105,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ADDFIELDS_DESCRIPTION"
-			icon="list"
-			maximum="800">
+			icon="list">
 			<form hidden="true" name="list_addfields_modal" repeat="true">
 				<!-- Field Field. Type: Fields. (custom) -->
 				<field
@@ -119,28 +118,36 @@
 					required="false"
 					button="false"
 				/>
-				<!-- List Field. Type: Checkbox. (joomla) -->
+				<!-- List Field. Type: List. (joomla) -->
 				<field
-					type="checkbox"
+					type="list"
 					name="list"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_LABEL"
-					value="1"
-					required="false"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_LIST_DESCRIPTION"
-					class="inputbox"
-				/>
+					class="fieldMedium count-the-items1235"
+					multiple="false"
+					required="false"
+					onchange="checkAdminBehaviour(this)">
+					<!-- Option Set. -->
+					<option value="">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_DEFAULT</option>
+					<option value="1">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_SHOW_IN_LIST_VIEW</option>
+					<option value="2">
+						COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE_DB</option>
+				</field>
 				<!-- Order_list Field. Type: Integer. (joomla) -->
 				<field
 					type="integer"
 					name="order_list"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_LIST_LABEL"
-					default="0"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_ORDER_LIST_DESCRIPTION"
 					class="fieldSmall"
 					required="false"
 					first="0"
 					last="20"
 					step="1"
+					onchange="checkAdminBehaviour(this)"
 				/>
 				<!-- Title Field. Type: Checkbox. (joomla) -->
 				<field
@@ -260,10 +267,9 @@
 					name="permission"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_PERMISSION_DESCRIPTION"
-					class="fieldMedium"
+					class="fieldMid"
 					multiple="false"
-					required="false"
-					default="0">
+					required="false">
 					<!-- Option Set. -->
 					<option value="0">
 						COM_COMPONENTBUILDER_ADMIN_FIELDS_NONE</option>

admin/models/forms/admin_fields_conditions.xml

@@ -105,8 +105,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_ADDCONDITIONS_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addconditions_modal" repeat="true">
 				<!-- Target_field Field. Type: Targetfields. (custom) -->
 				<field

admin/models/forms/admin_view.xml

@@ -332,8 +332,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION"
-			icon="list"
-			maximum="20">
+			icon="list">
 			<form hidden="true" name="list_addpermissions_modal" repeat="true">
 				<!-- Action Field. Type: List. (joomla) -->
 				<field
@@ -435,8 +434,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS_DESCRIPTION"
-			icon="list"
-			maximum="14">
+			icon="list">
 			<form hidden="true" name="list_addtabs_modal" repeat="true">
 				<!-- Name Field. Type: Text. (joomla) -->
 				<field
@@ -494,8 +492,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDLINKED_VIEWS_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addlinked_views_modal" repeat="true">
 				<!-- Adminview Field. Type: Adminviews. (custom) -->
 				<field
@@ -659,8 +656,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_addtables_modal" repeat="true">
 				<!-- Table Field. Type: Dbtables. (custom) -->
 				<field
@@ -1144,8 +1140,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="7">
+			icon="list">
 			<form hidden="true" name="list_custom_button_modal" repeat="true">
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field
@@ -1812,8 +1807,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_AJAX_INPUT_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="150">
+			icon="list">
 			<form hidden="true" name="list_ajax_input_modal" repeat="true">
 				<!-- Value_name Field. Type: Text. (joomla) -->
 				<field

admin/models/forms/component_admin_views.xml

@@ -105,8 +105,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADDADMIN_VIEWS_DESCRIPTION"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_addadmin_views_modal" repeat="true">
 				<!-- Adminview Field. Type: Adminviews. (custom) -->
 				<field

admin/models/forms/component_config.xml

@@ -105,8 +105,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_ADDCONFIG_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addconfig_modal" repeat="true">
 				<!-- Field Field. Type: Fields. (custom) -->
 				<field

admin/models/forms/component_custom_admin_menus.xml

@@ -104,8 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_ADDCUSTOMMENUS_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_addcustommenus_modal" repeat="true">
 				<!-- Name Field. Type: Text. (joomla) -->
 				<field

admin/models/forms/component_custom_admin_views.xml

@@ -104,8 +104,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_ADDCUSTOM_ADMIN_VIEWS_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_addcustom_admin_views_modal" repeat="true">
 				<!-- Customadminview Field. Type: Customadminviews. (custom) -->
 				<field

admin/models/forms/component_dashboard.xml

@@ -105,7 +105,6 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			icon="list"
-			maximum="10"
 			filter="raw">
 			<form hidden="true" name="list_dashboard_tab_modal" repeat="true">
 				<!-- Name Field. Type: Text. (joomla) -->

admin/models/forms/component_files_folders.xml

@@ -107,8 +107,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERSFULLPATH_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addfoldersfullpath_modal" repeat="true">
 				<!-- Folderpath Field. Type: Text. (joomla) -->
 				<field
@@ -161,8 +160,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILESFULLPATH_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addfilesfullpath_modal" repeat="true">
 				<!-- Filepath Field. Type: Text. (joomla) -->
 				<field
@@ -216,8 +214,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFOLDERS_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addfolders_modal" repeat="true">
 				<!-- Folder Field. Type: Customfolderlist. (custom) -->
 				<field
@@ -268,8 +265,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ADDFILES_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addfiles_modal" repeat="true">
 				<!-- File Field. Type: Customfilelist. (custom) -->
 				<field

admin/models/forms/component_mysql_tweaks.xml

@@ -105,8 +105,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_SQL_TWEAK_DESCRIPTION"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_sql_tweak_modal" repeat="true">
 				<!-- Adminview Field. Type: Componentadminviews. (custom) -->
 				<field

admin/models/forms/component_site_views.xml

@@ -105,8 +105,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_ADDSITE_VIEWS_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addsite_views_modal" repeat="true">
 				<!-- Siteview Field. Type: Siteviews. (custom) -->
 				<field

admin/models/forms/component_updates.xml

@@ -105,8 +105,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_DESCRIPTION"
-			icon="list"
-			maximum="300">
+			icon="list">
 			<form hidden="true" name="list_version_update_modal" repeat="true">
 				<!-- Version Field. Type: Text. (joomla) -->
 				<field

admin/models/forms/custom_admin_view.xml

@@ -200,8 +200,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_AJAX_INPUT_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="150">
+			icon="list">
 			<form hidden="true" name="list_ajax_input_modal" repeat="true">
 				<!-- Value_name Field. Type: Text. (joomla) -->
 				<field
@@ -612,8 +611,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="7">
+			icon="list">
 			<form hidden="true" name="list_custom_button_modal" repeat="true">
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field

admin/models/forms/dynamic_get.xml

@@ -279,6 +279,7 @@
 			class="list_class"
 			multiple="false"
 			required="true"
+			button="false"
 		/>
 		<!-- View_selection Field. Type: Textarea. (joomla) -->
 		<field
@@ -388,8 +389,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_DESCRIPTION"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_filter_modal" repeat="true">
 				<!-- Filter_type Field. Type: List. (joomla) -->
 				<field
@@ -516,8 +516,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_WHERE_DESCRIPTION"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_where_modal" repeat="true">
 				<!-- Table_key Field. Type: Text. (joomla) -->
 				<field
@@ -609,8 +608,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_ORDER_DESCRIPTION"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_order_modal" repeat="true">
 				<!-- Table_key Field. Type: Text. (joomla) -->
 				<field
@@ -666,8 +664,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_GLOBAL_DESCRIPTION"
-			icon="list"
-			maximum="200">
+			icon="list">
 			<form hidden="true" name="list_global_modal" repeat="true">
 				<!-- Name Field. Type: Text. (joomla) -->
 				<field
@@ -842,8 +839,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_VIEW_TABLE_DESCRIPTION"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_join_view_table_modal" repeat="true">
 				<!-- View_table Field. Type: Adminviews. (custom) -->
 				<field
@@ -1111,8 +1107,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_JOIN_DB_TABLE_DESCRIPTION"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_join_db_table_modal" repeat="true">
 				<!-- Db_table Field. Type: Dbtables. (custom) -->
 				<field

admin/models/forms/field.js

@@ -512,6 +512,9 @@ function isSet(val)
 
 jQuery(document).ready(function()
 {
+	// get type value
+	var fieldtype = jQuery("#jform_fieldtype option:selected").val();
+	getFieldOptions(fieldtype);
 	// get the linked details
 	getLinked();
 	// get the validation rules
@@ -569,10 +572,13 @@ function addButton(type, where, size){
 	})
 }
 
-function getFieldOptions_server(fieldId){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json";
-	if(token.length > 0 && fieldId > 0){
-		var request = 'token='+token+'&id='+fieldId;
+// the options row id key
+var rowIdKey = 'properties';
+
+function getFieldOptions_server(fieldtype){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json&vdm="+vastDevMod;
+	if(token.length > 0 && fieldtype > 0){
+		var request = 'token='+token+'&id='+fieldtype;
 	}
 	return jQuery.ajax({
 		type: 'GET',
@@ -583,20 +589,162 @@ function getFieldOptions_server(fieldId){
 	});
 }
 
-function getFieldOptions(id,setValue){
-	getFieldOptions_server(id).done(function(result) {
-		if(result.values){
-			if(setValue){
-				jQuery('textarea#jform_xml').val(result.values);
-			}
+function getFieldOptions(fieldtype){
+	getFieldOptions_server(fieldtype).done(function(result) {
+		if(result.subform){
+			// load the list of properties
+			propertiesArray = result.nameListOptions;
+			// remove previous forms of exist
+			jQuery('.prop_removal').remove();
+			// hide notice
+			jQuery('.note_select_field_type').closest('.control-group').remove();
+			// append to note_filter_information class
+			jQuery('.note_filter_information').closest('.control-group').prepend(result.extra);
+			// append to note_filter_information class
+			jQuery('.note_filter_information').closest('.control-group').prepend(result.subform);
+			// add the watcher
+			rowWatcher();
+			// initialize the new form
+			jQuery('div.subform-repeatable').subformRepeatable();
+			// update all the list fields to only show items not selected already
+			propertyDynamicSet();
+			// set the field type info
 			jQuery('#help').remove();
-			jQuery('.helpNote').append('<div id="help" class="uk-scrollable-box">'+result.description+'<br />'+result.values_description+'</div>');
+			jQuery('.helpNote').append('<div id="help">'+result.description+'<br />'+result.values_description+'</div>');
 		}
 	})
 }
 
+function getFieldPropertyDesc(field, targetForm){
+	// get the ID
+	var id = jQuery(field).attr('id');
+	// build the target array
+	var target = id.split('__');
+	// get property value
+	var property = jQuery(field).val();
+	// first check that there isn't any of this property type already set
+	if (propertyIsSet(property, id, targetForm)) {
+		// reset the selection
+		jQuery('#'+id).val('');
+		jQuery('#'+id).trigger("liszt:updated");
+		// give out a notice
+		jQuery.UIkit.notify({message: Joomla.JText._('COM_COMPONENTBUILDER_PROPERTY_ALREADY_SELECTED_TRY_ANOTHER'), timeout: 5000, status: 'warning', pos: 'top-center'});
+		// update the values
+		jQuery('#'+target[0]+'__desc').val('');
+		jQuery('#'+target[0]+'__value').val('');
+	} else {
+		// do a dynamic update
+		propertyDynamicSet();
+		// get type value
+		if (targetForm === 'properties') {
+			var fieldtype = jQuery("#jform_fieldtype option:selected").val();
+		} else {
+			var fieldtype = 'extra';
+		}
+		getFieldPropertyDesc_server(fieldtype, property).done(function(result) {
+			if(result.desc || result.value){
+				// update the values
+				jQuery('#'+target[0]+'__desc').val(result.desc);
+				jQuery('#'+target[0]+'__value').val(result.value);
+			} else {
+				// update the values
+				jQuery('#'+target[0]+'__desc').val(Joomla.JText._('COM_COMPONENTBUILDER_NO_DESCRIPTION_FOUND'));
+				jQuery('#'+target[0]+'__value').val('');
+			}
+		});
+	}
+}
+
+// set properties the options
+propertiesArray = {};
+var propertyIdRemoved;
+
+function propertyDynamicSet() {
+	propertiesAvailable = {};
+	propertiesSelectedArray = {};
+	propertiesTrackerArray = {};
+	var i;
+	for (i = 0; i < 70; i++) { // for now this is the number of field we should check
+		// build ID
+		var id_check = rowIdKey+'_'+rowIdKey+i+'__name';
+		// first check if Id is on page as that not the same as the one currently calling
+		if (jQuery("#"+id_check).length && propertyIdRemoved !== id_check) {
+			// build the selected array
+			var key =  jQuery("#"+id_check+" option:selected").val();
+			var text =  jQuery("#"+id_check+" option:selected").text();
+			propertiesSelectedArray[key] = text;
+			// keep track of the value set
+			propertiesTrackerArray[id_check] = key;
+			// clear the options out
+			jQuery("#"+id_check).find('option').remove().end();
+		}
+	}
+	// trigger chosen on the list fields
+	jQuery('.field_list_name_options').chosen({"disable_search_threshold":10,"search_contains":true,"allow_single_deselect":true,"placeholder_text_multiple":Joomla.JText._("COM_COMPONENTBUILDER_TYPE_OR_SELECT_SOME_OPTIONS"),"placeholder_text_single":Joomla.JText._("COM_COMPONENTBUILDER_SELECT_A_PROPERTY"),"no_results_text":Joomla.JText._("COM_COMPONENTBUILDER_NO_RESULTS_MATCH")});
+	// now build the list to keep
+	jQuery.each( propertiesArray, function( prop, name ) {
+		if (!propertiesSelectedArray.hasOwnProperty(prop)) {
+			propertiesAvailable[prop] = name;
+		}
+	});
+	// now add the lists back
+	jQuery.each( propertiesTrackerArray, function( tId, tKey ) {
+		if (jQuery('#'+tId).length) {
+			jQuery('#'+tId).append('<option value="'+tKey+'">'+propertiesSelectedArray[tKey]+'</option>');
+			jQuery.each( propertiesAvailable, function( aKey, aValue ) {
+				jQuery('#'+tId).append('<option value="'+aKey+'">'+aValue+'</option>');
+			});
+			jQuery('#'+tId).val(tKey);
+			jQuery('#'+tId).trigger('liszt:updated');
+		}
+	});
+}
+
+function rowWatcher() {
+	jQuery(document).on('subform-row-remove', function(event, row){
+       		propertyIdRemoved = jQuery(row.innerHTML).find('.field_list_name_options').attr('id');
+       		propertyDynamicSet();
+	});
+	jQuery(document).on('subform-row-add', function(event, row){
+       		propertyDynamicSet();
+	});
+}
+
+function propertyIsSet(prop, id, targetForm) {
+	var i;
+	for (i = 0; i < 70; i++) { // for now this is the number of field we should check
+		// build ID
+		var id_check = targetForm+'_'+targetForm+i+'__name';
+		// first check if Id is on page as that not the same as the one currently calling
+		if (jQuery("#"+id_check).length && id_check != id) {
+			// get the property value
+			var tmp = jQuery("#"+id_check+" option:selected").val();
+			// now validate
+			if (tmp === prop) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+function getFieldPropertyDesc_server(fieldtype, property){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getFieldPropertyDesc&format=json&vdm="+vastDevMod;
+	if(token.length > 0 && (fieldtype > 0 || fieldtype.length > 0)&& property.length > 0){
+		var request = 'token='+token+'&fieldtype='+fieldtype+'&property='+property;
+	}
+	return jQuery.ajax({
+		type: 'GET',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+
 function getValidationRulesTable_server(){
-	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getValidationRulesTable&format=json";
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getValidationRulesTable&format=json&vdm="+vastDevMod;
 	if(token.length > 0){
 		var request = 'token='+token+'&id=1';
 	}

admin/models/forms/field.xml

@@ -183,11 +183,85 @@
 			<option value="NOT NULL">
 				COM_COMPONENTBUILDER_FIELD_NOT_NULL</option>
 		</field>
-		<!-- Add_css_view Field. Type: Radio. (joomla) -->
+		<!-- 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>
+		<!-- Catid Field. Type: Category. (joomla) -->
+		<field
+			type="category"
+			name="catid"
+			label="COM_COMPONENTBUILDER_FIELD_CATID_LABEL"
+			extension="com_componentbuilder.fields"
+			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
+			class="inputbox"
+		/>
+		<!-- 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"
+		/>
+		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_css_view"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
+			name="add_javascript_view_footer"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELD_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELD_NO</option>
+		</field>
+		<!-- 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"
+		/>
+		<!-- Add_css_views Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_css_views"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -210,112 +284,22 @@
 			hint="COM_COMPONENTBUILDER_FIELD_CSS_VIEW_HINT"
 			required="true"
 		/>
+		<!-- Add_css_view Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_css_view"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEW_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELD_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELD_NO</option>
+		</field>
 		<!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_filter_information" description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION" class="note_filter_information" />
-		<!-- Not_required Field. Type: Hidden. (joomla) -->
-		<field
-			type="hidden"
-			name="not_required"
-			default="[]"
-		/>
-		<!-- Catid Field. Type: Category. (joomla) -->
-		<field
-			type="category"
-			name="catid"
-			label="COM_COMPONENTBUILDER_FIELD_CATID_LABEL"
-			extension="com_componentbuilder.fields"
-			description="COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION"
-			class="inputbox"
-		/>
-		<!-- Xml Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="xml"
-			label="COM_COMPONENTBUILDER_FIELD_XML_LABEL"
-			rows="17"
-			cols="720"
-			description="COM_COMPONENTBUILDER_FIELD_XML_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_FIELD_XML_HINT"
-			required="true"
-		/>
-		<!-- Add_javascript_view_footer Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_javascript_view_footer"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELD_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELD_NO</option>
-		</field>
-		<!-- Add_javascript_views_footer Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_javascript_views_footer"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELD_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELD_NO</option>
-		</field>
-		<!-- Add_css_views Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_css_views"
-			label="COM_COMPONENTBUILDER_FIELD_ADD_CSS_VIEWS_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELD_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELD_NO</option>
-		</field>
-		<!-- Datalenght Field. Type: List. (joomla) -->
-		<field
-			type="list"
-			name="datalenght"
-			label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL"
-			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION"
-			class="btn-group"
-			multiple="false">
-			<!-- Option Set. -->
-			<option value="">
-				COM_COMPONENTBUILDER_FIELD_NONE_SET</option>
-			<option value="1">
-				COM_COMPONENTBUILDER_FIELD_ONE</option>
-			<option value="7">
-				COM_COMPONENTBUILDER_FIELD_SEVEN</option>
-			<option value="10">
-				COM_COMPONENTBUILDER_FIELD_TEN</option>
-			<option value="11">
-				COM_COMPONENTBUILDER_FIELD_ELEVEN</option>
-			<option value="50">
-				COM_COMPONENTBUILDER_FIELD_FIFTY</option>
-			<option value="64">
-				COM_COMPONENTBUILDER_FIELD_SIXTY_FOUR</option>
-			<option value="100">
-				COM_COMPONENTBUILDER_FIELD_ONE_HUNDRED</option>
-			<option value="255">
-				COM_COMPONENTBUILDER_FIELD_TWO_HUNDRED_AND_FIFTY_FIVE</option>
-			<option value="1024">
-				COM_COMPONENTBUILDER_FIELD_ONE_THOUSAND_AND_TWENTY_FOUR</option>
-			<option value="2048">
-				COM_COMPONENTBUILDER_FIELD_TWO_THOUSAND_AND_FORTY_EIGHT</option>
-			<option value="Other">
-				COM_COMPONENTBUILDER_FIELD_OTHER</option>
-		</field>
 		<!-- Datadefault_other Field. Type: Text. (joomla) -->
 		<field
 			type="text"
@@ -332,6 +316,8 @@
 			message="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_MESSAGE"
 			hint="COM_COMPONENTBUILDER_FIELD_DATADEFAULT_OTHER_HINT"
 		/>
+		<!-- Helpnote Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="helpnote" label="COM_COMPONENTBUILDER_FIELD_HELPNOTE_LABEL" class="helpNote helpnote" />
 		<!-- Datadefault Field. Type: List. (joomla) -->
 		<field
 			type="list"
@@ -370,57 +356,54 @@
 			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) -->
+		<!-- Datalenght 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">
+			name="datalenght"
+			label="COM_COMPONENTBUILDER_FIELD_DATALENGHT_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_DATALENGHT_DESCRIPTION"
+			class="btn-group"
+			multiple="false">
 			<!-- Option Set. -->
-			<option value="0">
-				COM_COMPONENTBUILDER_FIELD_DEFAULT</option>
+			<option value="">
+				COM_COMPONENTBUILDER_FIELD_NONE_SET</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>
+				COM_COMPONENTBUILDER_FIELD_ONE</option>
+			<option value="7">
+				COM_COMPONENTBUILDER_FIELD_SEVEN</option>
+			<option value="10">
+				COM_COMPONENTBUILDER_FIELD_TEN</option>
+			<option value="11">
+				COM_COMPONENTBUILDER_FIELD_ELEVEN</option>
+			<option value="50">
+				COM_COMPONENTBUILDER_FIELD_FIFTY</option>
+			<option value="64">
+				COM_COMPONENTBUILDER_FIELD_SIXTY_FOUR</option>
+			<option value="100">
+				COM_COMPONENTBUILDER_FIELD_ONE_HUNDRED</option>
+			<option value="255">
+				COM_COMPONENTBUILDER_FIELD_TWO_HUNDRED_AND_FIFTY_FIVE</option>
+			<option value="1024">
+				COM_COMPONENTBUILDER_FIELD_ONE_THOUSAND_AND_TWENTY_FOUR</option>
+			<option value="2048">
+				COM_COMPONENTBUILDER_FIELD_TWO_THOUSAND_AND_FORTY_EIGHT</option>
+			<option value="Other">
+				COM_COMPONENTBUILDER_FIELD_OTHER</option>
 		</field>
-		<!-- Javascript_view_footer Field. Type: Textarea. (joomla) -->
+		<!-- Add_javascript_views_footer Field. Type: Radio. (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"
-		/>
+			type="radio"
+			name="add_javascript_views_footer"
+			label="COM_COMPONENTBUILDER_FIELD_ADD_JAVASCRIPT_VIEWS_FOOTER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_FIELD_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_FIELD_NO</option>
+		</field>
 		<!-- 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) -->
@@ -436,8 +419,21 @@
 			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" />
+		<!-- Not_required Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="not_required"
+			default="[]"
+		/>
+		<!-- Xml Field. Type: Hidden. (joomla) -->
+		<field
+			type="hidden"
+			name="xml"
+			default="1"
+			filter="raw"
+		/>
+		<!-- Note_select_field_type Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_select_field_type" label="COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_LABEL" description="COM_COMPONENTBUILDER_FIELD_NOTE_SELECT_FIELD_TYPE_DESCRIPTION" heading="h4" class="alert alert-info note_select_field_type" />
 	</fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/fieldtype.xml

@@ -109,8 +109,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_FIELDTYPE_PROPERTIES_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_properties_modal" repeat="true">
 				<!-- Name Field. Type: Text. (joomla) -->
 				<field

admin/models/forms/help_document.xml

@@ -204,6 +204,7 @@
 			required="true"
 			filter="url"
 			validated="url"
+			scheme="http,https"
 			message="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_HINT"
 		/>

admin/models/forms/joomla_component.xml

@@ -1041,8 +1041,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDCONTRIBUTORS_DESCRIPTION"
-			icon="list"
-			maximum="50">
+			icon="list">
 			<form hidden="true" name="list_addcontributors_modal" repeat="true">
 				<!-- Name Field. Type: Text. (joomla) -->
 				<field

admin/models/forms/language_translation.xml

@@ -119,8 +119,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION"
-			icon="list"
-			maximum="200">
+			icon="list">
 			<form hidden="true" name="list_translation_modal" repeat="true">
 				<!-- Translation Field. Type: Textarea. (joomla) -->
 				<field

admin/models/forms/library.xml

@@ -199,8 +199,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_LIBRARY_ADDCONDITIONS_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addconditions_modal" repeat="true">
 				<!-- File Field. Type: Libraryfiles. (custom) -->
 				<field

admin/models/forms/library_config.xml

@@ -105,8 +105,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addconfig_modal" repeat="true">
 				<!-- Field Field. Type: Fields. (custom) -->
 				<field

admin/models/forms/library_files_folders_urls.xml

@@ -107,8 +107,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERSFULLPATH_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addfoldersfullpath_modal" repeat="true">
 				<!-- Folderpath Field. Type: Text. (joomla) -->
 				<field
@@ -161,8 +160,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addfilesfullpath_modal" repeat="true">
 				<!-- Filepath Field. Type: Text. (joomla) -->
 				<field
@@ -216,8 +214,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFOLDERS_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addfolders_modal" repeat="true">
 				<!-- Folder Field. Type: Customfolderlist. (custom) -->
 				<field
@@ -268,8 +265,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILES_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addfiles_modal" repeat="true">
 				<!-- File Field. Type: Customfilelist. (custom) -->
 				<field
@@ -321,8 +317,7 @@
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
 			description="COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDURLS_DESCRIPTION"
-			icon="list"
-			maximum="500">
+			icon="list">
 			<form hidden="true" name="list_addurls_modal" repeat="true">
 				<!-- Url Field. Type: Url. (joomla) -->
 				<field

admin/models/forms/site_view.xml

@@ -174,8 +174,7 @@
 			label="COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="150">
+			icon="list">
 			<form hidden="true" name="list_ajax_input_modal" repeat="true">
 				<!-- Value_name Field. Type: Text. (joomla) -->
 				<field
@@ -631,8 +630,7 @@
 			label="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_BUTTON_LABEL"
 			layout="joomla.form.field.subform.repeatable-table"
 			multiple="true"
-			icon="list"
-			maximum="7">
+			icon="list">
 			<form hidden="true" name="list_custom_button_modal" repeat="true">
 				<!-- Icomoon Field. Type: List. (joomla) -->
 				<field

admin/models/forms/snippet.xml

@@ -113,6 +113,7 @@
 			required="true"
 			filter="url"
 			validated="url"
+			scheme="http,https"
 			message="COM_COMPONENTBUILDER_SNIPPET_URL_MESSAGE"
 			hint="COM_COMPONENTBUILDER_SNIPPET_URL_HINT"
 		/>

admin/models/import_joomla_components.php

@@ -697,7 +697,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 		$this->today = JFactory::getDate()->toSql();
 		// the array of tables to store
 		$tables = array(
-			'fieldtype', 'field', 'admin_view', 'snippet', 'dynamic_get', 'custom_admin_view', 'site_view',
+			'validation_rule', 'fieldtype', 'field', 'admin_view', 'snippet', 'dynamic_get', 'custom_admin_view', 'site_view',
 			'template', 'layout', 'joomla_component', 'language', 'language_translation', 'custom_code',
 			'admin_fields', 'admin_fields_conditions', 'component_admin_views', 'component_site_views',
 			'component_custom_admin_views', 'component_updates', 'component_mysql_tweaks',
@@ -1378,6 +1378,11 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 		{
 			unset($item->metakey);
 		}
+		// remove not_required
+		if (isset($item->not_required))
+		{
+			unset($item->not_required);
+		}
 		// actions to effect all
 		if (isset($item->asset_id))
 		{
@@ -2336,6 +2341,7 @@ class ComponentbuilderModelImport_joomla_components extends JModelLegacy
 						$this->specialValue['admin_view'] = $this->newID['admin_view'][(int) $item->admin_view];
 					}
 					break;
+				case 'validation_rule':
 				case 'fieldtype':
 					// get by name (since there should only be one of each name)
 					$getter = 'name';