Resolved #9 Layout Issue - Custom Lookup Field.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.1.14)
+# Component Builder (2.1.16)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -32,12 +32,12 @@ 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*: 28th June, 2016
++ *Last Build*: 12th July, 2016
-+ *Version*: 2.1.14
++ *Version*: 2.1.16
 + *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**
++ *Line count*: **83187**
-+ *File count*: **507**
++ *File count*: **509**
 + *Folder count*: **98**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/fieldtype.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css

admin/assets/css/fieldtypes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css

admin/assets/css/snippets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css

admin/assets/css/template.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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/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/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,7 +312,8 @@ 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');
@@ -318,7 +321,7 @@ class ###Component###ModelImport 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;
 		}
 
@@ -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_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')): ?>
+<?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
-<script type="text/javascript">
+<?php $urlId = (isset($this->item->id)) ? '&id='. (int) $this->item->id : ''; ?>
-	Joomla.submitbutton = function(task) {
+<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">
-		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">
         <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')): ?>
+<?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
-<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_###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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/fieldtype.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php

admin/controllers/snippet.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php

admin/controllers/snippets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php

admin/controllers/template.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/helpers/compiler/e_Interpretation.php

@@ -161,8 +161,9 @@ class Interpretation extends Fields
 	{
 		$statment[] = "\n\t\tif (!\$this->isHonest())";
 		$statment[] = "\t\t{";
-		$statment[] = "\t\t\tJError::raiseWarning(500, JText::_('NIE_REG_NIE'));";
+		$statment[] = "\t\t\t\$app = JFactory::getApplication();";
-		$statment[] = "\t\t\tJFactory::getApplication()->redirect('index.php');";
+		$statment[] = "\t\t\t\$app->enqueueMessage(JText::_('NIE_REG_NIE'), 'error');";
+		$statment[] = "\t\t\t\$app->redirect('index.php');";
 		$statment[] = "\t\t\treturn false;";
 		$statment[] = "\t\t}";
 		// return the genuine mentod statement
@@ -1732,20 +1733,21 @@ class Interpretation extends Fields
 			$getItem .= "\n\t".$tab."\t{";
 			if ($type == 'main')
 			{
+				$getItem .= "\n\t".$tab."\t\t\$app = JFactory::getApplication();";
 				$langKeyWord = $this->langPrefix.'_'.ComponentbuilderHelper::safeString('Not found or access denied','U');
 				if (!isset($this->langContent[$this->lang][$langKeyWord]))
 				{
 					$this->langContent[$this->lang][$langKeyWord] = 'Not found, or access denied.';
 				}
 				$getItem .= "\n\t".$tab."\t\t//".$this->setLine(__LINE__)." If no data is found redirect to default page and show warning.";
-				$getItem .= "\n\t".$tab."\t\tJError::raiseWarning(500, JText::_('".$langKeyWord."'));";
+				$getItem .= "\n\t".$tab."\t\t\$app->enqueueMessage(JText::_('".$langKeyWord."'), 'warning');";
 				if ('site' == $this->target)
 				{
-					$getItem .= "\n\t".$tab."\t\tJFactory::getApplication()->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."');";
+					$getItem .= "\n\t".$tab."\t\t\$app->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."&view=".$this->fileContentStatic['###SITE_DEFAULT_VIEW###']."');";
 				}
 				else
 				{
-					$getItem .= "\n\t".$tab."\t\tJFactory::getApplication()->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."');";
+					$getItem .= "\n\t".$tab."\t\t\$app->redirect('index.php?option=com_".$this->fileContentStatic['###component###']."');";
 				}
 				$getItem .= "\n\t".$tab."\t\treturn false;";
 			}
@@ -2469,7 +2471,7 @@ class Interpretation extends Fields
 			$method .= "\n\n\t\t//".$this->setLine(__LINE__)." Check for errors.";
 			$method .= "\n\t\tif (count(\$errors = \$this->get('Errors')))";
 			$method .= "\n\t\t{";
-			$method .= "\n\t\t\tJError::raiseWarning(500, ".'implode("\n", $errors));';
+			$method .= "\n\t\t\tJError::raiseError(500, ".'implode("\n", $errors));';
 			$method .= "\n\t\t\treturn false;";
 			$method .= "\n\t\t}";
 			// add custom script
@@ -3089,6 +3091,34 @@ class Interpretation extends Fields
 		return '';
 	}
 
+	public function setCustomViewSubmitButtonScript(&$view)
+	{
+		if (ComponentbuilderHelper::checkString($view['settings']->default))
+		{
+			// add the script only if there is none set
+			if (strpos($view['settings']->default, 'Joomla.submitbutton = function(task)') === false)
+			{
+				$script = array();
+				$script[] = "\n<script type=\"text/javascript\">";
+				$script[] = "\tJoomla.submitbutton = function(task) {";
+				$script[] = "\t\tif (task == '".$view['settings']->code.".back') {";
+				$script[] = "\t\t\tparent.history.back();";
+				$script[] = "\t\t\treturn false;";
+				$script[] = "\t\t} else {";
+				$script[] = "\t\t\tvar form = document.getElementById('adminForm');";
+				$script[] = "\t\t\tform.task.value = task;";
+				$script[] = "\t\t\tform.submit();";
+				$script[] = "\t\t}";
+				$script[] = "\t}";
+				$script[] = "</script>";
+				
+				return implode("\n", $script);
+			}
+			
+		}
+		return '';
+	}
+
 	public function setCustomViewCodeBody(&$view)
 	{
 		if ($view['settings']->add_php_view == 1)
@@ -7471,16 +7501,11 @@ class Interpretation extends Fields
 		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." check if button was created for " . $targetView ." field.";
 		$addButton[] = "\t\t\tif (is_array(\$button) && count(\$button) > 0)";
 		$addButton[] = "\t\t\t{";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." Add some final script";
-		$addButton[] = "\t\t\t\t\$script[] = \"";
-		$addButton[] = "\t\t\t\t\tjQuery(document).ready(function() {";
-		$addButton[] = "\t\t\t\t\t\tjQuery('#jform_\".\$buttonName.\"').closest('.control-group').addClass('input-append');";
-		$addButton[] = "\t\t\t\t\t});\";";
 		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." Load the needed script.";
 		$addButton[] = "\t\t\t\t\$document = JFactory::getDocument();";
 		$addButton[] = "\t\t\t\t\$document->addScriptDeclaration(implode(' ',\$script));";
 		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." return the button attached to input field.";
-		$addButton[] = "\t\t\t\treturn \$html . implode('',\$button);";
+		$addButton[] = "\t\t\t\treturn '<div class=\"input-append\">' .\$html . implode('',\$button).'</div>';";
 		$addButton[] = "\t\t\t}";
 		$addButton[] = "\t\t}";
 		$addButton[] = "\t\treturn \$html;";
@@ -11080,11 +11105,70 @@ class Interpretation extends Fields
 
 	public function addCustomDashboardIcons(&$view,&$counter)
 	{
+		$icon = '';
+		if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views))
+		{
+			foreach ($this->componentData->custom_admin_views as $nr => $menu)
+			{
+				if (!isset($this->customAdminAdded[$menu['settings']->code]) && $menu['dashboard_list'] == 1 && $menu['before'] == $view['adminview'])
+				{
+					$type = ComponentbuilderHelper::imageInfo($menu['settings']->icon);
+					if ($type)
+					{
+						$type = $type.".";
+						// icon builder loader
+						$this->iconBuilder[$type.$menu['settings']->code] = $menu['settings']->icon;
+					}
+					else
+					{
+						$type = 'png.';
+					}
+					// build lang
+					$langName	= $menu['settings']->name.'<br /><br />';
+					$langKey	= $this->langPrefix.'_DASHBOARD_'.$menu['settings']->CODE;
+					// add to lang
+					$this->langContent[$this->lang][$langKey] = $langName;
+					// set icon
+					if ($counter == 0)
+					{
+						$counter++;
+						$icon .= "'".$type.$menu['settings']->code."'";
+					}
+					else
+					{
+						$counter++;
+						$icon .= ", '".$type.$menu['settings']->code."'";
+					}
+				}
+				elseif(!isset($this->customAdminAdded[$menu['settings']->code]) && $menu['dashboard_list'] == 1 && empty($menu['before']))
+				{
+					$type = ComponentbuilderHelper::imageInfo($menu['settings']->icon);
+					if ($type)
+					{
+						$type = $type.".";
+						// icon builder loader
+						$this->iconBuilder[$type.$menu['settings']->code] = $menu['settings']->icon;
+					}
+					else
+					{
+						$type = 'png.';
+					}
+					// build lang
+					$langName	= $menu['settings']->name.'<br /><br />';
+					$langKey	= $this->langPrefix.'_DASHBOARD_'.$menu['settings']->CODE;
+					// add to lang
+					$this->langContent[$this->lang][$langKey] = $langName;
+					// set icon
+					$this->lastCustomDashboardIcon[$nr] = ", '".$type.$menu['settings']->code."'";
+				}
+			}
+		}
 		// see if we should have custom menus
 		if (isset($this->componentData->custommenus) && ComponentbuilderHelper::checkArray($this->componentData->custommenus))
 		{
 			foreach ($this->componentData->custommenus as $nr => $menu)
 			{
+				$nr		= $nr + 100;
 				$nameList	= ComponentbuilderHelper::safeString($menu['name_code']);
 				$nameUpper	= ComponentbuilderHelper::safeString($menu['name_code'], 'U');
 				if ($menu['dashboard_list'] == 1 && $view['adminview'] == $menu['before'])
@@ -11116,12 +11200,12 @@ class Interpretation extends Fields
 						if ($counter == 0)
 						{
 							$counter++;
-							return "'".$type.$nameList."'";
+							$icon .= "'".$type.$nameList."'";
 						}
 						else
 						{
 							$counter++;
-							return ", '".$type.$nameList."'";
+							$icon .= ", '".$type.$nameList."'";
 						}
 					}
 				}
@@ -11156,7 +11240,7 @@ class Interpretation extends Fields
 				}
 			}
 		}
-		return '';
+		return $icon;
 	}
 
 	public function setSubMenus()
@@ -11413,11 +11497,35 @@ class Interpretation extends Fields
 
 	public function addCustomMainMenu(&$view,&$codeName,&$lang)
 	{
+		$customMenu = '';
+		// see if we should have custom admin views
+		if (isset($this->componentData->custom_admin_views) && ComponentbuilderHelper::checkArray($this->componentData->custom_admin_views))
+		{
+			foreach ($this->componentData->custom_admin_views as $nr => $menu)
+			{
+				if (!isset($this->customAdminAdded[$menu['settings']->code]))
+				{
+					if ($menu['mainmenu'] == 1 && $view['adminview'] == $menu['before'])
+					{
+						$this->langContent['adminsys'][$lang.'_'.$menu['settings']->CODE] = $menu['settings']->name;
+						// add custom menu
+						$customMenu .= "\n\t\t\t".'<menu option="com_'.$codeName.'" view="'.$menu['settings']->code.'">'.$lang.'_'.$menu['settings']->CODE.'</menu>';
+					}
+					elseif($menu['mainmenu'] == 1 && empty($menu['before']))
+					{
+						$this->langContent['adminsys'][$lang.'_'.$menu['settings']->CODE] = $menu['settings']->name;
+						// add custom menu
+						$this->lastCustomMainMenu[$nr] = "\n\t\t\t".'<menu option="com_'.$codeName.'" view="'.$menu['settings']->code.'">'.$lang.'_'.$menu['settings']->CODE.'</menu>';
+					}
+				}
+			}
+		}
 		// see if we should have custom menus
 		if (isset($this->componentData->custommenus) && ComponentbuilderHelper::checkArray($this->componentData->custommenus))
 		{
 			foreach ($this->componentData->custommenus as $nr => $menu)
 			{
+				$nr = $nr + 100;
 				if ($menu['mainmenu'] == 1 && $view['adminview'] == $menu['before'])
 				{
 					if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
@@ -11426,7 +11534,7 @@ class Interpretation extends Fields
 						$nameUpper	= ComponentbuilderHelper::safeString($menu['name'], 'U');
 						$this->langContent['adminsys'][$lang.'_'.$nameUpper] = $menu['name'];
 						// add custom menu
-						return "\n\t\t\t".'<menu link="'.$menu['link'].'">'.$lang.'_'.$nameUpper.'</menu>';
+						$customMenu .= "\n\t\t\t".'<menu link="'.$menu['link'].'">'.$lang.'_'.$nameUpper.'</menu>';
 					}
 					else
 					{
@@ -11434,7 +11542,7 @@ class Interpretation extends Fields
 						$nameUpper	= ComponentbuilderHelper::safeString($menu['name_code'], 'U');
 						$this->langContent['adminsys'][$lang.'_'.$nameUpper] = $menu['name'];
 						// add custom menu
-						return "\n\t\t\t".'<menu option="com_'.$codeName.'" view="'.$nameList.'">'.$lang.'_'.$nameUpper.'</menu>';
+						$customMenu .= "\n\t\t\t".'<menu option="com_'.$codeName.'" view="'.$nameList.'">'.$lang.'_'.$nameUpper.'</menu>';
 					}
 				}
 				elseif($menu['mainmenu'] == 1 && empty($menu['before']))
@@ -11458,7 +11566,7 @@ class Interpretation extends Fields
 				}
 			}
 		}
-		return '';
+		return $customMenu;
 
 	}
 

admin/helpers/compiler/f_Infusion.php

@@ -678,6 +678,8 @@ class Infusion extends Interpretation
 						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
 						// ###CUSTOM_ADMIN_BODY### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BODY###'] = $this->setCustomViewBody($view);
+						// ###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] = $this->setCustomViewSubmitButtonScript($view);
 
 						// setup the templates
 						$this->setCustomViewTemplateBody($view);

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -1321,6 +1321,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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 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
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php

admin/layouts/component/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/component/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/component/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/component/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/component/ftp_servers_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ftp_servers_fullwidth.php

admin/layouts/component/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/component/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/component/readme_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php

admin/layouts/component/readme_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.14
+	@version		2.1.16
-	@build			28th June, 2016
+	@build			12th July, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php