Added custom buttons to admin views, improved the compiler code, with some bug fixes

with some fixes to the compiler

README.md

@@ -1,8 +1,8 @@
-# Component Builder (2.1.14)
+# Component Builder (2.1.21)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
- ![Component Builder image] (https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.png "The Component Builder")
+ ![Component Builder image] (https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder/master/admin/assets/images/component-300.jpg "The Component Builder")
 
 The Component Builder for Joomla that is highly advanced, truly able to build extremely complex components in a fraction of the time.
 
@@ -32,13 +32,19 @@ Would you require more help please open and issue here on [gitHub today](https:/
 + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io)
 + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 27th June, 2016
-+ *Version*: 2.1.14
++ *Last Build*: 11th September, 2016
++ *Version*: 2.1.21
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **83201**
-+ *File count*: **507**
++ *Line count*: **85041**
++ *File count*: **516**
 + *Folder count*: **98**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).
-> Developed by [Llewellyn van der Merwe] (mailto:joomla@vdm.io)
+> Developed by [Llewellyn van der Merwe] (mailto:joomla@vdm.io)
+
+## Donations
+
+ If you want to support this project, please consider donating:
+ * PayPal: pay@vdm.io
+ * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css

admin/assets/css/admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.css

admin/assets/css/custom_admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css

admin/assets/css/custom_admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/dynamic_get.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css

admin/assets/css/dynamic_gets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css

admin/assets/css/field.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/fieldtype.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css

admin/assets/css/fieldtypes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css

admin/assets/css/help_document.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.css

admin/assets/css/help_documents.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/assets/css/site_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.css

admin/assets/css/site_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css

admin/assets/css/snippet.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css

admin/assets/css/snippets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css

admin/assets/css/template.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css

admin/compiler/joomla_3/Helper.php

@@ -486,7 +486,7 @@ abstract class ###Component###Helper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				JError::raiseWarning(500, $asset->getError());
+				JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else

admin/compiler/joomla_3/Helper_site.php

@@ -171,7 +171,7 @@ abstract class ###Component###Helper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				JError::raiseWarning(500, $asset->getError());
+				JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else

admin/compiler/joomla_3/JControllerForm.php

@@ -50,7 +50,7 @@ class ###Component###Controller###View### extends JControllerForm
 	{
 		$this->view_list = '###Views###'; // safeguard for setting the return view listing to the main view.
 		parent::__construct($config);
-	}
+	}###ADMIN_CUSTOM_BUTTONS_CONTROLLER###
 
         /**
 	 * Method override to check if you can add a new record.

admin/compiler/joomla_3/JControllerLegacyAjaxSite.php

@@ -63,7 +63,7 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		}
                 else
                 {
-			if($callback = $jinput->get('callback', null, 'CMD')
+			if($callback = $jinput->get('callback', null, 'CMD'))
                         {
 				echo $callback."(".json_encode(false).");";
 			}

admin/compiler/joomla_3/JModelAdmin.php

@@ -67,7 +67,7 @@ class ###Component###Model###View### extends JModelAdmin
 	public function getTable($type = '###view###', $prefix = '###Component###Table', $config = array())
 	{
 		return JTable::getInstance($type, $prefix, $config);
-	}
+	}###ADMIN_CUSTOM_BUTTONS_METHOD###
     
 	/**
 	 * Method to get a single record.
@@ -267,6 +267,26 @@ class ###Component###Model###View### extends JModelAdmin
 		
 		return true;
 	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    &$pks   A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.2
+	 */
+	public function publish(&$pks, $value = 1)
+	{###JMODELADMIN_BEFORE_PUBLISH###
+		if (!parent::publish($pks, $value))
+		{
+			return false;
+		}###JMODELADMIN_AFTER_PUBLISH###
+		
+		return true;
+        }
     
 	/**
 	 * Method to perform batch operations on an item or a set of items.

admin/compiler/joomla_3/JModelItem_custom_admin.php

@@ -97,9 +97,10 @@ class ###Component###Model###SView### extends JModelItem
                 // check if this user has permission to access item
                 if (!$this->user->authorise('###sview###.access', 'com_###component###'))
                 {
-			JError::raiseWarning(500, JText::_('Not authorised!'));
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
 			// redirect away if not a correct (TODO for now we go to default view)
-			JFactory::getApplication()->redirect('index.php?option=com_###component###');
+			$app->redirect('index.php?option=com_###component###');
 			return false;
                 }
 		$this->userId		= $this->user->get('id');
@@ -126,7 +127,7 @@ class ###Component###Model###SView### extends JModelItem
 				if ($e->getCode() == 404)
 				{
 					// Need to go thru the error handler to allow Redirect to work.
-					JError::raiseError(404, $e->getMessage());
+					JError::raiseWaring(404, $e->getMessage());
 				}
 				else
 				{

admin/compiler/joomla_3/JModelItem_site.php

@@ -99,9 +99,10 @@ class ###Component###Model###SView### extends JModelItem
                 // check if this user has permission to access item
                 if (!$this->user->authorise('site.###sview###.access', 'com_###component###'))
                 {
-			JError::raiseWarning(500, JText::_('Not authorised!'));
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
 			// redirect away if not a correct (TODO for now we go to default view)
-			JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
+			$app->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
 			return false;
                 }
 		$this->userId		= $this->user->get('id');
@@ -128,7 +129,7 @@ class ###Component###Model###SView### extends JModelItem
 				if ($e->getCode() == 404)
 				{
 					// Need to go thru the error handler to allow Redirect to work.
-					JError::raiseError(404, $e->getMessage());
+					JError::raiseWaring(404, $e->getMessage());
 				}
 				else
 				{

admin/compiler/joomla_3/JModelLegacy_import.php

@@ -201,7 +201,8 @@ class ###Component###ModelImport extends JModelLegacy
 	protected function _getPackageFromUpload()
 	{		
 		// Get the uploaded file information
-		$input    = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
 		$userfile = $input->files->get('import_package', null, 'raw');
@@ -209,21 +210,21 @@ class ###Component###ModelImport extends JModelLegacy
 		// Make sure that file uploads are enabled in php
 		if (!(bool) ini_get('file_uploads'))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
 			return false;
 		}
 
 		// If there is no uploaded file, we have a problem...
 		if (!is_array($userfile))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
 			return false;
 		}
 
 		// Check if there was a problem uploading the file.
 		if ($userfile['error'] || $userfile['size'] < 1)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
 			return false;
 		}
 
@@ -261,7 +262,8 @@ class ###Component###ModelImport extends JModelLegacy
 	 */
 	protected function _getPackageFromFolder()
 	{
-		$input = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Get the path to the package to import
 		$p_dir = $input->getString('import_directory');
@@ -269,7 +271,7 @@ class ###Component###ModelImport extends JModelLegacy
 		// Did you give us a valid path?
 		if (!file_exists($p_dir))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
 			return false;
 		}
 
@@ -279,7 +281,7 @@ class ###Component###ModelImport extends JModelLegacy
 		// Did you give us a valid package?
 		if (!$type)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
 		}
 		
 		// check the extention
@@ -290,7 +292,7 @@ class ###Component###ModelImport extends JModelLegacy
 			break;
 			
 			default:
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}
@@ -310,15 +312,16 @@ class ###Component###ModelImport extends JModelLegacy
 	 */
 	protected function _getPackageFromUrl()
 	{
-		$input = JFactory::getApplication()->input;
-
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
+		
 		// Get the URL of the package to import
 		$url = $input->getString('import_url');
 
 		// Did you give us a URL?
 		if (!$url)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'), 'warning');
 			return false;
 		}
 
@@ -328,7 +331,7 @@ class ###Component###ModelImport extends JModelLegacy
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'), 'warning');
 			return false;
 		}
 
@@ -349,6 +352,7 @@ class ###Component###ModelImport extends JModelLegacy
 	 */
 	protected function check($archivename)
 	{
+		$app	= JFactory::getApplication();
 		// Clean the name
 		$archivename = JPath::clean($archivename);
 		
@@ -362,7 +366,7 @@ class ###Component###ModelImport extends JModelLegacy
 			default:
 			// Cleanup the import files
 			$this->remove($archivename);
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}	

admin/compiler/joomla_3/JModelLegacy_import_custom.php

@@ -91,7 +91,8 @@ class ###Component###Model###View### extends JModelLegacy
 	protected function _getPackageFromUpload()
 	{		
 		// Get the uploaded file information
-		$input    = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
 		$userfile = $input->files->get('import_package', null, 'raw');
@@ -99,21 +100,21 @@ class ###Component###Model###View### extends JModelLegacy
 		// Make sure that file uploads are enabled in php
 		if (!(bool) ini_get('file_uploads'))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'), 'warning');
 			return false;
 		}
 
 		// If there is no uploaded file, we have a problem...
 		if (!is_array($userfile))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'), 'warning');
 			return false;
 		}
 
 		// Check if there was a problem uploading the file.
 		if ($userfile['error'] || $userfile['size'] < 1)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'), 'warning');
 			return false;
 		}
 
@@ -151,7 +152,8 @@ class ###Component###Model###View### extends JModelLegacy
 	 */
 	protected function _getPackageFromFolder()
 	{
-		$input = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Get the path to the package to import
 		$p_dir = $input->getString('import_directory');
@@ -159,7 +161,7 @@ class ###Component###Model###View### extends JModelLegacy
 		// Did you give us a valid path?
 		if (!file_exists($p_dir))
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'), 'warning');
 			return false;
 		}
 
@@ -169,7 +171,7 @@ class ###Component###Model###View### extends JModelLegacy
 		// Did you give us a valid package?
 		if (!$type)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'), 'warning');
 		}
 		
 		// check the extention
@@ -180,7 +182,7 @@ class ###Component###Model###View### extends JModelLegacy
 			break;
 			
 			default:
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}
@@ -200,7 +202,8 @@ class ###Component###Model###View### extends JModelLegacy
 	 */
 	protected function _getPackageFromUrl()
 	{
-		$input = JFactory::getApplication()->input;
+		$app	= JFactory::getApplication();
+		$input	= $app->input;
 
 		// Get the URL of the package to import
 		$url = $input->getString('import_url');
@@ -208,7 +211,7 @@ class ###Component###Model###View### extends JModelLegacy
 		// Did you give us a URL?
 		if (!$url)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'), 'warning');
 			return false;
 		}
 
@@ -218,7 +221,7 @@ class ###Component###Model###View### extends JModelLegacy
 		// Was the package downloaded?
 		if (!$p_file)
 		{
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'), 'warning');
 			return false;
 		}
 
@@ -239,6 +242,7 @@ class ###Component###Model###View### extends JModelLegacy
 	 */
 	protected function check($archivename)
 	{
+		$app	= JFactory::getApplication();
 		// Clean the name
 		$archivename = JPath::clean($archivename);
 		
@@ -252,7 +256,7 @@ class ###Component###Model###View### extends JModelLegacy
 			default:
 			// Cleanup the import files
 			$this->remove($archivename);
-			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			$app->enqueueMessage(JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'), 'warning');
 			return false;
 			break;
 		}	

admin/compiler/joomla_3/JModelList.php

@@ -95,7 +95,7 @@ class ###Component###Model###Views### extends JModelList
 	public function getItems()
 	{###LICENSE_LOCKED_CHECK### ###CHECKINCALL###
 		// load parent items
-		$items = parent::getItems();###GET_ITEMS_METHOD_STRING_FIX### ###SELECTIONTRANSLATIONFIX###
+		$items = parent::getItems();###GET_ITEMS_METHOD_STRING_FIX### ###SELECTIONTRANSLATIONFIX### ###GET_ITEMS_METHOD_AFTER_ALL###
         
 		// return items
 		return $items;

admin/compiler/joomla_3/JModelList_custom_admin.php

@@ -81,9 +81,10 @@ class ###Component###Model###SViews### extends JModelList
                 // check if this user has permission to access items
                 if (!$user->authorise('###sviews###.access', 'com_###component###'))
                 {
-			JError::raiseWarning(500, JText::_('Not authorised!'));
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
 			// redirect away if not a correct (TODO for now we go to default view)
-			JFactory::getApplication()->redirect('index.php?option=com_###component###');
+			$app->redirect('index.php?option=com_###component###');
 			return false;
                 }###LICENSE_LOCKED_CHECK### ###CUSTOM_ADMIN_BEFORE_GET_ITEMS###
 		// load parent items

admin/compiler/joomla_3/JModelList_site.php

@@ -81,9 +81,10 @@ class ###Component###Model###SViews### extends JModelList
                 // check if this user has permission to access items
                 if (!$user->authorise('site.###sview###.access', 'com_###component###'))
                 {
-			JError::raiseWarning(500, JText::_('Not authorised!'));
+			$app = JFactory::getApplication();
+			$app->enqueueMessage(JText::_('Not authorised!'), 'error');
 			// redirect away if not a correct (TODO for now we go to default view)
-			JFactory::getApplication()->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
+			$app->redirect(JRoute::_('index.php?option=com_###component###&view=###SITE_DEFAULT_VIEW###'));
 			return false;
                 }###LICENSE_LOCKED_CHECK### ###SITE_BEFORE_GET_ITEMS###
 		// load parent items

admin/compiler/joomla_3/component_admin.php

@@ -32,7 +32,7 @@ defined('_JEXEC') or die('Restricted access');
 // Access check.
 if (!JFactory::getUser()->authorise('core.manage', 'com_###component###'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	return JError::raiseWaring(404, JText::_('JERROR_ALERTNOAUTHOR'));
 };
 
 // Load cms libraries

admin/compiler/joomla_3/default_custom_admin.php

@@ -35,20 +35,9 @@ JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 ?>
-<?php if ($this->canDo->get('###sview###.access')): ?>
-<script type="text/javascript">
-	Joomla.submitbutton = function(task) {
-		if (task == '###sview###.back') {
-                        parent.history.back();
-			return false;
-                } else {
-			var form = document.getElementById('adminForm');
-			form.task.value = task;
-			form.submit();
-		}
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_costbenefitprojection&view=###sview###&id='.$this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
+<?php $urlId = (isset($this->item->id)) ? '&id='. (int) $this->item->id : ''; ?>
+<form action="<?php echo JRoute::_('index.php?option=com_###component###&view=###sview###'.$urlId); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
         <input type="hidden" name="task" value="" />
         <?php echo JHtml::_('form.token'); ?>
 </form>###CUSTOM_ADMIN_BODY###

admin/compiler/joomla_3/default_import.php

@@ -32,6 +32,7 @@ defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 JHtml::_('jquery.framework');
 JHtml::_('bootstrap.tooltip');
 JHtml::_('script', 'system/core.js', false, true);
+JHtml::_('behavior.keepalive');
 ?>
 <script type="text/javascript">
 <?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList)) : ?>

admin/compiler/joomla_3/default_import_custom.php

@@ -32,4 +32,5 @@ defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 JHtml::_('jquery.framework');
 JHtml::_('bootstrap.tooltip');
 JHtml::_('script', 'system/core.js', false, true);
+JHtml::_('behavior.keepalive');
 ?>###IMPORT_DEFAULT_VIEW_CUSTOM###

admin/compiler/joomla_3/default_list_custom_admin.php

@@ -35,19 +35,7 @@ JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 ?>
-<?php if ($this->canDo->get('###sview###.access')): ?>
-<script type="text/javascript">
-	Joomla.submitbutton = function(task) {
-		if (task == '###sview###.back') {
-                        parent.history.back();
-			return false;
-                } else {
-			var form = document.getElementById('adminForm');
-			form.task.value = task;
-			form.submit();
-		}
-	}
-</script>
+<?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
 <form action="<?php echo JRoute::_('index.php?option=com_###component###&view=###sviews###'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
         <input type="hidden" name="task" value="" />###HIDDEN_INPUT_VALUES###
         <?php echo JHtml::_('form.token'); ?>

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 // Access check.
 if (!JFactory::getUser()->authorise('core.manage', 'com_componentbuilder'))
 {
-	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	return JError::raiseWaring(404, JText::_('JERROR_ALERTNOAUTHOR'));
 };
 
 // Load cms libraries

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php

admin/controllers/custom_admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php

admin/controllers/custom_admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php

admin/controllers/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/fieldtype.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php

admin/controllers/snippet.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php

admin/controllers/snippets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php

admin/controllers/template.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/helpers/compiler.php

@@ -82,6 +82,23 @@ class Compiler extends Infusion
 		}
 		return false;
 	}
+	
+	/**
+	 * Set the line number in comments
+	 * 
+	 * @param   int   $nr  The line number
+	 * 
+	 * @return  void
+	 * 
+	 */
+	private function setLine($nr)
+	{
+		if ($this->loadLineNr)
+		{
+			return ' [Compiler '.$nr.']';	
+		}
+		return '';
+	}
 
 	protected function updateFiles()
 	{

admin/helpers/compiler/a_Get.php

@@ -332,6 +332,23 @@ class Get
 		return false;
 	}
 	
+	/**
+	 * Set the line number in comments
+	 * 
+	 * @param   int   $nr  The line number
+	 * 
+	 * @return  void
+	 * 
+	 */
+	private function setLine($nr)
+	{
+		if ($this->loadLineNr)
+		{
+			return ' [Get '.$nr.']';	
+		}
+		return '';
+	}
+	
 	/**
 	 * get all Component Data
 	 * 
@@ -1055,7 +1072,7 @@ class Get
 				}
 			}
 			// add_php
-			$addArrayP = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove','php_document');
+			$addArrayP = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getitems_after_all','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_before_publish','php_after_publish','php_batchcopy','php_batchmove','php_document');
 			foreach ($addArrayP as $scripter)
 			{
 				if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
@@ -1064,7 +1081,31 @@ class Get
 					unset($view->$scripter);
 				}
 			}
-			
+                        // add the custom buttons
+                        if (isset($view->add_custom_button) && $view->add_custom_button == 1)
+                        {
+                                if (ComponentbuilderHelper::checkString($view->php_model))
+                                {
+                                        $view->php_model = base64_decode($view->php_model);
+                                        $view->php_model = $this->setCustomContentLang($view->php_model);
+                                }
+                                $view->php_controller = base64_decode($view->php_controller);
+                                $view->php_controller = $this->setCustomContentLang($view->php_controller);
+                                // set the button array
+                                $buttons = json_decode($view->custom_button,true);
+                                unset($view->custom_button);
+                                // sort the values
+                                if (ComponentbuilderHelper::checkArray($buttons))
+                                {
+                                        foreach ($buttons as $option => $values)
+                                        {
+                                                foreach ($values as $nr => $value)
+                                                {
+                                                        $view->custom_buttons[$nr][$option] = $value;
+                                                }
+                                        }
+                                }
+                        }			
 			// set custom import scripts
 			if (isset($view->add_custom_import) && $view->add_custom_import == 1)
 			{

admin/helpers/compiler/b_Structure.php

@@ -189,6 +189,23 @@ class Structure extends Get
 		return false;
 	}
 	
+	/**
+	 * Set the line number in comments
+	 * 
+	 * @param   int   $nr  The line number
+	 * 
+	 * @return  void
+	 * 
+	 */
+	private function setLine($nr)
+	{
+		if ($this->loadLineNr)
+		{
+			return ' [Structure '.$nr.']';	
+		}
+		return '';
+	}
+	
 	/**
 	 * Build the Initial Folders
 	 * 

admin/helpers/compiler/c_Fields.php

@@ -334,6 +334,23 @@ class Fields extends Structure
 	 * @var    array
 	 */
 	public $movedPublishingFields = array();
+	
+	/**
+	 * Set the line number in comments
+	 * 
+	 * @param   int   $nr  The line number
+	 * 
+	 * @return  void
+	 * 
+	 */
+	private function setLine($nr)
+	{
+		if ($this->loadLineNr)
+		{
+			return ' [Fields '.$nr.']';	
+		}
+		return '';
+	}
 
 	/**
 	 * set the Field set of a view
@@ -657,12 +674,14 @@ class Fields extends Structure
 	{
 		if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']))
 		{
+                        // reset some values
 			$name = ComponentbuilderHelper::safeString($field['settings']->name);
 			$typeName = ComponentbuilderHelper::safeString($field['settings']->type_name);
 			$multiple = false;
 			$langLabel = '';
 			$taber = '';
 			$fieldSet = '';
+                        $fieldAttributes = array();
 			// set field attributes
 			$fieldAttributes = $this->setFieldAttributes($field, $viewType, $name, $typeName, $multiple, $langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders);
 			// check if values were set
@@ -853,6 +872,11 @@ class Fields extends Structure
 				$fieldSet .= $optionSet;
 				$fieldSet .= "\n\t\t" . $taber . "</field>";
 			}
+			elseif ($typeName == 'sql')
+			{
+				$optionArray = false;
+				$fieldSet .= "\n\t\t" . $taber . "/>";
+			}
 			else
 			{
 				$optionArray = false;
@@ -923,6 +947,7 @@ class Fields extends Structure
 					foreach ($fieldsSets as $fieldId)
 					{
 						// get the field data
+                                                $fieldData = array();
 						$fieldData['settings'] = $this->getFieldData($fieldId, $viewName);
 						if (ComponentbuilderHelper::checkObject($fieldData['settings']))
 						{
@@ -930,8 +955,6 @@ class Fields extends Structure
 							$r_typeName = ComponentbuilderHelper::safeString($fieldData['settings']->type_name);
 							$r_multiple = false;
 							$r_langLabel = '';
-							// make sure that these fields are not required
-							$fieldData['settings']->xml = str_replace('required="', 'requirenot="', $fieldData['settings']->xml);
 							// add the tabs needed
 							$taber = "\t\t\t";
 							// get field values
@@ -1303,6 +1326,11 @@ class Fields extends Structure
 					// dont load the button to repeatable
 					$xmlValue = 'false';
 				}
+				elseif ($property['name'] == 'required' && $repeatable)
+				{
+					// dont load the required to repeatable
+					$xmlValue = 'false';
+				}
 				elseif ($viewType == 2 && ($property['name'] == 'readonly' || $property['name'] == 'disabled'))
 				{
 					// set read only
@@ -1310,7 +1338,7 @@ class Fields extends Structure
 				}
 				elseif ($property['name'] == 'multiple')
 				{
-					$xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
+					$xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
 					// add the multipal
 					if ('true' == $xmlValue)
 					{
@@ -1337,7 +1365,7 @@ class Fields extends Structure
 				else
 				{
 					// set the rest of the fields
-					$xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
+					$xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
 				}
 
 				// check if translatable
@@ -1466,23 +1494,29 @@ class Fields extends Structure
 					$field['settings']->datadefault = '0';
 				}
 			}
-			// build the query values
-			$this->queryBuilder[$viewName][$name] = array(
-			    'type' => $field['settings']->datatype,
-			    'lenght' => $field['settings']->datalenght,
-			    'lenght_other' => $field['settings']->datalenght_other,
-			    'default' => $field['settings']->datadefault,
-			    'other' => $field['settings']->datadefault_other,
-			    'null_switch' => $field['settings']->null_switch);
 			// don't use these as index or uniqe keys
-			$notKeys = array('TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB');
+			$textKeys = array('TEXT', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'BLOB', 'TINYBLOB', 'MEDIUMBLOB', 'LONGBLOB');
+			// build the query values
+			$this->queryBuilder[$viewName][$name]['type']           = $field['settings']->datatype;
+                        if (!in_array($field['settings']->datatype, $textKeys))
+			{
+                                $this->queryBuilder[$viewName][$name]['lenght']         = $field['settings']->datalenght;
+                                $this->queryBuilder[$viewName][$name]['lenght_other']   = $field['settings']->datalenght_other;
+                                $this->queryBuilder[$viewName][$name]['default']        = $field['settings']->datadefault;
+                                $this->queryBuilder[$viewName][$name]['other']          = $field['settings']->datadefault_other;
+                        }
+                        else
+                        {
+                                $this->queryBuilder[$viewName][$name]['default']        = 'EMPTY';
+                        }
+                        $this->queryBuilder[$viewName][$name]['null_switch']    = $field['settings']->null_switch;
 			// set index types
-			if ($field['settings']->indexes == 1 && !in_array($field['settings']->datatype, $notKeys))
+			if ($field['settings']->indexes == 1 && !in_array($field['settings']->datatype, $textKeys))
 			{
 				// build unique keys of this view for db
 				$this->dbUniqueKeys[$viewName][] = $name;
 			}
-			elseif (($field['settings']->indexes == 2 || $field['alias'] || $field['title'] || $typeName == 'category') && !in_array($field['settings']->datatype, $notKeys))
+			elseif (($field['settings']->indexes == 2 || $field['alias'] || $field['title'] || $typeName == 'category') && !in_array($field['settings']->datatype, $textKeys))
 			{
 				// build keys of this view for db
 				$this->dbKeys[$viewName][] = $name;

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -1041,7 +1041,7 @@ abstract class ComponentbuilderHelper
 
 			if (!$asset->check() || !$asset->store())
 			{
-				JError::raiseWarning(500, $asset->getError());
+				JFactory::getApplication()->enqueueMessage($asset->getError(), 'warning');
 				return false;
 			}
 			else

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -64,6 +64,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADDNEW_LABEL="Add New Button"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS="Addpermissions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_DESCRIPTION="Set permissions for this view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDPERMISSIONS_SELECT="Add"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADDRESS="Address"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES="Addtables"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABS="Addtabs"
@@ -73,6 +74,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW="Add Css View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS="Add Css Views"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS_LABEL="Add CSS (views)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW_LABEL="Add CSS (view)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON="Add Custom Button"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL="Add Custom Button"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT="Add Custom Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION="Override the default import methods."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL="Add Custom Import"
@@ -89,6 +92,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEW_FOOTER="Add Javascript View
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEW_FOOTER_LABEL="Add JavaScript (view-footer)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE="Add Php After Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL="Add PHP (script - after delete)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH="Add Php After Publish"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL="Add PHP (script - after publish)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX="Add Php Ajax"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL="Add PHP (AJAX)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT="Add Php Allowedit"
@@ -99,11 +104,15 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE="Add Php Batchmove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL="Add PHP (batchMove Method)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE="Add Php Before Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL="Add PHP (script - before delete)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH="Add Php Before Publish"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL="Add PHP (script - before publish)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM="Add Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS="Add Php Getitems"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL="Add PHP (getItems Method)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL="Add Php Getitems After All"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL="Add PHP (getItems Method - after all)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL="Add PHP (getItems Method - before translation fix & decryption)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM_LABEL="Add PHP (getItem Method)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY="Add Php Getlistquery"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL="Add PHP (getListQuery - JModelList)"
@@ -124,12 +133,66 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ALIGNMENT_DESCRIPTION="Select the field alignmen
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALIGNMENT_LABEL="Alignment"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALNUM="ALNUM"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_LIST="Any Selection (only 4 list/radio/checkboxes/dynamic_list)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="Archive"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARRAY="ARRAY"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN="Arrow Down"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN_FOUR="Arrow Down 4"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN_THREE="Arrow Down 3"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_DOWN_TWO="Arrow Down 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_FIRST="Arrow First"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LAST="Arrow Last"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LEFT="Arrow Left"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LEFT_FOUR="Arrow Left 4"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LEFT_THREE="Arrow Left 3"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_LEFT_TWO="Arrow Left 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_RIGHT="Arrow Right"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_RIGHT_FOUR="Arrow Right 4"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_RIGHT_THREE="Arrow Right 3"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_RIGHT_TWO="Arrow Right 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP="Arrow Up"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_FOUR="Arrow Up 4"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_THREE="Arrow Up 3"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARROW_UP_TWO="Arrow Up 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ATTACHMENT="Attachment"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BACKWARD_CIRCLE="Backward Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BAN_CIRCLE="Ban Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BARS="Bars"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BASESIXTY_FOUR="BASE64"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BASKET="Basket"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BOOK="Book"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BOOKMARK="Bookmark"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BOOKMARK_TWO="Bookmark 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BOOLEAN="BOOLEAN"
 COM_COMPONENTBUILDER_ADMIN_VIEW_BOTH="Both"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BOX_ADD="Box Add"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BOX_REMOVE="Box Remove"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BRIEFCASE="Briefcase"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BRUSH="Brush"
+COM_COMPONENTBUILDER_ADMIN_VIEW_BUBBLE_QUOTE="Bubble Quote"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CALENDAR="Calendar"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CALENDAR_THREE="Calendar 3"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CALENDAR_TWO="Calendar 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CAMERA="Camera"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CAMERA_TWO_VIDEO="Camera 2 / Video"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CANCEL_CIRCLE="Cancel Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CART="Cart"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CHAIN="Chain"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CHART="Chart"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKBOX="Checkbox"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKBOX_PARTIAL="Checkbox Partial"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKBOX_UNCHECKED="Checkbox Unchecked"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKMARK_CIRCLE="Checkmark Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CHECKMARK_TWO="Checkmark 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CIRCLE="Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CLOCK="Clock"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CMD="CMD"
+COM_COMPONENTBUILDER_ADMIN_VIEW_COG="Cog"
+COM_COMPONENTBUILDER_ADMIN_VIEW_COGS="Cogs"
+COM_COMPONENTBUILDER_ADMIN_VIEW_COMMENT="Comment"
+COM_COMPONENTBUILDER_ADMIN_VIEW_COMMENTS_TWO="Comments 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_COMPASS="Compass"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CONTRACT="Contract"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CONTRACT_TWO="Contract 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CORECREATE="core.create"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREDELETE="core.delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDIT="core.edit"
@@ -141,6 +204,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Admi
 COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date this Admin View was created."
 COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL="Created Date"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREDIT="Credit"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS="Css Views"
@@ -150,29 +215,79 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_LABEL="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_HINT="// CSS for the edit view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_LABEL="CSS"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CUBE="Cube"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON="Custom Button"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTONS="Custom Buttons"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_BUTTON_SELECT="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DASHBOARD="Dashboard"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DATABASE="Database"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DELETE="Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT="Add Description Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_LABEL="Description"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DOWNLOAD="Download"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP="Dump"
 COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT="Editing the Admin View"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ENTER="Enter"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE="Envelope"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ENVELOPE_OPENED="Envelope Opened"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EQUALIZER="Equalizer"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ERROR_UNIQUE_ALIAS="Another Admin View has the same alias."
 COM_COMPONENTBUILDER_ADMIN_VIEW_EXACT_LENGTH_ONLY_FOUR_TEXT_FIELD="Exact Length (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EXIT="Exit"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EXPAND="Expand"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EXPAND_TWO="Expand 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EXPIRED="Expired"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EYE_CLOSE="Eye Close"
+COM_COMPONENTBUILDER_ADMIN_VIEW_EYE_OPEN="Eye Open"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FEATURED="Featured"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FEED="Feed"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FIELD="Field"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FIELDS="Fields"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FIELD_DESCRIPTION="Select a field"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FIELD_LABEL="Field"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FILE="File"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_ADD="File Add"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_CHECK="File Check"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_MINUS="File Minus"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_REMOVE="File Remove"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FILE_TWO="File 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FILTER="Filter"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FILTER_DESCRIPTION="Select if the field is to be used as a filter in list view, if shown."
 COM_COMPONENTBUILDER_ADMIN_VIEW_FILTER_LABEL="Filter"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FIRST="First"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FLAG="Flag"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FLAG_THREE="Flag 3"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FLASH="Flash"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FLOAT="FLOAT"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_CLOSE="Folder Close"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_MINUS="Folder Minus"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_OPEN="Folder Open"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_PLUS="Folder Plus"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_PLUS_TWO="Folder Plus 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_REMOVE="Folder Remove"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FOLDER_THREE="Folder 3"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FORWARD_CIRCLE="Forward Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_FORWARD_TWO="Forward 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FULL_WIDTH_IN_TAB="Full Width in Tab"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GENERIC="Generic"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GRID="Grid"
+COM_COMPONENTBUILDER_ADMIN_VIEW_GRID_TWO="Grid 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HEALTH="Health"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HEART="Heart"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HEART_TWO="Heart 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HIDE="Hide"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HOME="Home"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HOME_TWO="Home 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML="HTML"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW="Html Import View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION="Add your HTML & PHP here! [Use <?php echo $name; ?> for PHP]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT="// The HTML for the view of your custom import method."
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL="HTML & PHP (view)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ICOMOON_DESCRIPTION="Joomla Standard Icomoon Fonts"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ICOMOON_LABEL="Icon"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ICON="Icon"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD="Icon Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION="Must be 128px x 128px and a png format.."
@@ -183,8 +298,12 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_CATEGORY_LABEL="Category Icon"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION="Must be 128px x 128px and a png format."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_LABEL="Icon"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ID="Id"
+COM_COMPONENTBUILDER_ADMIN_VIEW_IMAGE="Image"
+COM_COMPONENTBUILDER_ADMIN_VIEW_IMAGES="Images"
 COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_DESCRIPTION="Select applicable implementation."
 COM_COMPONENTBUILDER_ADMIN_VIEW_IMPLEMENTATION_LABEL="Implementation"
+COM_COMPONENTBUILDER_ADMIN_VIEW_INFO="Info"
+COM_COMPONENTBUILDER_ADMIN_VIEW_INFO_CIRCLE="Info Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_DESCRIPTION="Enter default input value"
 COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_HINT="Default Value Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_INPUT_DEFAULT_LABEL="Default"
@@ -213,6 +332,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER="Javascript View Footer"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_HINT="// JavaScript for the edit view that is loaded in the footer inside script tags"
 COM_COMPONENTBUILDER_ADMIN_VIEW_JAVASCRIPT_VIEW_FOOTER_LABEL="Javascript"
+COM_COMPONENTBUILDER_ADMIN_VIEW_JOOMLA="Joomla"
+COM_COMPONENTBUILDER_ADMIN_VIEW_KEY="Key"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_DESCRIPTION="The key to use to link the child view."
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_HINT="country"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key"
@@ -220,12 +341,20 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_WORD_ALL_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIEL
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_WORD_ALL_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word All case-sensitive (only 4 text_field)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_WORD_ANY_CASEINSENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word Any case-insensitive (only 4 text_field)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Key Word Any case-sensitive (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LEFT_IN_TAB="Left in Tab"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LEFT_OF_TABS="Left of Tabs"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LINK_DESCRIPTION="Select if the field is to be used as a link to a single record, if shown."
 COM_COMPONENTBUILDER_ADMIN_VIEW_LINK_LABEL="Link"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_DESCRIPTION="Select if the field it to show in the list view."
 COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_LABEL="Admin List"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LOCK="Lock"
+COM_COMPONENTBUILDER_ADMIN_VIEW_LOOP="Loop"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_BEHAVIOR_DESCRIPTION="Select the match behavior."
 COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_BEHAVIOR_LABEL="Match Behavior"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_FIELD="Match Field"
@@ -234,14 +363,25 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_FIELD_LABEL="Match Field"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_OPTIONS_HINT="Options here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MATCH_OPTIONS_LABEL="Match Options"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD="Max Length (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MENU="Menu"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MENU_THREE="Menu 3"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MENU_TWO="Menu 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_DESCRIPTION="Add Controller Method Name Here"
+COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_HINT="methodName"
+COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_LABEL="Target Controller Method"
 COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_DESCRIPTION="Enter method name."
 COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_HINT="Method Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_LABEL="Method Name"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MINUS="Minus"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MOBILE="Mobile"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_DESC="The last user that modified this Admin View."
 COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Admin View was modified."
 COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MOVE="Move"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MUSIC="Music"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL="MySQL"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT="Name Here"
@@ -255,6 +395,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_DESCRIPTION="Type null if single rec
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_HINT="Single Record Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL="Name (single record)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NEW="A New Admin View"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NEW_TAB="New Tab"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NEW_TAB_TWO="New Tab 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NEXT="Next"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NO="No"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION="<p>The scripts that are automatic added to the input fields below is identical to the default import scripts used. Adapt them to your own custom needs.</p>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL="Advanced notice."
@@ -268,24 +411,41 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION="If no tabs has been se
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL="Tab Setup Options"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_VIEWS_DESCRIPTION="id, asset_id, state, access, ordering, created_by, date_created, modified_by, date_modified, checked_out, checked_out_time, version, hits, metakey, metadesc, metadata (you don't need to add them again)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_VIEWS_LABEL="The following fields are added by default to all views"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION="Notification"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTIFICATION_CIRCLE="Notification Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_EDIT_DESCRIPTION="Order in relation to tab &amp; alignment of admin and site."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_EDIT_LABEL="Order in Edit"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_LIST_DESCRIPTION="Ordering in relation to list view of admin and site"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ORDER_LIST_LABEL="Order in list views"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PALETTE="Palette"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PARAGRAPH_CENTER="Paragraph Center"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PARAGRAPH_JUSTIFY="Paragraph Justify"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PARAGRAPH_LEFT="Paragraph Left"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PARAGRAPH_RIGHT="Paragraph Right"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_DESCRIPTION="The key to use to link the parent view."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_HINT="id"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PARENTKEY_LABEL="Parent Key"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PATH="PATH"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE="Pause"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PAUSE_CIRCLE="Pause Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL="Pencil"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PENCIL_TWO="Pencil 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION_DESCRIPTION="Should permission be used."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PERMISSION_LABEL="Permissions"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE="Phone"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHONE_TWO="Phone 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP="PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE="Php After Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_HINT="// PHP Here that should run in the delete Method after items were deleted. Array $pks  is an array of record primary keys."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH="Php After Publish"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_HINT="// PHP Here that should run in the publish Method after the item's published state has been changed. Array $pks is an array of record primary keys and $value is the published state."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL="PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD="Php Ajaxmethod"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_HINT="// PHP Method that should run in the AJAX Model"
@@ -306,12 +466,24 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE="Php Before Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_HINT="// PHP Here that should run in the delete Method before items are deleted. Array $pks  is an array of record primary keys."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH="Php Before Publish"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_HINT="// PHP Here that should run in the publish Method before items published state is changed. Array $pks  is an array of record primary keys and $value is the published state."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER="Php Controller"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LABEL="PHP (controller methods)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT="Php Document"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="PHP script to the document method."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT="// add custom PHP script to the document method."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="Custom Script (Document)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM="Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS="Php Getitems"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL="Php Getitems After All"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_LABEL="PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_HINT="// PHP Here that should run in the getItems Method (array) $items is where all values are"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_LABEL="PHP"
@@ -338,6 +510,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA="Php Import Setdata"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT="// PHP Here that should run in the setData Method, $package,$table,$target_headers"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL="setData Method PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL="Php Model"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_HINT="// PHP methods for the model that the controller will use"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL="PHP (model methods)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK="Php Postsavehook"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_HINT="// PHP Here that should run in the postSaveHook Method (object) $model is the data model object and (array) $validData is the validated data."
@@ -346,22 +522,58 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE="Php Save"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_HINT="// PHP Here that should run in the save Method (array) $data is where all values are"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PIE="Pie"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PIN="Pin"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PLAY="Play"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PLAY_CIRCLE="Play Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PLUS="Plus"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PLUS_CIRCLE="Plus Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_POWER_CORD="Power Cord"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PREVIOUS="Previous"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PRINT="Print"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PUBLISH="Publish"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PUBLISHING="Publishing"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PURGE="Purge"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PUZZLE="Puzzle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_QUESTION="Question"
+COM_COMPONENTBUILDER_ADMIN_VIEW_QUESTION_TWO="Question 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_QUOTES_LEFT="Quotes Left"
+COM_COMPONENTBUILDER_ADMIN_VIEW_QUOTES_RIGHT="Quotes Right"
+COM_COMPONENTBUILDER_ADMIN_VIEW_RADIO_UNCHECKED="Radio Unchecked"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RAW="RAW"
 COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY="readonly"
 COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE="read/write"
 COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE="Remove"
+COM_COMPONENTBUILDER_ADMIN_VIEW_REPLY="Reply"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RIGHT_IN_TAB="Right in Tab"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RIGHT_OF_TABS="Right of Tabs"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_COPY="Save Copy"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_NEW="Save New"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Admin View to customise the alias."
+COM_COMPONENTBUILDER_ADMIN_VIEW_SCISSORS="Scissors"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SCREEN="Screen"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SCREWDRIVER="Screwdriver"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH="Search"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH_DESCRIPTION="Select if the field is to be searchable in list view, if shown."
 COM_COMPONENTBUILDER_ADMIN_VIEW_SEARCH_LABEL="Searchable"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SETTINGS="Settings"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SHARE="Share"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SHARE_ALT="Share Alt"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SHIELD="Shield"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION="Short Description"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_DESCRIPTION="Enter short description"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT="Your Short Description Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_LABEL="Short Description"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SHOW="Show"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SHUFFLE="Shuffle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SIGNUP="Signup"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SINGLE="Single"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY="Smiley"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL="Smiley Neutral"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_NEUTRAL_TWO="Smiley Neutral 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_SAD="Smiley Sad"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_SAD_TWO="Smiley Sad 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SMILEY_TWO="Smiley 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_DESCRIPTION="Select if the field it to be sortable in list view, if shown."
 COM_COMPONENTBUILDER_ADMIN_VIEW_SORT_LABEL="Sortable"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCE="Source"
@@ -373,41 +585,70 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_SQL="Sql"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_DESCRIPTION="Add your MySQL here!"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT="// Add MySQL Table Dump Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_LABEL="MySQL"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SQUARE="Square"
+COM_COMPONENTBUILDER_ADMIN_VIEW_STACK="Stack"
+COM_COMPONENTBUILDER_ADMIN_VIEW_STAR_TWO="Star 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_STATUS="Status"
+COM_COMPONENTBUILDER_ADMIN_VIEW_STOP="Stop"
+COM_COMPONENTBUILDER_ADMIN_VIEW_STOP_CIRCLE="Stop Circle"
 COM_COMPONENTBUILDER_ADMIN_VIEW_STRING="STRING"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SUPPORT="Support"
+COM_COMPONENTBUILDER_ADMIN_VIEW_SWITCH="Switch"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME="System Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_DESCRIPTION="Used only in the system."
 COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_HINT="The System Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL="System Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE="Table"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TABLET="Tablet"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL="Select a Table"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_DESCRIPTION="Select the tab this field belongs to."
 COM_COMPONENTBUILDER_ADMIN_VIEW_TAB_LABEL="Tab"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TAG="Tag"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TAGS="Tags"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TAGS_TWO="Tags 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TAG_TWO="Tag 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_BEHAVIOR_DESCRIPTION="Select the target field/s behavior."
 COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_BEHAVIOR_LABEL="Target Behavior"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_DESCRIPTION="Set the target view type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_FIELD="Target Field"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_FIELD_DESCRIPTION="Select the target field/s."
 COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_FIELD_LABEL="Target Field/s"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_LABEL="Target"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_RELATION_DESCRIPTION="Select the target field/s relation to other of the same target field/s."
 COM_COMPONENTBUILDER_ADMIN_VIEW_TARGET_RELATION_LABEL="Target Relation"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_DESCRIPTION="Enter Task Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_HINT="Task Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TASK_NAME_LABEL="Task Name"
+COM_COMPONENTBUILDER_ADMIN_VIEW_THUMBS_DOWN="Thumbs Down"
+COM_COMPONENTBUILDER_ADMIN_VIEW_THUMBS_UP="Thumbs Up"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TITLE_DESCRIPTION="Select if the field is the title field."
 COM_COMPONENTBUILDER_ADMIN_VIEW_TITLE_LABEL="Title"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TREE="Tree"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TREE_TWO="Tree 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE="Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="Set the type of view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UINT="UINT"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UNACTIVE_ONLY_FOUR_TEXT_FIELD="Unactive (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UNARCHIVE="Unarchive"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UNBLOCK="Unblock"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UNDERNEATH_TABS="Underneath Tabs"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UNDO="Undo"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UNDO_TWO="Undo 2"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UNFEATURED="Unfeatured"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UNKNOWN="unknown"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UNLOCK="Unlock"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UNPUBLISH="Unpublish"
+COM_COMPONENTBUILDER_ADMIN_VIEW_UPLOAD="Upload"
+COM_COMPONENTBUILDER_ADMIN_VIEW_USER="User"
 COM_COMPONENTBUILDER_ADMIN_VIEW_USERNAME="USERNAME"
+COM_COMPONENTBUILDER_ADMIN_VIEW_USERS="Users"
 COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_DESCRIPTION="Allow only users."
 COM_COMPONENTBUILDER_ADMIN_VIEW_USER_CHECK_LABEL="User Check"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_DESCRIPTION="Enter Value Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_HINT="Value Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VALUE_NAME_LABEL="Value Name"
+COM_COMPONENTBUILDER_ADMIN_VIEW_VCARD="Vcard"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VERSION_DESC="A count of the number of times this Admin View has been revised."
 COM_COMPONENTBUILDER_ADMIN_VIEW_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWACCESS="view.access"
@@ -418,8 +659,16 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED="view.edit.created"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITCREATED_BY="view.edit.created_by"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITOWN="view.edit.own"
 COM_COMPONENTBUILDER_ADMIN_VIEW_VIEWEDITSTATE="view.edit.state"
+COM_COMPONENTBUILDER_ADMIN_VIEW_WAND="Wand"
+COM_COMPONENTBUILDER_ADMIN_VIEW_WARNING="Warning"
+COM_COMPONENTBUILDER_ADMIN_VIEW_WARNING_CIRCLE="Warning Circle"
+COM_COMPONENTBUILDER_ADMIN_VIEW_WIFI="Wifi"
 COM_COMPONENTBUILDER_ADMIN_VIEW_WORD="WORD"
+COM_COMPONENTBUILDER_ADMIN_VIEW_WRENCH="Wrench"
 COM_COMPONENTBUILDER_ADMIN_VIEW_YES="Yes"
+COM_COMPONENTBUILDER_ADMIN_VIEW_YOUTUBE="Youtube"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_IN="Zoom In"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ZOOM_OUT="Zoom Out"
 COM_COMPONENTBUILDER_AUTHOR="Author"
 COM_COMPONENTBUILDER_BACK="Back"
 COM_COMPONENTBUILDER_COMPONENT="Component"
@@ -828,6 +1077,12 @@ Project duration: **###projectWeekTime### weeks** or **###projectMonthTime### mo
 <br />
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).<br />
 > Developed by [Llewellyn van der Merwe] (mailto:joomla@vdm.io)<br />
+<br />
+## Donations<br />
+<br />
+ If you want to support this project, please consider donating:<br />
+ * PayPal: pay@vdm.io<br />
+ * Bitcoin: 3H35PYwikEosvcjxHXGPLS1GufZ4b4iFu3
 </code></div>"
 COM_COMPONENTBUILDER_COMPONENT_NOTE_README_LABEL="Demo README (with all place-holders)"
 COM_COMPONENTBUILDER_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION="You can use WHMCS licensing addon in your component<br /><strong>Helpful Links</strong><br /><a href='https://www.whmcs.com/addons/licensing-addon/' target='_blank'>https://www.whmcs.com/addons/licensing-addon/</a><br /><a href='http://docs.whmcs.com/Licensing_Addon' target='_blank'>http://docs.whmcs.com/Licensing_Addon</a>"
@@ -1321,6 +1576,9 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HOME="Home"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HOME_TWO="Home 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_DESCRIPTION="Joomla Standard Icomoon Fonts"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_LABEL="Icon"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON="Icon"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION="Must be 128px x 128px and a png format."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL="Icon"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ID="Id"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGE="Image"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGES="Images"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_buttons_fullwidth.php

@@ -0,0 +1,50 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.1.21
+	@build			11th September, 2016
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		custom_buttons_fullwidth.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'php_controller',
+	'php_model'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>

admin/layouts/admin_view/custom_buttons_left.php

@@ -0,0 +1,56 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.1.21
+	@build			11th September, 2016
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		custom_buttons_left.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'add_custom_button',
+	'custom_button'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+foreach ($fields as $field)
+{
+	$field = is_array($field) ? $field : array($field);
+	foreach ($field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			echo $form->renderField($f);
+			break;
+		}
+	}
+}

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
@@ -29,7 +29,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vxffields;
+$items	= $displayData->vxkfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=fields&task=field.edit";

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
@@ -38,6 +38,8 @@ $fields = $displayData->get('fields') ?: array(
 	'php_getitem',
 	'add_php_getitems',
 	'php_getitems',
+	'add_php_getitems_after_all',
+	'php_getitems_after_all',
 	'add_php_getlistquery',
 	'php_getlistquery',
 	'add_php_save',
@@ -50,6 +52,10 @@ $fields = $displayData->get('fields') ?: array(
 	'php_batchcopy',
 	'add_php_batchmove',
 	'php_batchmove',
+	'add_php_before_publish',
+	'php_before_publish',
+	'add_php_after_publish',
+	'php_after_publish',
 	'add_php_before_delete',
 	'php_before_delete',
 	'add_php_after_delete',

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/component/admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
-	@build			27th June, 2016
+	@version		2.1.21
+	@build			11th September, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php