Initial steps towards the J4 legacy edition.

2021-10-19 03:30:46 +02:00 · 2021-10-19 03:30:46 +02:00 · 6beb6edf91
commit 6beb6edf91
parent ab471e3ccb
112 changed files with 165 additions and 777 deletions
--- a/README.md
+++ b/README.md
@ -143,14 +143,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 18th October, 2021
+ *Last Build*: 19th October, 2021
 + *Version*: 2.12.14
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **293253**
-+ *Field count*: **1654**
-+ *File count*: **1937**
-+ *Folder count*: **322**
+ *Line count*: **283806**
+ *Field count*: **1541**
+ *File count*: **1817**
+ *Folder count*: **256**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
--- a/admin/README.txt
+++ b/admin/README.txt
@ -143,14 +143,14 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 18th October, 2021
+ *Last Build*: 19th October, 2021
 + *Version*: 2.12.14
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **293253**
-+ *Field count*: **1654**
-+ *File count*: **1937**
-+ *Folder count*: **322**
+ *Line count*: **283806**
+ *Field count*: **1541**
+ *File count*: **1817**
+ *Folder count*: **256**

 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](http://joomlacomponentbuilder.com).
 > Developed by [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
--- a/admin/compiler/joomla_3/script.php
+++ b/admin/compiler/joomla_3/script.php
@ -19,7 +19,8 @@ defined('_JEXEC') or die('Restricted access');

 use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
-JHTML::_('behavior.modal');
+use Joomla\CMS\Installer\Adapter\ComponentAdapter;
+JHTML::_('bootstrap.renderModal');

 /**
 * Script File of ###Component### Component
@ -31,23 +32,23 @@ class com_###component###InstallerScript
 	 *
 	 * @param   JAdapterInstance  $parent  The object responsible for running this script
 	 */
-	public function __construct(JAdapterInstance $parent) {}
+	public function __construct(ComponentAdapter $parent) {}

 	/**
 	 * Called on installation
 	 *
-	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 *
 	 * @return  boolean  True on success
 	 */
-	public function install(JAdapterInstance $parent) {}
+	public function install(ComponentAdapter $parent) {}

 	/**
 	 * Called on uninstallation
 	 *
-	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 */
-	public function uninstall(JAdapterInstance $parent)
+	public function uninstall(ComponentAdapter $parent)
 	{###UNINSTALLSCRIPT###
 		// little notice as after service, in case of bad experience with component.
 		echo '<h2>Did something go wrong? Are you disappointed?</h2>
@ -60,21 +61,21 @@ class com_###component###InstallerScript
 	/**
 	 * Called on update
 	 *
-	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 *
 	 * @return  boolean  True on success
 	 */
-	public function update(JAdapterInstance $parent){}
+	public function update(ComponentAdapter $parent){}

 	/**
 	 * Called before any type of action
 	 *
 	 * @param   string  $type  Which action is happening (install|uninstall|discover_install|update)
-	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 *
 	 * @return  boolean  True on success
 	 */
-	public function preflight($type, JAdapterInstance $parent)
+	public function preflight($type, ComponentAdapter $parent)
 	{
 		// get application
 		$app = JFactory::getApplication();
@ -113,11 +114,11 @@ class com_###component###InstallerScript
 	 * Called after any type of action
 	 *
 	 * @param   string  $type  Which action is happening (install|uninstall|discover_install|update)
-	 * @param   JAdapterInstance  $parent  The object responsible for running this script
+	 * @param   ComponentAdapter  $parent  The object responsible for running this script
 	 *
 	 * @return  boolean  True on success
 	 */
-	public function postflight($type, JAdapterInstance $parent)
+	public function postflight($type, ComponentAdapter $parent)
 	{
 		// get application
 		$app = JFactory::getApplication();###MOVEFOLDERSSCRIPT###
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -2910,7 +2910,7 @@ class Interpretation extends Fields
 					$runplugins .= PHP_EOL . $tab . $this->_t(1)
 						. "JPluginHelper::importPlugin('content');";
 					$runplugins .= PHP_EOL . $tab . $this->_t(1)
-						. '$this->_dispatcher = JEventDispatcher::getInstance();';
+						. '$this->_dispatcher = JFactory::getApplication();';
 				}
 				if (!$params)
 				{
@ -2941,7 +2941,7 @@ class Interpretation extends Fields
 					. " Since all values are now in text (Joomla Limitation), we also add the field name ("
 					. $field . ") to context";
 				$fieldPrepare .= PHP_EOL . $this->_t(1) . $tab . $this->_t(1)
-					. '$this->_dispatcher->trigger("onContentPrepare", array(\''
+					. '$this->_dispatcher->triggerEvent("onContentPrepare", array(\''
 					. $context . '.' . $field . '\', &$_' . $field
 					. ', &$params, 0));';
 			}
@ -7943,13 +7943,13 @@ class Interpretation extends Fields
 			{
 				$script .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(
 						__LINE__
-					) . " Install the global extenstion params.";
+					) . " Install the global extension params.";
 			}
 			else
 			{
 				$script .= PHP_EOL . $this->_t(3) . "//" . $this->setLine(
 						__LINE__
-					) . " Install the global extenstion params.";
+					) . " Install the global extension params.";
 				$script .= PHP_EOL . $this->_t(3)
 					. "\$db = JFactory::getDbo();";
 			}
@ -10178,7 +10178,7 @@ class Interpretation extends Fields
 				) . ';';
 			$newFunction[] = $this->_t(2) . "}";
 			$newFunction[] = PHP_EOL . $this->_t(2)
-				. "\$this->alias = JApplication::stringURLSafe(\$this->alias);";
+				. "\$this->alias = JApplicationHelper::stringURLSafe(\$this->alias);";
 			$newFunction[] = PHP_EOL . $this->_t(2)
 				. "if (trim(str_replace('-', '', \$this->alias)) == '')";
 			$newFunction[] = $this->_t(2) . "{";
@ -10360,10 +10360,10 @@ class Interpretation extends Fields
 					// be sure to track the last name used :)
 					$last_name = $field;
 				}
-				// check if default field was over written
+				// check if default field was overwritten
 				if (!isset($this->fieldsNames[$view]['params']))
 				{
-					$db_ .= PHP_EOL . $this->_t(1) . "`params` text NOT NULL,";
+					$db_ .= PHP_EOL . $this->_t(1) . "`params` text NULL,";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['published']))
@ -22437,18 +22437,11 @@ class Interpretation extends Fields
 			case 'site.admin.view':
 				$headers[]
 					       = 'JHtml::addIncludePath(JPATH_COMPONENT.\'/helpers/html\');';
-				$headers[] = 'JHtml::_(\'behavior.tooltip\');';
-				$headers[] = 'JHtml::_(\'behavior.formvalidation\');';
+				$headers[] = 'JHtml::_(\'behavior.formvalidator\');';
 				$headers[] = 'JHtml::_(\'formbehavior.chosen\', \'select\');';
 				$headers[] = 'JHtml::_(\'behavior.keepalive\');';
-				if ($context === 'site.admin.view')
-				{
-					$headers[] = 'JHtml::_(\'behavior.tabstate\');';
-					$headers[] = 'JHtml::_(\'behavior.calendar\');';
-				}
 				break;
 			case 'admin.views':
-				$headers[] = 'JHtml::_(\'behavior.tooltip\');';
 				$headers[] = 'JHtml::_(\'behavior.multiselect\');';
 				$headers[] = 'JHtml::_(\'dropdown.init\');';
 				// add more headers if the new filter option is used
--- a/admin/models/compiler.php
+++ b/admin/models/compiler.php
@ -100,7 +100,7 @@ class ComponentbuilderModelCompiler extends JModelList
 		{
 			// Load the JEvent Dispatcher
 			JPluginHelper::importPlugin('content');
-			$this->_dispatcher = JEventDispatcher::getInstance();
+			$this->_dispatcher = JFactory::getApplication();
 			foreach ($items as $nr => &$item)
 			{
 				// Always create a slug for sef URL's
@ -111,7 +111,7 @@ class ComponentbuilderModelCompiler extends JModelList
 				$_copyright = new stdClass();
 				$_copyright->text =& $item->copyright; // value must be in text
 				// Since all values are now in text (Joomla Limitation), we also add the field name (copyright) to context
-				$this->_dispatcher->trigger("onContentPrepare", array('com_componentbuilder.compiler.copyright', &$_copyright, &$params, 0));
+				$this->_dispatcher->triggerEvent("onContentPrepare", array('com_componentbuilder.compiler.copyright', &$_copyright, &$params, 0));
 				// Checking if copyright has uikit components that must be loaded.
 				$this->uikitComp = ComponentbuilderHelper::getUikitComp($item->copyright,$this->uikitComp);
 			}
--- a/admin/models/fields/adminlistvieworderfields.php
+++ b/admin/models/fields/adminlistvieworderfields.php
@ -1,132 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
- * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-// import the list field type
-jimport('joomla.form.helper');
-JFormHelper::loadFieldClass('list');
-
-/**
- * Adminlistvieworderfields Form Field class for the Componentbuilder component
- */
-class JFormFieldAdminlistvieworderfields extends JFormFieldList
-{
-	/**
-	 * The adminlistvieworderfields field type.
-	 *
-	 * @var		string
-	 */
-	public $type = 'adminlistvieworderfields';
-
-	/**
-	 * Method to get a list of options for a list input.
-	 *
-	 * @return	array    An array of JHtml options.
-	 */
-	protected function getOptions()
-	{
-		// load the db object
-		$db = JFactory::getDBO();		
-		// get the input from url
-		$jinput = JFactory::getApplication()->input;
-		// get the id
-		$adminView = $jinput->getInt('id', 0);
-		// set the field trackers
-		$fieldIds = array();
-		$sortIds = array();
-		// check if we have an admin view
-		if (is_numeric($adminView) && $adminView >= 1)
-		{
-			// get all the fields linked to the admin view
-			if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))
-			{
-				if (ComponentbuilderHelper::checkJson($addFields))
-				{
-					$addFields = json_decode($addFields, true);
-					if (ComponentbuilderHelper::checkArray($addFields))
-					{
-						foreach($addFields as $addField)
-						{
-							// admin list view and ordering
-							if (isset($addField['field']) && isset($addField['list']) && ($addField['list'] == 1 || $addField['list'] == 3)
-								&& isset($addField['sort']) && $addField['sort'])
-							{
-								$fieldIds[(int) $addField['field']] = (int) $addField['field'];
-							}
-							// do track all fields set as sorted
-							if (isset($addField['field']) && isset($addField['sort']) && $addField['sort'])
-							{
-								$sortIds[(int) $addField['field']] = (int) $addField['field'];
-							}
-						}
-					}
-				}
-			}
-			// get all the fields that are also having a relationship on the list view as sorted
-			if ($addFields = ComponentbuilderHelper::getVar('admin_fields_relations', (int) $adminView, 'admin_view', 'addrelations'))
-			{
-				if (ComponentbuilderHelper::checkJson($addFields))
-				{
-					$addFields = json_decode($addFields, true);
-					if (ComponentbuilderHelper::checkArray($addFields))
-					{
-						foreach($addFields as $addField)
-						{
-							// admin list view and ordering
-							if (isset($addField['joinfields']) && ComponentbuilderHelper::checkArray($addField['joinfields']))
-							{
-								foreach($addField['joinfields'] as $joinfield)
-								{
-									if (isset($sortIds[$joinfield]))
-									{
-										$fieldIds[(int) $joinfield] = (int) $joinfield;
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			// filter by fields linked
-			if (ComponentbuilderHelper::checkArray($fieldIds))
-			{
-				$query = $db->getQuery(true);
-				$query->select($db->quoteName(array('a.id','a.name', 'a.xml', 'b.name'),array('id','name', 'xml', 'type')));
-				$query->from($db->quoteName('#__componentbuilder_field', 'a'));
-				$query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
-				$query->where($db->quoteName('a.published') . ' >= 1');
-				// only load these fields
-				$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $fieldIds) . ')');
-				$query->order('a.name ASC');
-				$db->setQuery((string)$query);
-				$items = $db->loadObjectList();
-				$options = array();
-				if ($items)
-				{
-					$options[] = JHtml::_('select.option', '', JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_SELECT_AN_OPTION'));
-					$options[] = JHtml::_('select.option', -1, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ID'). ' [ id - text ]');
-					$options[] = JHtml::_('select.option', -2, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ORDERING'). ' [ ordering - number ]');
-					$options[] = JHtml::_('select.option', -3, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_STATUS'). ' [ published - list ]');
-					foreach($items as $item)
-					{
-						// get the field name (TODO this could slow down the system so we will need to improve on this)
-						$field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
-						$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
-					}
-				}
-				return $options;
-			}
-		}
-		return false;
-	}
-}
--- a/admin/models/fields/excludedlanguages.php
+++ b/admin/models/fields/excludedlanguages.php
@ -1,176 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
- * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-// import the list field type
-jimport('joomla.form.helper');
-JFormHelper::loadFieldClass('list');
-
-/**
- * Excludedlanguages Form Field class for the Componentbuilder component
- */
-class JFormFieldExcludedlanguages extends JFormFieldList
-{
-	/**
-	 * The excludedlanguages field type.
-	 *
-	 * @var		string
-	 */
-	public $type = 'excludedlanguages';
-
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$set_button = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($set_button === 'true')
-		{
-			$button = array();
-			$script = array();
-			$button_code_name = $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 referral if not new item.
-				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				// get the return value.
-				$_uri = (string) JUri::getInstance();
-				$_return = urlencode(base64_encode($_uri));
-				// load return value.
-				$ref .= '&amp;return=' . $_return;
-				$refJ .= '&return=' . $_return;
-			}
-			// get button label
-			$button_label = trim($button_code_name);
-			$button_label = preg_replace('/_+/', ' ', $button_label);
-			$button_label = preg_replace('/\s+/', ' ', $button_label);
-			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
-			$button_label = ucfirst(strtolower($button_label));
-			// get user object
-			$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
-				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_CREATE_NEW_S', $button_label).'" 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 ($user->authorise('language.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERLANGUAGETABS_EDIT_S', $button_label).'" 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_".$button_code_name."',function (e) {
-							e.preventDefault();
-							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
-							".$button_code_name."Button(".$button_code_name."Value);
-						});
-						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
-						".$button_code_name."Button(".$button_code_name."Value);
-					});
-					function ".$button_code_name."Button(value) {
-						if (value > 0) {
-							// hide the create button
-							jQuery('#".$button_code_name."Create').hide();
-							// show edit button
-							jQuery('#".$button_code_name."Edit').show();
-							var url = 'index.php?option=com_componentbuilder&view=languages&task=language.edit&id='+value+'".$refJ."';
-							jQuery('#".$button_code_name."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$button_code_name."Create').show();
-							// hide edit button
-							jQuery('#".$button_code_name."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;
-	}
-
-	/**
-	 * Method to get a list of options for a list input.
-	 *
-	 * @return	array    An array of JHtml options.
-	 */
-	protected function getOptions()
-	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.langtag','a.name'),array('langtag','languages_name')));
-		$query->from($db->quoteName('#__componentbuilder_language', 'a'));
-		$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->order('a.langtag ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		// add the main language
-		$main_lang = trim(JComponentHelper::getParams('com_componentbuilder')->get('language', 'en-GB'));
-		// check if any language was added
-		$wasAdded = false;
-		$options = array();
-		if ($items)
-		{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
-			{
-				$item->langtag = trim($item->langtag);
-				// do not add main language
-				if ($main_lang !== $item->langtag)
-				{
-					$options[] = JHtml::_('select.option', $item->langtag, $item->languages_name . ' (' .$item->langtag.')');
-					$wasAdded = true;
-				}
-			}
-		}
-		// now if none was added give notice
-		if (!$wasAdded)
-		{
-			$options[] = JHtml::_('select.option', '', 'Add languages to select');
-		}
-		return $options;
-	}
-}
--- a/admin/models/fields/joomlacomponents.php
+++ b/admin/models/fields/joomlacomponents.php
@ -35,23 +35,23 @@ class JFormFieldJoomlacomponents extends JFormFieldList
 	 */
 	protected function getOptions()
 	{
-				$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.system_name'),array('id','components_system_name')));
-		$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
-		$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->order('a.system_name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->components_system_name);
-			}
-		}
+		$db = JFactory::getDBO();
+$query = $db->getQuery(true);
+$query->select($db->quoteName(array('a.id','a.system_name'),array('id','joomla_component_system_name')));
+$query->from($db->quoteName('#__componentbuilder_joomla_component', 'a'));
+$query->order('a.system_name ASC');
+$db->setQuery((string)$query);
+$items = $db->loadObjectList();
+$options = array();
+if ($items)
+{
+	$options[] = JHtml::_('select.option', '', 'Select an option');
+	foreach($items as $item)
+	{
+		$options[] = JHtml::_('select.option', $item->id, $item->joomla_component_system_name);
+	}
+}

-		return $options;
+return $options;
 	}
 }
--- a/admin/models/fields/joomlaplugins.php
+++ b/admin/models/fields/joomlaplugins.php
@ -28,110 +28,6 @@ class JFormFieldJoomlaplugins extends JFormFieldList
 	 */
 	public $type = 'joomlaplugins';

-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$set_button = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($set_button === 'true')
-		{
-			$button = array();
-			$script = array();
-			$button_code_name = $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 referral if not new item.
-				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-				// get the return value.
-				$_uri = (string) JUri::getInstance();
-				$_return = urlencode(base64_encode($_uri));
-				// load return value.
-				$ref .= '&amp;return=' . $_return;
-				$refJ .= '&return=' . $_return;
-			}
-			// get button label
-			$button_label = trim($button_code_name);
-			$button_label = preg_replace('/_+/', ' ', $button_label);
-			$button_label = preg_replace('/\s+/', ' ', $button_label);
-			$button_label = preg_replace("/[^A-Za-z ]/", '', $button_label);
-			$button_label = ucfirst(strtolower($button_label));
-			// get user object
-			$user = JFactory::getUser();
-			// only add if user allowed to create joomla_plugin
-			if ($user->authorise('joomla_plugin.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build Create button
-				$button[] = '<a id="'.$button_code_name.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_CREATE_NEW_S', $button_label).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
-					href="index.php?option=com_componentbuilder&amp;view=joomla_plugin&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit joomla_plugin
-			if ($user->authorise('joomla_plugin.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$button[] = '<a id="'.$button_code_name.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('PLG_CONTENT_COMPONENTBUILDERPRIVACYTABS_EDIT_S', $button_label).'" 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_".$button_code_name."',function (e) {
-							e.preventDefault();
-							var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
-							".$button_code_name."Button(".$button_code_name."Value);
-						});
-						var ".$button_code_name."Value = jQuery('#jform_".$button_code_name."').val();
-						".$button_code_name."Button(".$button_code_name."Value);
-					});
-					function ".$button_code_name."Button(value) {
-						if (value > 0) {
-							// hide the create button
-							jQuery('#".$button_code_name."Create').hide();
-							// show edit button
-							jQuery('#".$button_code_name."Edit').show();
-							var url = 'index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_plugin.edit&id='+value+'".$refJ."';
-							jQuery('#".$button_code_name."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$button_code_name."Create').show();
-							// hide edit button
-							jQuery('#".$button_code_name."Edit').hide();
-						}
-					}";
-			}
-			// check if button was created for joomla_plugin field.
-			if (is_array($button) && count($button) > 0)
-			{
-				// Load the needed script.
-				$document = JFactory::getDocument();
-				$document->addScriptDeclaration(implode(' ',$script));
-				// return the button attached to input field.
-				return '<div class="input-append">' .$html . implode('',$button).'</div>';
-			}
-		}
-		return $html;
-	}
-
 	/**
 	 * Method to get a list of options for a list input.
 	 *
--- a/admin/models/fields/linkedviewsorderfields.php
+++ b/admin/models/fields/linkedviewsorderfields.php
@ -1,99 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
- * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-// import the list field type
-jimport('joomla.form.helper');
-JFormHelper::loadFieldClass('list');
-
-/**
- * Linkedviewsorderfields Form Field class for the Componentbuilder component
- */
-class JFormFieldLinkedviewsorderfields extends JFormFieldList
-{
-	/**
-	 * The linkedviewsorderfields field type.
-	 *
-	 * @var		string
-	 */
-	public $type = 'linkedviewsorderfields';
-
-	/**
-	 * Method to get a list of options for a list input.
-	 *
-	 * @return	array    An array of JHtml options.
-	 */
-	protected function getOptions()
-	{
-		// load the db object
-		$db = JFactory::getDBO();		
-		// get the input from url
-		$jinput = JFactory::getApplication()->input;
-		// get the id
-		$adminView = $jinput->getInt('id', 0);
-		// check if we have an admin view
-		if (is_numeric($adminView) && $adminView >= 1)
-		{
-			// get all the fields linked to the admin view
-			if ($addFields = ComponentbuilderHelper::getVar('admin_fields', (int) $adminView, 'admin_view', 'addfields'))
-			{
-				if (ComponentbuilderHelper::checkJson($addFields))
-				{
-					$addFields = json_decode($addFields, true);
-					if (ComponentbuilderHelper::checkArray($addFields))
-					{
-						foreach($addFields as $addField)
-						{
-							// linked list views and ordering
-							if (isset($addField['field']) && isset($addField['list']) && ($addField['list'] == 1 || $addField['list'] == 4)
-								&& isset($addField['sort']) && $addField['sort'])
-							{
-								$fieldIds[] = (int) $addField['field'];
-							}
-						}
-					}
-				}
-			}
-			// filter by fields linked
-			if (ComponentbuilderHelper::checkArray($fieldIds))
-			{
-				$query = $db->getQuery(true);
-				$query->select($db->quoteName(array('a.id','a.name', 'a.xml', 'b.name'),array('id','name', 'xml', 'type')));
-				$query->from($db->quoteName('#__componentbuilder_field', 'a'));
-				$query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
-				$query->where($db->quoteName('a.published') . ' >= 1');
-				// only load these fields
-				$query->where($db->quoteName('a.id') . ' IN (' . implode(',', $fieldIds) . ')');
-				$query->order('a.name ASC');
-				$db->setQuery((string)$query);
-				$items = $db->loadObjectList();
-				$options = array();
-				if ($items)
-				{
-					$options[] = JHtml::_('select.option', '', JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_SELECT_AN_OPTION'));
-					$options[] = JHtml::_('select.option', -1, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ID'). ' [ id - text ]');
-					$options[] = JHtml::_('select.option', -2, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_ORDERING'). ' [ ordering - number ]');
-					$options[] = JHtml::_('select.option', -3, JText::_('PLG_CONTENT_COMPONENTBUILDERFIELDORDERINGTABS_STATUS'). ' [ published - list ]');
-					foreach($items as $item)
-					{
-						// get the field name (TODO this could slow down the system so we will need to improve on this)
-						$field_name = ComponentbuilderHelper::safeFieldName(ComponentbuilderHelper::getBetween(json_decode($item->xml),'name="','"'));
-						$options[] = JHtml::_('select.option', $item->id, $item->name . ' [ ' . $field_name . ' - ' . $item->type . ' ]');
-					}
-				}
-				return $options;
-			}
-		}
-		return false;
-	}
-}
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@ -88,7 +88,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	`whmcs_buy_link` VARCHAR(255) NOT NULL DEFAULT '',
 	`whmcs_key` VARCHAR(255) NOT NULL DEFAULT '',
 	`whmcs_url` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -191,7 +191,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module` (
 	`update_server` INT(11) NOT NULL DEFAULT 0,
 	`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
 	`update_server_url` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -269,7 +269,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin` (
 	`update_server` INT(11) NOT NULL DEFAULT 0,
 	`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
 	`update_server_url` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -402,7 +402,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`sql` MEDIUMTEXT NOT NULL,
 	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
 	`type` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -501,7 +501,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`php_view` MEDIUMTEXT NOT NULL,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
 	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -576,7 +576,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`php_view` MEDIUMTEXT NOT NULL,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
 	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -625,7 +625,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` (
 	`php_view` MEDIUMTEXT NOT NULL,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
 	`template` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -661,7 +661,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` (
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`php_view` MEDIUMTEXT NOT NULL,
 	`snippet` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -722,7 +722,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	`view_selection` TEXT NOT NULL,
 	`view_table_main` INT(11) NOT NULL DEFAULT 0,
 	`where` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -770,7 +770,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` (
 	`target` TINYINT(1) NOT NULL DEFAULT 0,
 	`to_line` VARCHAR(100) NOT NULL DEFAULT '',
 	`type` TINYINT(1) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -806,7 +806,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_property` (
 	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`visibility` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -841,7 +841,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_method` (
 	`joomla_plugin_group` INT(11) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`visibility` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -870,7 +870,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_placeholder` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`target` VARCHAR(255) NOT NULL DEFAULT '',
 	`value` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -903,7 +903,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library` (
 	`php_setdocument` MEDIUMTEXT NOT NULL,
 	`target` TINYINT(1) NOT NULL DEFAULT 1,
 	`type` TINYINT(1) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -942,7 +942,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` (
 	`type` INT(11) NOT NULL DEFAULT 0,
 	`url` VARCHAR(255) NOT NULL DEFAULT '',
 	`usage` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -973,7 +973,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_validation_rule` (
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`php` MEDIUMTEXT NOT NULL,
 	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1022,7 +1022,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
 	`on_save_model_field` TEXT NOT NULL,
 	`store` INT(11) NOT NULL DEFAULT 0,
 	`xml` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1075,7 +1075,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` (
 	`properties` TEXT NOT NULL,
 	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
 	`store` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1114,7 +1114,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language_translation` (
 	`plugins` TEXT NOT NULL,
 	`source` MEDIUMTEXT NOT NULL,
 	`translation` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1139,7 +1139,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_language` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`langtag` VARCHAR(64) NOT NULL DEFAULT '',
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1175,7 +1175,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_server` (
 	`secret` TEXT NOT NULL,
 	`signature` TEXT NOT NULL,
 	`username` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1212,7 +1212,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` (
 	`title` CHAR(64) NOT NULL DEFAULT '',
 	`type` TINYINT(1) NOT NULL DEFAULT 0,
 	`url` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1241,7 +1241,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addfields` MEDIUMTEXT NOT NULL,
 	`admin_view` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1267,7 +1267,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields_conditions` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addconditions` MEDIUMTEXT NOT NULL,
 	`admin_view` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1293,7 +1293,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_fields_relations` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addrelations` MEDIUMTEXT NOT NULL,
 	`admin_view` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1319,7 +1319,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_custom_tabs` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`admin_view` INT(11) NOT NULL DEFAULT 0,
 	`tabs` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1345,7 +1345,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_admin_views` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addadmin_views` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1371,7 +1371,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_site_views` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addsite_views` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1397,7 +1397,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_views` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addcustom_admin_views` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1423,7 +1423,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_updates` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`version_update` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1449,7 +1449,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_mysql_tweaks` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`sql_tweak` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1475,7 +1475,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_custom_admin_menus` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addcustommenus` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1501,7 +1501,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_config` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addconfig` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1528,7 +1528,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_dashboard` (
 	`dashboard_tab` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
 	`php_dashboard_methods` MEDIUMTEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1557,7 +1557,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_files_folders` (
 	`addfolders` TEXT NOT NULL,
 	`addfoldersfullpath` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1583,7 +1583,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_placeholders` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addplaceholders` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1609,7 +1609,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_plugins` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addjoomla_plugins` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1635,7 +1635,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_component_modules` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addjoomla_modules` TEXT NOT NULL,
 	`joomla_component` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1661,7 +1661,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet_type` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1687,7 +1687,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_config` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`addconfig` TEXT NOT NULL,
 	`library` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1717,7 +1717,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_library_files_folders_urls` (
 	`addfoldersfullpath` TEXT NOT NULL,
 	`addurls` TEXT NOT NULL,
 	`library` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1745,7 +1745,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_class_extends` (
 	`extension_type` VARCHAR(64) NOT NULL DEFAULT '',
 	`head` TEXT NOT NULL,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1771,7 +1771,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module_updates` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`joomla_module` INT(11) NOT NULL DEFAULT 0,
 	`version_update` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1801,7 +1801,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_module_files_folders_urls
 	`addfoldersfullpath` TEXT NOT NULL,
 	`addurls` TEXT NOT NULL,
 	`joomla_module` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1827,7 +1827,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_group` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`class_extends` INT(11) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1854,7 +1854,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_updates` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`joomla_plugin` INT(11) NOT NULL DEFAULT 0,
 	`version_update` TEXT NOT NULL,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
@ -1884,7 +1884,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_plugin_files_folders_urls
 	`addfoldersfullpath` TEXT NOT NULL,
 	`addurls` TEXT NOT NULL,
 	`joomla_plugin` INT(11) NOT NULL DEFAULT 0,
-	`params` text NOT NULL,
+	`params` text NULL,
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
 	`modified_by` INT(10) unsigned NOT NULL DEFAULT 0,
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@ -323,7 +323,7 @@ class ComponentbuilderTableHelp_document extends JTable
 			$this->alias = $this->title;
 		}

-		$this->alias = JApplication::stringURLSafe($this->alias);
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias);

 		if (trim(str_replace('-', '', $this->alias)) == '')
 		{
--- a/admin/tables/layout.php
+++ b/admin/tables/layout.php
@ -323,7 +323,7 @@ class ComponentbuilderTableLayout extends JTable
 			$this->alias = $this->name;
 		}

-		$this->alias = JApplication::stringURLSafe($this->alias);
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias);

 		if (trim(str_replace('-', '', $this->alias)) == '')
 		{
--- a/admin/tables/template.php
+++ b/admin/tables/template.php
@ -323,7 +323,7 @@ class ComponentbuilderTableTemplate extends JTable
 			$this->alias = $this->name;
 		}

-		$this->alias = JApplication::stringURLSafe($this->alias);
+		$this->alias = JApplicationHelper::stringURLSafe($this->alias);

 		if (trim(str_replace('-', '', $this->alias)) == '')
 		{
--- a/admin/views/admin_custom_tabs/tmpl/edit.php
+++ b/admin/views/admin_custom_tabs/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/admin_fields/tmpl/edit.php
+++ b/admin/views/admin_fields/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/admin_fields_conditions/tmpl/edit.php
+++ b/admin/views/admin_fields_conditions/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/admin_fields_relations/tmpl/edit.php
+++ b/admin/views/admin_fields_relations/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/admin_views/tmpl/default.php
+++ b/admin/views/admin_views/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAdminviewsfiltertype', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_TYPE') . ' -'));
--- a/admin/views/admins_custom_tabs/tmpl/default.php
+++ b/admin/views/admins_custom_tabs/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/admins_fields/tmpl/default.php
+++ b/admin/views/admins_fields/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/admins_fields_conditions/tmpl/default.php
+++ b/admin/views/admins_fields_conditions/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/admins_fields_relations/tmpl/default.php
+++ b/admin/views/admins_fields_relations/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/class_extendings/tmpl/default.php
+++ b/admin/views/class_extendings/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/class_extends/tmpl/edit.php
+++ b/admin/views/class_extends/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/class_method/tmpl/edit.php
+++ b/admin/views/class_method/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/class_methods/tmpl/default.php
+++ b/admin/views/class_methods/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/class_properties/tmpl/default.php
+++ b/admin/views/class_properties/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/class_property/tmpl/edit.php
+++ b/admin/views/class_property/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/compiler/tmpl/default.php
+++ b/admin/views/compiler/tmpl/default.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');

--- a/admin/views/component_admin_views/tmpl/edit.php
+++ b/admin/views/component_admin_views/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_config/tmpl/edit.php
+++ b/admin/views/component_config/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_custom_admin_menus/tmpl/edit.php
+++ b/admin/views/component_custom_admin_menus/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_custom_admin_views/tmpl/edit.php
+++ b/admin/views/component_custom_admin_views/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_dashboard/tmpl/edit.php
+++ b/admin/views/component_dashboard/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_files_folders/tmpl/edit.php
+++ b/admin/views/component_files_folders/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_modules/tmpl/edit.php
+++ b/admin/views/component_modules/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_mysql_tweaks/tmpl/edit.php
+++ b/admin/views/component_mysql_tweaks/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_placeholders/tmpl/edit.php
+++ b/admin/views/component_placeholders/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_plugins/tmpl/edit.php
+++ b/admin/views/component_plugins/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_site_views/tmpl/edit.php
+++ b/admin/views/component_site_views/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/component_updates/tmpl/edit.php
+++ b/admin/views/component_updates/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/components_admin_views/tmpl/default.php
+++ b/admin/views/components_admin_views/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_config/tmpl/default.php
+++ b/admin/views/components_config/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_custom_admin_menus/tmpl/default.php
+++ b/admin/views/components_custom_admin_menus/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_custom_admin_views/tmpl/default.php
+++ b/admin/views/components_custom_admin_views/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_dashboard/tmpl/default.php
+++ b/admin/views/components_dashboard/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_files_folders/tmpl/default.php
+++ b/admin/views/components_files_folders/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_modules/tmpl/default.php
+++ b/admin/views/components_modules/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_mysql_tweaks/tmpl/default.php
+++ b/admin/views/components_mysql_tweaks/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_placeholders/tmpl/default.php
+++ b/admin/views/components_placeholders/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_plugins/tmpl/default.php
+++ b/admin/views/components_plugins/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_site_views/tmpl/default.php
+++ b/admin/views/components_site_views/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/components_updates/tmpl/default.php
+++ b/admin/views/components_updates/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/custom_admin_views/tmpl/default.php
+++ b/admin/views/custom_admin_views/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleMaingets', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_MAIN_GET') . ' -'));
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/custom_codes/tmpl/default.php
+++ b/admin/views/custom_codes/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/dynamic_gets/tmpl/default.php
+++ b/admin/views/dynamic_gets/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/fields/tmpl/default.php
+++ b/admin/views/fields/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_FIELDS_CATEGORIES') . ' -'));
--- a/admin/views/fieldtype/tmpl/edit.php
+++ b/admin/views/fieldtype/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/fieldtypes/tmpl/default.php
+++ b/admin/views/fieldtypes/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_FIELDTYPES_CATEGORIES') . ' -'));
--- a/admin/views/get_snippets/tmpl/default.php
+++ b/admin/views/get_snippets/tmpl/default.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 ?>
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', 'select');
--- a/admin/views/joomla_component/tmpl/edit.php
+++ b/admin/views/joomla_component/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/joomla_components/tmpl/default.php
+++ b/admin/views/joomla_components/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleJoomlacomponentsfiltercompanyname', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_COMPANY_NAME') . ' -'));
--- a/admin/views/joomla_module/tmpl/edit.php
+++ b/admin/views/joomla_module/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/joomla_module_files_folders_urls/tmpl/edit.php
+++ b/admin/views/joomla_module_files_folders_urls/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/joomla_module_updates/tmpl/edit.php
+++ b/admin/views/joomla_module_updates/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/joomla_modules/tmpl/default.php
+++ b/admin/views/joomla_modules/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/joomla_modules_files_folders_urls/tmpl/default.php
+++ b/admin/views/joomla_modules_files_folders_urls/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/joomla_modules_updates/tmpl/default.php
+++ b/admin/views/joomla_modules_updates/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/joomla_plugin/tmpl/edit.php
+++ b/admin/views/joomla_plugin/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/joomla_plugin_files_folders_urls/tmpl/edit.php
+++ b/admin/views/joomla_plugin_files_folders_urls/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/joomla_plugin_group/tmpl/edit.php
+++ b/admin/views/joomla_plugin_group/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/joomla_plugin_groups/tmpl/default.php
+++ b/admin/views/joomla_plugin_groups/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/joomla_plugin_updates/tmpl/edit.php
+++ b/admin/views/joomla_plugin_updates/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/joomla_plugins/tmpl/default.php
+++ b/admin/views/joomla_plugins/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php
+++ b/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/joomla_plugins_updates/tmpl/default.php
+++ b/admin/views/joomla_plugins_updates/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/language/tmpl/edit.php
+++ b/admin/views/language/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/language_translation/tmpl/edit.php
+++ b/admin/views/language_translation/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/language_translations/tmpl/default.php
+++ b/admin/views/language_translations/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/languages/tmpl/default.php
+++ b/admin/views/languages/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/layouts/tmpl/default.php
+++ b/admin/views/layouts/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/libraries/tmpl/default.php
+++ b/admin/views/libraries/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/libraries_config/tmpl/default.php
+++ b/admin/views/libraries_config/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/libraries_files_folders_urls/tmpl/default.php
+++ b/admin/views/libraries_files_folders_urls/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/library/tmpl/edit.php
+++ b/admin/views/library/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/library_config/tmpl/edit.php
+++ b/admin/views/library_config/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/library_files_folders_urls/tmpl/edit.php
+++ b/admin/views/library_files_folders_urls/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/placeholder/tmpl/edit.php
+++ b/admin/views/placeholder/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/placeholders/tmpl/default.php
+++ b/admin/views/placeholders/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@ -13,8 +13,7 @@
 defined('_JEXEC') or die('Restricted access');

 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
-JHtml::_('behavior.tooltip');
-JHtml::_('behavior.formvalidation');
+JHtml::_('behavior.formvalidator');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = $this->params; // will be removed just use $this->params instead
--- a/admin/views/servers/tmpl/default.php
+++ b/admin/views/servers/tmpl/default.php
@ -12,7 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
 JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
--- a/Show More
+++ b/Show More