Added email helper class.

Removed the PDF lib since it made the installer to big for most servers. We will setup an another lib installer for the PDF library.
Added the option to overwrite the default-fields, so you can add them to the list view in admin area and change their layout position in the edit view. Also fixed some minor bugs.
2016-06-03 07:28:32 +01:00 · 2016-06-02 17:34:46 +01:00 · 2016-06-02 17:18:49 +01:00 · 2016-05-31 06:36:31 +01:00 · 2016-05-31 06:11:07 +01:00 · 2016-05-20 06:00:31 +01:00
452 changed files with 12521 additions and 6489 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Component Builder (2.1.6)
+# Component Builder (2.1.12)

 This is a [Joomla 3.x] (http://www.joomla.org/) component.

@ -6,7 +6,7 @@ This is a [Joomla 3.x] (http://www.joomla.org/) component.

 The Component Builder for Joomla that is highly advanced, truly able to build extremely complex components in a fraction of the time.

-> **You can purchase Component Builder with the following components as demo setup inside Component Builder:**
+> **You can purchase demo content inside Component Builder:**

 + **Development Version** ([get this demo set](https://www.vdm.io/joomla-component-builder))

@ -22,9 +22,9 @@ The Component Builder for Joomla that is highly advanced, truly able to build ex

    *Training & Help Videos* tutorials in the component included.

-# Extra Support
+# gitHub Support

-Would you require more help VDM.io has a number of support plans available [visit us today!](https://www.vdm.io/joomla-component-builder).
+Would you require more help please open and issue here on [gitHub today](https://github.com/vdm-io/Joomla-Component-Builder/issues)!

 # Build Details

@ -32,38 +32,13 @@ Would you require more help VDM.io has a number of support plans available [visi
 + *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*: 4th May, 2016
-+ *Version*: 2.1.6
+ *Last Build*: 3rd June, 2016
+ *Version*: 2.1.12
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-
-## Build Time
-
-**227 Hours** or **28 Eight Hour Days** (actual time the author saved -
-due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builder))
-
-> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
-> never making one mistake or taking any coffee break.)
-
-+ *Line count*: **81589**
-+ *File count*: **499**
+ *Line count*: **83152**
+ *File count*: **505**
 + *Folder count*: **98**

-**150 Hours** or **19 Eight Hour Days** (the actual time the author spent)
-
-> (with the following break down:
-> **debugging @57hours** = codingtime / 4;
-> **planning @32hours** = codingtime / 7;
-> **mapping @23hours** = codingtime / 10;
-> **office @38hours** = codingtime / 6;)
-
-**377 Hours** or **47 Eight Hour Days**
-(a total of the realistic time frame for this project)
-
-> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
-> with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)
-
-Project duration: **9.4 weeks** or **2 months**
-
 > 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)
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css
--- a/admin/assets/css/admin_view.css
+++ b/admin/assets/css/admin_view.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css
--- a/admin/assets/css/admin_views.css
+++ b/admin/assets/css/admin_views.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css
--- a/admin/assets/css/component.css
+++ b/admin/assets/css/component.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css
--- a/admin/assets/css/components.css
+++ b/admin/assets/css/components.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.css
--- a/admin/assets/css/custom_admin_view.css
+++ b/admin/assets/css/custom_admin_view.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css
--- a/admin/assets/css/custom_admin_views.css
+++ b/admin/assets/css/custom_admin_views.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css
--- a/admin/assets/css/dynamic_get.css
+++ b/admin/assets/css/dynamic_get.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css
--- a/admin/assets/css/dynamic_gets.css
+++ b/admin/assets/css/dynamic_gets.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css
--- a/admin/assets/css/field.css
+++ b/admin/assets/css/field.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css
--- a/admin/assets/css/fields.css
+++ b/admin/assets/css/fields.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css
--- a/admin/assets/css/fieldtype.css
+++ b/admin/assets/css/fieldtype.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css
--- a/admin/assets/css/fieldtypes.css
+++ b/admin/assets/css/fieldtypes.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.css
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css
--- a/admin/assets/css/layout.css
+++ b/admin/assets/css/layout.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css
--- a/admin/assets/css/layouts.css
+++ b/admin/assets/css/layouts.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css
--- a/admin/assets/css/site_view.css
+++ b/admin/assets/css/site_view.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.css
--- a/admin/assets/css/site_views.css
+++ b/admin/assets/css/site_views.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css
--- a/admin/assets/css/snippet.css
+++ b/admin/assets/css/snippet.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css
--- a/admin/assets/css/snippets.css
+++ b/admin/assets/css/snippets.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css
--- a/admin/assets/css/template.css
+++ b/admin/assets/css/template.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css
--- a/admin/assets/css/templates.css
+++ b/admin/assets/css/templates.css
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css
--- a/admin/compiler/giz.txt
+++ b/admin/compiler/giz.txt
@ -1,17 +0,0 @@
-/*----------------------------------------------------------------------------------|  www.giz.de  |----/
-	###COMPANYNAME### 
-/-------------------------------------------------------------------------------------------------------/
-
-	@version		###VERSION###
-	@build			###BUILDDATE###
-	@created		###CREATIONDATE###
-	@package		###Component_name###
-	@subpackage		###FILENAME###
-	@author			###AUTHOR### <###AUTHORWEBSITE###>	
-	@owner			###COMPANYNAME###
-	@copyright		###COPYRIGHT###
-	@license		###LICENSE###
-	
-/-------------------------------------------------------------------------------------------------------/
-	###SHORT_DESCRIPTION###
-/------------------------------------------------------------------------------------------------------*/
--- a/admin/compiler/joomla_3/Helper.php
+++ b/admin/compiler/joomla_3/Helper.php
@ -7,7 +7,7 @@
       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
                                                        | |                                                                 
-                                                        |_| 				
+                                                        |_|
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@package		Component Builder
@ -16,9 +16,9 @@
 	@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 
-                                                             
+
+	Builds Complex Joomla Components
+
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // No direct access to this file
@ -162,31 +162,33 @@ abstract class ###Component###Helper
 		return false;
 	}

-	public static function jsonToString($value, $sperator = ", ")
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
                // check if string is JSON
                $result = json_decode($value, true);
-                if (json_last_error() === JSON_ERROR_NONE) {
-                // is JSON
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
+			// is JSON
 			if (self::checkArray($result))
 			{
-				$value = '';
-				$counter = 0;
-				foreach ($result as $string)
+				if (self::checkString($table))
 				{
-					if ($counter)
+					$names = array();
+					foreach ($result as $val)
 					{
-						$value .= $sperator.$string;
+						if ($name = self::getVar($table, $val, 'id', 'name'))
+						{
+							$names[] = $name;
+						}
 					}
-					else
+					if (self::checkArray($names))
 					{
-						$value .= $string;
-					}
-					$counter++;
+						return (string) implode($sperator,$names);
+					}	
 				}
-				return $value;
+				return (string) implode($sperator,$result);
 			}
-                        return json_decode($value);
+                        return (string) json_decode($value);
                }
                return $value;
        }
--- a/admin/compiler/joomla_3/Helper_email.php
+++ b/admin/compiler/joomla_3/Helper_email.php
@ -1,13 +1,25 @@
 <?php
-/**
-*
-*  @version		2.0.0 - September 03, 2014
-*  @package		Component Builder
-*  @author		Llewellyn van de Merwe <http://www.vdm.io>
-*  @copyright		Copyright (C) 2014. All Rights Reserved
-*  @license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-*
-**/
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@package		Component Builder
+	@subpackage		componentbuilder.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');
--- a/admin/compiler/joomla_3/Helper_site.php
+++ b/admin/compiler/joomla_3/Helper_site.php
@ -17,7 +17,7 @@
 	@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 
+	Builds Complex Joomla Components
                                                             
 /-----------------------------------------------------------------------------------------------------------------------------*/

@ -34,34 +34,37 @@ defined('_JEXEC') or die('Restricted access');
 */
 abstract class ###Component###Helper
 {###SITE_GLOBAL_EVENT_HELPER### ###SITE_CUSTOM_HELPER_SCRIPT###
-
-	public static function jsonToString($value)
+	
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
-		// check if string is JSON
-		$result = json_decode($value, true);
-		if (json_last_error() === JSON_ERROR_NONE) {
+                // check if string is JSON
+                $result = json_decode($value, true);
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
 			// is JSON
-				if (self::checkArray($result))
+			if (self::checkArray($result))
+			{
+				if (self::checkString($table))
 				{
-					$value = '';
-					$counter = 0;
-					foreach ($result as $string)
+					$names = array();
+					foreach ($result as $val)
 					{
-						if ($counter)
+						if ($name = self::getVar($table, $val, 'id', 'name'))
 						{
-							$value .= ", ".$string;
+							$names[] = $name;
 						}
-						else
-						{
-							$value .= $string;
-						}
-						$counter++;
 					}
+					if (self::checkArray($names))
+					{
+						return (string) implode($sperator,$names);
+					}	
 				}
-			return json_decode($value);
-		}
-		return $value;
-	}
+				return (string) implode($sperator,$result);
+			}
+                        return (string) json_decode($value);
+                }
+                return $value;
+        }
 	
 	/**
 	*	Load the Component xml manifest.
--- a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JControllerLegacy_import_custom.php
@ -44,7 +44,7 @@ class ###Component###Controller###View### extends JControllerLegacy
 		// Check for request forgeries
 		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

-		$model = $this->getModel('import');
+		$model = $this->getModel('###View###');
 		if ($model->import())
 		{
 			$cache = JFactory::getCache('mod_menu');
--- a/admin/compiler/joomla_3/JModelLegacy_import.php
+++ b/admin/compiler/joomla_3/JModelLegacy_import.php
@ -55,7 +55,7 @@ class ###Component###ModelImport extends JModelLegacy
 	 * Import Settings
 	 */
 	protected $getType 	= NULL;
-	protected $dataType = NULL;
+	protected $dataType	= NULL;
 	
 	/**
 	 * Method to auto-populate the model state.
--- a/admin/compiler/joomla_3/JModelLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JModelLegacy_import_custom.php
@ -49,13 +49,13 @@ class ###Component###Model###View### extends JModelLegacy
 	 *
 	 * @var        string
 	 */
-	protected $_context = 'com_###component###.import';
+	protected $_context = 'com_###component###.###view###';
 	
 	/**
 	 * Import Settings
 	 */
 	protected $getType 	= NULL;
-	protected $dataType = NULL;
+	protected $dataType	= NULL;
 	
 	/**
 	 * Method to auto-populate the model state.
@ -81,117 +81,7 @@ class ###Component###Model###View### extends JModelLegacy
 		$this->safeFileOptions = array();
 		parent::populateState();
 	}
-
-	/**
-	 * Import an spreadsheet from either folder, url or upload.
-	 *
-	 * @return  boolean result of import
-	 *
-	 */
-	public function import()
-	{
-		$this->setState('action', 'import');
-		$app 		= JFactory::getApplication();
-		$session 	= JFactory::getSession();
-		$package 	= null;
-		$continue	= false;
-		// get import type
-		$this->getType = $app->input->getString('gettype', NULL);
-		// get import type
-		$this->dataType	= $session->get('dataType_VDM_IMPORTINTO', NULL);
-
-		if ($package === null)
-		{
-			switch ($this->getType)
-			{
-				case 'folder':
-					// Remember the 'Import from Directory' path.
-					$app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory');
-					$package = $this->_getPackageFromFolder();
-					break;
-
-				case 'upload':
-					$package = $this->_getPackageFromUpload();
-					break;
-
-				case 'url':
-					$package = $this->_getPackageFromUrl();
-					break;
-
-				case 'continue':
-					$continue 	= true;
-					$package	= $session->get('package', null);
-					$package	= json_decode($package, true);
-					// clear session
-					$session->clear('package');
-					$session->clear('dataType');
-					$session->clear('hasPackage');
-					break;
-
-				default:
-					$app->setUserState('com_###component###.message', JText::_('COM_###COMPONENT###_IMPORT_NO_IMPORT_TYPE_FOUND'));
-
-					return false;
-					break;
-			}
-		}
-		// Was the package valid?
-		if (!$package || !$package['type'])
-		{
-			if (in_array($this->getType, array('upload', 'url')))
-			{
-				$this->remove($package['packagename']);
-			}
-
-			$app->setUserState('com_###component###.message', JText::_('COM_###COMPONENT###_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'));
-			return false;
-		}
-		
-		// first link data to table headers
-		if(!$continue){
-			$package	= json_encode($package);
-			$session->set('package', $package);
-			$session->set('dataType', $this->dataType);
-			$session->set('hasPackage', true);
-			return true;
-		}
-        
-		// set the data
-		$headerList = json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false), true);
-		if (!$this->setData($package,$this->dataType,$headerList))
-		{
-			// There was an error importing the package
-			$msg = JText::_('COM_###COMPONENT###_IMPORT_ERROR');
-			$back = $session->get('backto_VDM_IMPORT', NULL);
-			if ($back)
-			{
-				$app->setUserState('com_###component###.redirect_url', 'index.php?option=com_###component###&view='.$back);
-				$session->clear('backto_VDM_IMPORT');
-			}
-			$result = false;
-		}
-		else
-		{
-			// Package imported sucessfully
-			$msg = JText::sprintf('COM_###COMPONENT###_IMPORT_SUCCESS', $package['packagename']);
-			$back = $session->get('backto_VDM_IMPORT', NULL);
-			if ($back)
-			{
-			    $app->setUserState('com_###component###.redirect_url', 'index.php?option=com_###component###&view='.$back);
-			    $session->clear('backto_VDM_IMPORT');
-			}
-			$result = true;
-		}
-
-		// Set some model state values
-		$app->enqueueMessage($msg);
-
-		// remove file after import
-		$this->remove($package['packagename']);
-		$session->clear($this->getType.'_VDM_IMPORTHEADERS');
-        
-		return $result;
-	}
+	###IMPORT_METHOD_CUSTOM### 

 	/**
 	 * Works out an importation spreadsheet from a HTTP upload
@ -406,30 +296,8 @@ class ###Component###Model###View### extends JModelLegacy
 			JFile::delete(JPath::clean($package));
 		}
 	}
-	
-	/**
-	* Set the data from the spreadsheet to the database
-	*
-	* @param string  $package Paths to the uploaded package file
-	*
-	* @return  boolean false on failure
-	*
-	**/
-	protected function setData($package,$table,$target_headers)
-	{###IMPORT_SETDATE_METOD_CUSTOM###
-	}
-	
-	/**
-	* Save the data from the file to the database
-	*
-	* @param string  $package Paths to the uploaded package file
-	*
-	* @return  boolean false on failure
-	*
-	**/
-	protected function save($data,$table)
-	{###IMPORT_SAVE_METOD_CUSTOM###
-	}
+	###IMPORT_SETDATE_METHOD_CUSTOM### 
+	###IMPORT_SAVE_METHOD_CUSTOM###
 	
 	protected function getAlias($name,$type = false)
 	{
--- a/admin/compiler/joomla_3/JViewLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JViewLegacy_import_custom.php
@ -36,59 +36,7 @@ jimport('joomla.application.component.view');
 * ###Component### ###View### View
 */
 class ###Component###View###View### extends JViewLegacy
-{
-	protected $headerList;
-	protected $hasPackage = false;
-	protected $headers;
-	protected $hasHeader = 0;
-	protected $dataType;
-
-	public function display($tpl = null)
-	{
-		if ($this->getLayout() !== 'modal')
-		{
-			// Include helper submenu
-			###Component###Helper::addSubmenu('import');
-		}
-
-		// Check for errors.
-		if (count($errors = $this->get('Errors'))){
-			JError::raiseError(500, implode('<br />', $errors));
-			return false;
-		}
-
-		$paths = new stdClass;
-		$paths->first = '';
-		$state = $this->get('state');
-
-		$this->paths = &$paths;
-		$this->state = &$state;
-                // get global action permissions
-		$this->canDo = ###Component###Helper::getActions('import');
-
-		// We don't need toolbar in the modal window.
-		if ($this->getLayout() !== 'modal')
-		{
-			$this->addToolbar();
-			$this->sidebar = JHtmlSidebar::render();
-		}
-
-		// get the session object
-		$session = JFactory::getSession();
-		// check if it has package
-		$this->hasPackage 	= $session->get('hasPackage', false);
-		$this->dataType 	= $session->get('dataType', false);
-		if($this->hasPackage && $this->dataType)
-		{
-			$this->headerList 	= json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false),true);
-			$this->headers 		= ###Component###Helper::getFileHeaders($this->dataType);
-			// clear the data type
-			$session->clear('dataType');
-		}
-
-		// Display the template
-		parent::display($tpl);
-	}
+{###IMPORT_DISPLAY_METHOD_CUSTOM###

 	/**
 	 * Setting the toolbar
--- a/admin/compiler/joomla_3/default_import.php
+++ b/admin/compiler/joomla_3/default_import.php
@ -34,8 +34,7 @@ JHtml::_('bootstrap.tooltip');
 JHtml::_('script', 'system/core.js', false, true);
 ?>
 <script type="text/javascript">
-	
-	<?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList)) : ?>
+<?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList)) : ?>
 	Joomla.continueImport = function()
 	{
 		var form = document.getElementById('adminForm');
@ -62,7 +61,7 @@ JHtml::_('script', 'system/core.js', false, true);
 			form.submit();
 		}
 	};
-	<?php else: ?>
+<?php else: ?>
 	Joomla.submitbutton = function()
 	{
 		var form = document.getElementById('adminForm');
@ -115,25 +114,25 @@ JHtml::_('script', 'system/core.js', false, true);
 			form.submit();
 		}
 	};
-	<?php endif; ?>
+<?php endif; ?>

-	// Add spindle-wheel for importations:
-	jQuery(document).ready(function($) {
-		var outerDiv = $('body');
+// Add spindle-wheel for importations:
+jQuery(document).ready(function($) {
+	var outerDiv = $('body');

-		$('<div id="loading"></div>')
-			.css("background", "rgba(255, 255, 255, .8) url('components/com_###component###/assets/images/import.gif') 50% 15% no-repeat")
-			.css("top", outerDiv.position().top - $(window).scrollTop())
-			.css("left", outerDiv.position().left - $(window).scrollLeft())
-			.css("width", outerDiv.width())
-			.css("height", outerDiv.height())
-			.css("position", "fixed")
-			.css("opacity", "0.80")
-			.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
-			.css("filter", "alpha(opacity = 80)")
-			.css("display", "none")
-			.appendTo(outerDiv);
-	});
+	$('<div id="loading"></div>')
+		.css("background", "rgba(255, 255, 255, .8) url('components/com_###component###/assets/images/import.gif') 50% 15% no-repeat")
+		.css("top", outerDiv.position().top - $(window).scrollTop())
+		.css("left", outerDiv.position().left - $(window).scrollLeft())
+		.css("width", outerDiv.width())
+		.css("height", outerDiv.height())
+		.css("position", "fixed")
+		.css("opacity", "0.80")
+		.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
+		.css("filter", "alpha(opacity = 80)")
+		.css("display", "none")
+		.appendTo(outerDiv);
+});

 </script>

@ -148,89 +147,87 @@ JHtml::_('script', 'system/core.js', false, true);
 	<?php else : ?>
 		<div id="j-main-container">
 	<?php endif;?>
-    
-    <?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList) && ###Component###Helper::checkArray($this->headers)) : ?>
-        <fieldset class="uploadform">
-            <legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>
-            <div class="control-group">
-                <label class="control-label" ><h4><?php echo JText::_('COM_###COMPONENT###_IMPORT_TABLE_COLUMNS'); ?></h4></label>
-                <div class="controls">
-                <label class="control-label" ><h4><?php echo JText::_('COM_###COMPONENT###_IMPORT_FILE_COLUMNS'); ?></h4></label>
-                </div>
-            </div>
-            <?php foreach($this->headerList as $name => $title): ?>
-            <div class="control-group">
-                <label for="<?php echo $name; ?>" class="control-label" ><?php echo $title; ?></label>
-                    <div class="controls">
-                        <select  name="<?php echo $name; ?>"  id="vdm_<?php echo $name; ?>" required class="required input_box" >
-                            <option value=""><?php echo JText::_('COM_###COMPONENT###_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>
-                            <option value="IGNORE"><?php echo JText::_('COM_###COMPONENT###_IMPORT_IGNORE_COLUMN'); ?></option>
-                            <?php foreach($this->headers as $value => $option): ?>
-                                <?php $selected = (strtolower($option) ==  strtolower ($title) || strtolower($option) == strtolower($name))? 'selected="selected"':''; ?>
-                                <option value="<?php echo ###Component###Helper::htmlEscape($value); ?>" class="required" <?php echo $selected ?>><?php echo ###Component###Helper::htmlEscape($option); ?></option>
-                            <?php endforeach; ?>
-                         </select>
-                    </div>
-            </div>
-            <?php endforeach; ?>
-            <div class="form-actions">
-                <input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_CONTINUE'); ?>" onclick="Joomla.continueImport()" />
-            </div>
-        </fieldset>
-        <input type="hidden" name="gettype" value="continue" />
-    <?php else: ?>
+
+	<?php if ($this->hasPackage && ###Component###Helper::checkArray($this->headerList) && ###Component###Helper::checkArray($this->headers)) : ?>
+		<fieldset class="uploadform">
+			<legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>
+			<div class="control-group">
+				<label class="control-label" ><h4><?php echo JText::_('COM_###COMPONENT###_IMPORT_TABLE_COLUMNS'); ?></h4></label>
+				<div class="controls">
+					<label class="control-label" ><h4><?php echo JText::_('COM_###COMPONENT###_IMPORT_FILE_COLUMNS'); ?></h4></label>
+				</div>
+			</div>
+			<?php foreach($this->headerList as $name => $title): ?>
+				<div class="control-group">
+					<label for="<?php echo $name; ?>" class="control-label" ><?php echo $title; ?></label>
+					<div class="controls">
+					<select  name="<?php echo $name; ?>"  id="vdm_<?php echo $name; ?>" required class="required input_box" >
+						<option value=""><?php echo JText::_('COM_###COMPONENT###_IMPORT_PLEASE_SELECT_COLUMN'); ?></option>
+						<option value="IGNORE"><?php echo JText::_('COM_###COMPONENT###_IMPORT_IGNORE_COLUMN'); ?></option>
+						<?php foreach($this->headers as $value => $option): ?>
+							<?php $selected = (strtolower($option) ==  strtolower ($title) || strtolower($option) == strtolower($name))? 'selected="selected"':''; ?>
+							<option value="<?php echo ###Component###Helper::htmlEscape($value); ?>" class="required" <?php echo $selected ?>><?php echo ###Component###Helper::htmlEscape($option); ?></option>
+						<?php endforeach; ?>
+					</select>
+					</div>
+				</div>
+			<?php endforeach; ?>
+			<div class="form-actions">
+				<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_CONTINUE'); ?>" onclick="Joomla.continueImport()" />
+			</div>
+		</fieldset>
+		<input type="hidden" name="gettype" value="continue" />
+	<?php else: ?>
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'upload')); ?>
-    
-                <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JText::_('COM_###COMPONENT###_IMPORT_FROM_UPLOAD', true)); ?>
-                <fieldset class="uploadform">
-                    <legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
-                    <div class="control-group">
-                        <label for="import_package" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE'); ?></label>
-                        <div class="controls">
-                            <input class="input_box" id="import_package" name="import_package" type="file" size="57" />
-                        </div>
-                    </div>
-                    <div class="form-actions">
-                        <input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_UPLOAD_BOTTON'); ?>" onclick="Joomla.submitbutton()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
-                    </div>
-                </fieldset>
-            <?php echo JHtml::_('bootstrap.endTab'); ?>
-    
-            <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_###COMPONENT###_IMPORT_FROM_DIRECTORY', true)); ?>
-                <fieldset class="uploadform">
-                    <legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
-                    <div class="control-group">
-                        <label for="import_directory" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>
-                        <div class="controls">
-                            <input type="text" id="import_directory" name="import_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('import.directory'); ?>" />
-                        </div>
-                    </div>
-                    <div class="form-actions">
-                        <input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton3()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
-                    </div>
-                </fieldset>
-            <?php echo JHtml::_('bootstrap.endTab'); ?>
-    
-            <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JText::_('COM_###COMPONENT###_IMPORT_FROM_URL', true)); ?>
-                <fieldset class="uploadform">
-                    <legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
-                    <div class="control-group">
-                        <label for="import_url" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_URL'); ?></label>
-                        <div class="controls">
-                            <input type="text" id="import_url" name="import_url" class="span5 input_box" size="70" value="http://" />
-                        </div>
-                    </div>
-                    <div class="form-actions">
-                        <input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
-                    </div>
-                </fieldset>
-    
-            <?php echo JHtml::_('bootstrap.endTab'); ?>
-        
-        <?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'upload', JText::_('COM_###COMPONENT###_IMPORT_FROM_UPLOAD', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_package" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE'); ?></label>
+					<div class="controls">
+						<input class="input_box" id="import_package" name="import_package" type="file" size="57" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input class="btn btn-primary" type="button" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_UPLOAD_BOTTON'); ?>" onclick="Joomla.submitbutton()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+			</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_###COMPONENT###_IMPORT_FROM_DIRECTORY', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_directory" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_DIRECTORY'); ?></label>
+					<div class="controls">
+						<input type="text" id="import_directory" name="import_directory" class="span5 input_box" size="70" value="<?php echo $this->state->get('import.directory'); ?>" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton3()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+				</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'url', JText::_('COM_###COMPONENT###_IMPORT_FROM_URL', true)); ?>
+			<fieldset class="uploadform">
+				<legend><?php echo JText::_('COM_###COMPONENT###_IMPORT_UPDATE_DATA'); ?></legend>
+				<div class="control-group">
+					<label for="import_url" class="control-label"><?php echo JText::_('COM_###COMPONENT###_IMPORT_SELECT_FILE_URL'); ?></label>
+					<div class="controls">
+						<input type="text" id="import_url" name="import_url" class="span5 input_box" size="70" value="http://" />
+					</div>
+				</div>
+				<div class="form-actions">
+					<input type="button" class="btn btn-primary" value="<?php echo JText::_('COM_###COMPONENT###_IMPORT_GET_BOTTON'); ?>" onclick="Joomla.submitbutton4()" />&nbsp;&nbsp;&nbsp;<small><?php echo JText::_('COM_###COMPONENT###_IMPORT_FORMATS_ACCEPTED'); ?> (.csv .xls .ods)</small>
+				</div>
+			</fieldset>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 		<input type="hidden" name="gettype" value="upload" />
-    <?php endif; ?>
-    <input type="hidden" name="task" value="import.import" />
-    <?php echo JHtml::_('form.token'); ?>
+	<?php endif; ?>
+	<input type="hidden" name="task" value="import.import" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
-</div>
+</div>
--- a/admin/compiler/joomla_3/default_main.php
+++ b/admin/compiler/joomla_3/default_main.php
@ -30,16 +30,18 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');

 ?>
-<?php if(is_array($this->icons['main'])) :?>
+<?php if(isset($this->icons['main']) && is_array($this->icons['main'])) :?>
 	<?php foreach($this->icons['main'] as $icon): ?>
-        <div class="dashboard-wraper">
-           <div class="dashboard-content"> 
-                <a class="icon" href="<?php echo $icon->url; ?>">
-                    <img alt="<?php echo $icon->alt; ?>" src="components/com_###component###/assets/images/icons/<?php  echo $icon->image; ?>">
-                    <span class="dashboard-title"><?php echo JText::_($icon->name); ?></span>
-                </a>
-            </div>
-        </div>
-    <?php endforeach; ?>
-<div class="clearfix"></div>
+		<div class="dashboard-wraper">
+			<div class="dashboard-content"> 
+				<a class="icon" href="<?php echo $icon->url; ?>">
+					<img alt="<?php echo $icon->alt; ?>" src="components/com_###component###/assets/images/icons/<?php  echo $icon->image; ?>">
+					<span class="dashboard-title"><?php echo JText::_($icon->name); ?></span>
+				</a>
+			 </div>
+		</div>
+	<?php endforeach; ?>
+	<div class="clearfix"></div>
+<?php else: ?>
+	<div class="alert alert-error"><h4 class="alert-heading"><?php echo JText::_("Permission denied, or not correctly set"); ?></h4><div class="alert-message"><?php echo JText::_("Please notify your System Administrator if result is unexpected."); ?></div></div>
 <?php endif; ?>
--- a/admin/compiler/joomla_3/edit.php
+++ b/admin/compiler/joomla_3/edit.php
@ -36,7 +36,8 @@ JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 $componentParams = JComponentHelper::getParams('com_###component###');
 ?>
-
+###EDITBODYFADEIN###
 <form action="<?php echo JRoute::_('index.php?option=com_###component###&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 ###EDITBODY###
-</form>###EDITBODYSCRIPT###
+</form>
+</div>###EDITBODYSCRIPT###
--- a/admin/compiler/joomla_3/install.mysql.utf8.sql
+++ b/admin/compiler/joomla_3/install.mysql.utf8.sql
@ -1 +1,6 @@
-###INSTALL###
+###INSTALL###
+
+--
+-- Always insure this column is large enough for all the access control values.
+--
+ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.';
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
--- a/admin/controller.php
+++ b/admin/controller.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
--- a/admin/controllers/admin_view.php
+++ b/admin/controllers/admin_view.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php
--- a/admin/controllers/admin_views.php
+++ b/admin/controllers/admin_views.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
--- a/admin/controllers/component.php
+++ b/admin/controllers/component.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
--- a/admin/controllers/components.php
+++ b/admin/controllers/components.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php
--- a/admin/controllers/custom_admin_view.php
+++ b/admin/controllers/custom_admin_view.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php
--- a/admin/controllers/custom_admin_views.php
+++ b/admin/controllers/custom_admin_views.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php
--- a/admin/controllers/dynamic_get.php
+++ b/admin/controllers/dynamic_get.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php
--- a/admin/controllers/dynamic_gets.php
+++ b/admin/controllers/dynamic_gets.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php
--- a/admin/controllers/field.php
+++ b/admin/controllers/field.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php
--- a/admin/controllers/fields.php
+++ b/admin/controllers/fields.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php
--- a/admin/controllers/fieldtype.php
+++ b/admin/controllers/fieldtype.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php
--- a/admin/controllers/fieldtypes.php
+++ b/admin/controllers/fieldtypes.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
--- a/admin/controllers/layout.php
+++ b/admin/controllers/layout.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php
--- a/admin/controllers/layouts.php
+++ b/admin/controllers/layouts.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php
--- a/admin/controllers/site_view.php
+++ b/admin/controllers/site_view.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php
--- a/admin/controllers/site_views.php
+++ b/admin/controllers/site_views.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php
--- a/admin/controllers/snippet.php
+++ b/admin/controllers/snippet.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php
--- a/admin/controllers/snippets.php
+++ b/admin/controllers/snippets.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
--- a/admin/controllers/template.php
+++ b/admin/controllers/template.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php
--- a/admin/controllers/templates.php
+++ b/admin/controllers/templates.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php
--- a/admin/custom/PHPExcel/Reader/ChunkReadFilter.php
+++ b/admin/custom/PHPExcel/Reader/ChunkReadFilter.php
@ -0,0 +1,49 @@
+<?php
+
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@author			Llewellyn 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
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+	/**
+	 * @ignore
+	 */
+	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+class PHPExcel_Reader_chunkReadFilter implements PHPExcel_Reader_IReadFilter
+{
+	private $_startRow	= 0;
+	private $_endRow	= 0;
+
+	/**  Set the list of rows that we want to read  */
+	public function setRows($startRow, $chunkSize)
+	{
+		$this->_startRow	= $startRow;
+		$this->_endRow		= $startRow + $chunkSize;
+	}
+
+	public function readCell($column, $row, $worksheetName = '')
+	{
+		//  Only read the heading row, and the rows that are configured in $this->_startRow and $this->_endRow
+		if (($row == 1) || ($row >= $this->_startRow && $row < $this->_endRow)) {
+			return true;
+		}
+		return false;
+	}
+}
--- a/admin/helpers/PHPExcel/Reader/ChunkReadFilter.php
+++ b/admin/helpers/PHPExcel/Reader/ChunkReadFilter.php
@ -0,0 +1,49 @@
+<?php
+
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@author			Llewellyn 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
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/** PHPExcel root directory */
+if (!defined('PHPEXCEL_ROOT')) {
+	/**
+	 * @ignore
+	 */
+	define('PHPEXCEL_ROOT', dirname(__FILE__) . '/../../');
+	require(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
+}
+
+class PHPExcel_Reader_chunkReadFilter implements PHPExcel_Reader_IReadFilter
+{
+	private $_startRow	= 0;
+	private $_endRow	= 0;
+
+	/**  Set the list of rows that we want to read  */
+	public function setRows($startRow, $chunkSize)
+	{
+		$this->_startRow	= $startRow;
+		$this->_endRow		= $startRow + $chunkSize;
+	}
+
+	public function readCell($column, $row, $worksheetName = '')
+	{
+		//  Only read the heading row, and the rows that are configured in $this->_startRow and $this->_endRow
+		if (($row == 1) || ($row >= $this->_startRow && $row < $this->_endRow)) {
+			return true;
+		}
+		return false;
+	}
+}
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@ -976,6 +976,15 @@ class Get
 									$view->conditions[$nr]['match_name']	= ComponentbuilderHelper::safeString($name);
 									$view->conditions[$nr]['match_type']	= ComponentbuilderHelper::safeString($type);
 									$view->conditions[$nr]['match_xml']		= $fieldValue['settings']->xml;
+									// if custom field load field being extended
+									if (!ComponentbuilderHelper::typeField($type))
+									{
+										$view->conditions[$nr]['match_extends'] = ComponentbuilderHelper::getBetween($fieldValue['settings']->xml,'extends="','"');
+									}
+									else
+									{
+										$view->conditions[$nr]['match_extends'] = '';
+									}
 									break;
 								}
 							}
@ -1065,12 +1074,20 @@ class Get
 			// add_css_view
 			if ($view->add_css_view == 1)
 			{
+				if (!isset($this->customScriptBuilder['css_view'][$name_single]))
+				{
+					$this->customScriptBuilder['css_view'][$name_single] = '';
+				}
 				$this->customScriptBuilder['css_view'][$name_single] .= base64_decode($view->css_view);
 				unset($view->css_view);
 			}
 			// add_css_views
 			if ($view->add_css_views == 1)
 			{
+				if (!isset($this->customScriptBuilder['css_views'][$name_single]))
+				{
+					$this->customScriptBuilder['css_views'][$name_single] = '';
+				}
 				$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($view->css_views);
 				unset($view->css_views);
 			}
@ -1089,7 +1106,7 @@ class Get
 			// set custom import scripts
 			if (isset($view->add_custom_import) && $view->add_custom_import == 1)
 			{
-				$addImportArray = array('php_import_setdata','php_import_save','html_import_view');
+				$addImportArray = array('php_import_display','php_import','php_import_setdata','php_import_save','html_import_view');
 				foreach ($addImportArray as $importScripter)
 				{
 					if (isset($view->$importScripter) && strlen($view->$importScripter) > 0)
@ -1101,7 +1118,7 @@ class Get
 			}
 			
 			// add_Ajax for this view
-			if ($view->add_php_ajax == 1)
+			if (isset($view->add_php_ajax) && $view->add_php_ajax == 1)
 			{
 				$addAjaxSite = false;
 				if (isset($this->siteEditView[$id]) && $this->siteEditView[$id])
@ -1128,16 +1145,20 @@ class Get
 							$this->customScriptBuilder['admin']['ajax_controller'][$name_single][$nr][$option] = $value;
 						}
 					}
+					$this->addAjax = true;
+					unset($view->ajax_input);
+				}
+				if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
+				{
 					if ($addAjaxSite)
 					{
 						$this->customScriptBuilder['site']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
 					}
 					$this->customScriptBuilder['admin']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
+					// unset anyway
+					unset($view->php_ajaxmethod);
 					$this->addAjax = true;
-					unset($view->ajax_input);
 				}
-				// unset anyway
-				unset($view->php_ajaxmethod);
 			}
 			// add_sql
 			if ($view->add_sql == 1)
@ -1303,10 +1324,15 @@ class Get
 						$this->customScriptBuilder[$this->target]['ajax_controller'][$view->code][$nr][$option] = $value;
 					}
 				}
-				$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
 				$this->addSiteAjax = true;
 				unset($view->ajax_input);
 			}
+			if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
+			{
+				
+				$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
+				$this->addSiteAjax = true;
+			}
 			// unset anyway
 			unset($view->php_ajaxmethod);
 		}
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@ -306,6 +306,34 @@ class Fields extends Structure
 	 * @var    array
 	 */
 	public $setGroupControl = array();
+	
+	/**
+	 * Set Field Names
+	 * 
+	 * @var    array
+	 */
+	public $fieldsNames = array();
+	
+	/**
+	 * Default Fields
+	 * 
+	 * @var    array
+	 */
+	public $defaultFields = array('created', 'created_by', 'modified', 'modified_by', 'published', 'ordering', 'access', 'version', 'hits', 'id');
+	
+	/**
+	 * Default Fields set to publishing
+	 * 
+	 * @var    array
+	 */
+	public $newPublishingFields = array();
+	
+	/**
+	 * Default Fields set to publishing
+	 * 
+	 * @var    array
+	 */
+	public $movedPublishingFields = array();

 	/**
 	 * set the Field set of a view
@ -338,7 +366,7 @@ class Fields extends Structure
 			$readOnly = "";
 			if ($view['settings']->type == 2)
 			{
-				$readOnly = "\n\t\t\t" . 'readonly="true"' . "\n\t\t\t" . 'disabled="true"';
+				$readOnly = "\t\t\t" . 'readonly="true"' . "\n\t\t\t" . 'disabled="true"';
 			}
 			// main lang prefix
 			$langView = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'U');
@ -370,129 +398,22 @@ class Fields extends Structure
 			$this->langContent[$this->lang][$langViews . '_BATCH_TIP'] = "All changes will be applied to all selected " . $view['settings']->name_list;
 			// set some basic defaults
 			$this->langContent[$this->lang][$langView . '_ERROR_UNIQUE_ALIAS'] = "Another " . $view['settings']->name_single . " has the same alias.";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_LABEL'] = "Created date";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_DESC'] = "The date " . $view['settings']->name_single . " was created.";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created by";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created the " . $view['settings']->name_single . ".";
+			$this->langContent[$this->lang][$langView . '_CREATED_DATE_LABEL'] = "Created Date";
+			$this->langContent[$this->lang][$langView . '_CREATED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was created.";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_LABEL'] = "Modified Date";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was modified.";
+			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created By";
+			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created this " . $view['settings']->name_single . ".";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_LABEL'] = "Modified By";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_DESC'] = "The last user that modified this " . $view['settings']->name_single . ".";
 			$this->langContent[$this->lang][$langView . '_ORDERING_LABEL'] = "Ordering";
 			$this->langContent[$this->lang][$langView . '_VERSION_LABEL'] = "Revision";
 			$this->langContent[$this->lang][$langView . '_VERSION_DESC'] = "A count of the number of times this " . $view['settings']->name_single . " has been revised.";
 			$this->langContent[$this->lang][$langView . '_SAVE_WARNING'] = "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.";
-			// set the defautl fields
-			$fieldSet = '<fieldset name="details">';
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Default Fields. -->";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Id Field. Type: Text (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"id"';
-			$fieldSet .= "\n\t\t\t" . 'type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"created"';
-			$fieldSet .= "\n\t\t\ttype=" . '"calendar"';
-			$fieldSet .= "\n\t\t\tlabel=" . '"' . $langView . '_CREATED_DATE_LABEL"';
-			$fieldSet .= "\n\t\t\tdescription=" . '"' . $langView . '_CREATED_DATE_DESC"';
-			$fieldSet .= "\n\t\t\tsize=" . '"22"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tformat=" . '"%Y-%m-%d %H:%M:%S"';
-			$fieldSet .= "\n\t\t\tfilter=" . '"user_utc"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " User Created Field. Type: User (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"created_by"';
-			$fieldSet .= "\n\t\t\ttype=" . '"user"';
-			$fieldSet .= "\n\t\t\tlabel=" . '"' . $langView . '_CREATED_BY_LABEL"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tdescription=" . '"' . $langView . '_CREATED_BY_DESC"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Published Field. Type: List (joomla) -->";
-			$fieldSet .= "\n\t\t<field name=" . '"published" type="list" label="JSTATUS"';
-			$fieldSet .= "\n\t\t\tdescription=" . '"JFIELD_PUBLISHED_DESC" class="chzn-color-state"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tfilter=" . '"intval" size="1" default="1" >';
-
-			$fieldSet .= "\n\t\t\t<option value=" . '"1">';
-			$fieldSet .= "\n\t\t\t\tJPUBLISHED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"0">';
-			$fieldSet .= "\n\t\t\t\tJUNPUBLISHED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"2">';
-			$fieldSet .= "\n\t\t\t\tJARCHIVED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"-2">';
-			$fieldSet .= "\n\t\t\t\tJTRASHED</option>";
-			$fieldSet .= "\n\t\t</field>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla) -->";
-			$fieldSet .= "\n\t\t" . '<field name="modified" type="calendar" class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"';
-			$fieldSet .= "\n\t\t\t" . 'size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />';
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla) -->";
-			$fieldSet .= "\n\t\t" . '<field name="modified_by" type="user"';
-			$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t\t" . 'filter="unset"';
-			$fieldSet .= "\n\t\t/>";
-			// check if view has access
-			if (isset($this->accessBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName]))
-			{
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla) -->";
-				$fieldSet .= "\n\t\t" . '<field name="access"';
-				$fieldSet .= "\n\t\t\t" . 'type="accesslevel"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_ACCESS_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_ACCESS_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'default="1"';
-				$fieldSet .= $readOnly;
-				$fieldSet .= "\n\t\t\t" . 'required="false"';
-				$fieldSet .= "\n\t\t/>";
-			}
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\t" . 'name="ordering"';
-			$fieldSet .= "\n\t\t\t" . 'type="number"';
-			$fieldSet .= "\n\t\t\t" . 'class="inputbox validate-ordering"';
-			$fieldSet .= "\n\t\t\t" . 'label="' . $langView . '_ORDERING_LABEL' . '"';
-			$fieldSet .= "\n\t\t\t" . 'description=""';
-			$fieldSet .= "\n\t\t\t" . 'default="0"';
-			$fieldSet .= "\n\t\t\t" . 'size="6"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\t" . 'required="false"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Version Field. Type: Text (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\t" . 'name="version"';
-			$fieldSet .= "\n\t\t\t" . 'type="text"';
-			$fieldSet .= "\n\t\t\t" . 'class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'label="' . $langView . '_VERSION_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'description="' . $langView . '_VERSION_DESC"';
-			$fieldSet .= "\n\t\t\t" . 'size="6"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t\t" . 'filter="unset"';
-			$fieldSet .= "\n\t\t/>";
-			// check if metadata is added to this view
-			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
-			{
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t<field";
-				$fieldSet .= "\n\t\t\t" . 'name="metakey"';
-				$fieldSet .= "\n\t\t\t" . 'type="textarea"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_META_KEYWORDS_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_META_KEYWORDS_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'rows="3"';
-				$fieldSet .= "\n\t\t\t" . 'cols="30"';
-				$fieldSet .= "\n\t\t/>";
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t<field";
-				$fieldSet .= "\n\t\t\t" . 'name="metadesc"';
-				$fieldSet .= "\n\t\t\t" . 'type="textarea"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_META_DESCRIPTION_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_META_DESCRIPTION_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'rows="3"';
-				$fieldSet .= "\n\t\t\t" . 'cols="30"';
-				$fieldSet .= "\n\t\t/>";
-			}
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Dynamic Fields. -->";
+			
 			// start adding dynamc fields
+			$dynamcfields = '';
+			// place holders
 			$placeholders = array(
 			    '###component###' => $component,
 			    '###view###' => $viewName,
@ -503,47 +424,217 @@ class Fields extends Structure
 			// TODO we should add the global and local view switch if field for front end
 			foreach ($view['settings']->fields as $field)
 			{
-				$fieldSet .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, true);
+				$dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, true);
+			}
+			
+			// set the defautl fields
+			$fieldSet = array();
+			$fieldSet[] = '<fieldset name="details">';
+			$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Default Fields. -->";
+			$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Id Field. Type: Text (joomla) -->";
+			// if id is not set
+			if (!isset($this->fieldsNames[$viewName]['id']))
+			{
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"id"';
+				$fieldSet[] = "\t\t\t" . 'type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if created is not set
+			if (!isset($this->fieldsNames[$viewName]['created']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"created"';
+				$fieldSet[] = "\t\t\ttype=" . '"calendar"';
+				$fieldSet[] = "\t\t\tlabel=" . '"' . $langView . '_CREATED_DATE_LABEL"';
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_CREATED_DATE_DESC"';
+				$fieldSet[] = "\t\t\tsize=" . '"22"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tformat=" . '"%Y-%m-%d %H:%M:%S"';
+				$fieldSet[] = "\t\t\tfilter=" . '"user_utc"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if created_by is not set
+			if (!isset($this->fieldsNames[$viewName]['created_by']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " User Created Field. Type: User (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"created_by"';
+				$fieldSet[] = "\t\t\ttype=" . '"user"';
+				$fieldSet[] = "\t\t\tlabel=" . '"' . $langView . '_CREATED_BY_LABEL"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_CREATED_BY_DESC"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if published is not set
+			if (!isset($this->fieldsNames[$viewName]['published']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Published Field. Type: List (joomla) -->";
+				$fieldSet[] = "\t\t<field name=" . '"published" type="list" label="JSTATUS"';
+				$fieldSet[] = "\t\t\tdescription=" . '"JFIELD_PUBLISHED_DESC" class="chzn-color-state"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tfilter=" . '"intval" size="1" default="1" >';
+				$fieldSet[] = "\t\t\t<option value=" . '"1">';
+				$fieldSet[] = "\t\t\t\tJPUBLISHED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"0">';
+				$fieldSet[] = "\t\t\t\tJUNPUBLISHED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"2">';
+				$fieldSet[] = "\t\t\t\tJARCHIVED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"-2">';
+				$fieldSet[] = "\t\t\t\tJTRASHED</option>";
+				$fieldSet[] = "\t\t</field>";
+			}
+			// if modified is not set
+			if (!isset($this->fieldsNames[$viewName]['modified']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="modified" type="calendar" class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_MODIFIED_DATE_LABEL" description="' . $langView . '_MODIFIED_DATE_DESC"';
+				$fieldSet[] = "\t\t\t" . 'size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />';
+			}
+			// if modified_by is not set
+			if (!isset($this->fieldsNames[$viewName]['modified_by']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="modified_by" type="user"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_MODIFIED_BY_LABEL"';
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_MODIFIED_BY_DESC"';
+				$fieldSet[] = "\t\t\t" . 'class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t\t" . 'filter="unset"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// check if view has access
+			if (isset($this->accessBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName]) && !isset($this->fieldsNames[$viewName]['access']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="access"';
+				$fieldSet[] = "\t\t\t" . 'type="accesslevel"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_ACCESS_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_ACCESS_DESC"';
+				$fieldSet[] = "\t\t\t" . 'default="1"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\t" . 'required="false"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if ordering is not set
+			if (!isset($this->fieldsNames[$viewName]['ordering']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="ordering"';
+				$fieldSet[] = "\t\t\t" . 'type="number"';
+				$fieldSet[] = "\t\t\t" . 'class="inputbox validate-ordering"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_ORDERING_LABEL' . '"';
+				$fieldSet[] = "\t\t\t" . 'description=""';
+				$fieldSet[] = "\t\t\t" . 'default="0"';
+				$fieldSet[] = "\t\t\t" . 'size="6"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\t" . 'required="false"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if version is not set
+			if (!isset($this->fieldsNames[$viewName]['version']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Version Field. Type: Text (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="version"';
+				$fieldSet[] = "\t\t\t" . 'type="text"';
+				$fieldSet[] = "\t\t\t" . 'class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_VERSION_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="' . $langView . '_VERSION_DESC"';
+				$fieldSet[] = "\t\t\t" . 'size="6"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t\t" . 'filter="unset"';
+				$fieldSet[] = "\t\t/>";
 			}
-
-			$fieldSet .= "\n\t</fieldset>";
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
 			{
-				$fieldSet .= "\n\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
-				$fieldSet .= "\n\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
-				$fieldSet .= "\n\t\t" . '<fieldset name="vdmmetadata"';
-				$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="robots"';
-				$fieldSet .= "\n\t\t\t\t" . 'type="list"';
-				$fieldSet .= "\n\t\t\t\t" . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
-				$fieldSet .= "\n\t\t\t\t" . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="">JGLOBAL_USE_GLOBAL</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
-				$fieldSet .= "\n\t\t\t" . '</field>';
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="author"';
-				$fieldSet .= "\n\t\t\t\t" . 'type="text"';
-				$fieldSet .= "\n\t\t\t\t" . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
-				$fieldSet .= "\n\t\t\t\t" . 'size="20"';
-				$fieldSet .= "\n\t\t\t/>";
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
-				$fieldSet .= "\n\t\t\t\t" . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
-				$fieldSet .= "\n\t\t\t\t" . 'cols="30" rows="2"';
-				$fieldSet .= "\n\t\t\t/>";
-				$fieldSet .= "\n\t\t</fieldset>";
-				$fieldSet .= "\n\t</fields>";
+				// metakey
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="metakey"';
+				$fieldSet[] = "\t\t\t" . 'type="textarea"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_META_KEYWORDS_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_META_KEYWORDS_DESC"';
+				$fieldSet[] = "\t\t\t" . 'rows="3"';
+				$fieldSet[] = "\t\t\t" . 'cols="30"';
+				$fieldSet[] = "\t\t/>";
+				// metadesc
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="metadesc"';
+				$fieldSet[] = "\t\t\t" . 'type="textarea"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_META_DESCRIPTION_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_META_DESCRIPTION_DESC"';
+				$fieldSet[] = "\t\t\t" . 'rows="3"';
+				$fieldSet[] = "\t\t\t" . 'cols="30"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// load the dynamic fields now
+			if (ComponentbuilderHelper::checkString($dynamcfields))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Dynamic Fields. -->" . $dynamcfields;
+			}
+			// close fieldset
+			$fieldSet[] = "\t</fieldset>";
+			// check if metadata is added to this view
+			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
+			{
+				$fieldSet[] = "\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
+				$fieldSet[] = "\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				$fieldSet[] = "\t\t" . '<fieldset name="vdmmetadata"';
+				$fieldSet[] = "\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				// robots
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="robots"';
+				$fieldSet[] = "\t\t\t\t" . 'type="list"';
+				$fieldSet[] = "\t\t\t\t" . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
+				$fieldSet[] = "\t\t\t\t" . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
+				$fieldSet[] = "\t\t\t\t" . '<option value="">JGLOBAL_USE_GLOBAL</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t" . '</field>';
+				// author
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="author"';
+				$fieldSet[] = "\t\t\t\t" . 'type="text"';
+				$fieldSet[] = "\t\t\t\t" . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
+				$fieldSet[] = "\t\t\t\t" . 'size="20"';
+				$fieldSet[] = "\t\t\t/>";
+				// rights
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
+				$fieldSet[] = "\t\t\t\t" . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
+				$fieldSet[] = "\t\t\t\t" . 'cols="30" rows="2"';
+				$fieldSet[] = "\t\t\t/>";
+				$fieldSet[] = "\t\t</fieldset>";
+				$fieldSet[] = "\t</fields>";
 			}
 			// retunr the set
-			return $fieldSet;
+			return implode("\n", $fieldSet);
 		}
 		return '';
 	}
+		
+	/**
+	 * set Field Names
+	 * 
+	 * @param   string   $view    View the field belongs to
+	 * @param   string    $name    The name of the field
+	 *
+	 * 
+	 */
+	public function setFieldsNames(&$view, &$name)
+	{
+		$this->fieldsNames[$view][$name] = $name;
+	}

 	/**
 	 * set Dynamic field
@ -575,6 +666,9 @@ class Fields extends Structure
 		// check if values were set
 		if (ComponentbuilderHelper::checkArray($fieldAttributes))
 		{
+			// set the array of field names
+			$this->setFieldsNames($viewName,$fieldAttributes['name']);
+			
 			if ($this->defaultField($typeName, 'option'))
 			{
 				//reset options array
@ -607,6 +701,11 @@ class Fields extends Structure
 					{
 						$tabName = $view['settings']->tabs[(int) $field['tab']];
 					}
+					elseif ((int) $field['tab'] == 15)
+					{
+						// set to publishing tab
+						$tabName = 'publishing';
+					}
 					$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 				}
 				// now add to the field set
@ -908,7 +1007,7 @@ class Fields extends Structure
 	 */
 	public function setLayoutBuilder(&$viewName,&$tabName,&$name,&$field)
 	{
-		if (ComponentbuilderHelper::checkString($tabName))
+		if (ComponentbuilderHelper::checkString($tabName) && $tabName != 'publishing')
 		{
 			$this->tabCounter[$viewName][(int) $field['tab']] = $tabName;
 			if (isset($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']]))
@ -920,6 +1019,27 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
+			// check if publishing fields were over written
+			if (in_array($name, $this->defaultFields))
+			{
+				// just to eliminate
+				$this->movedPublishingFields[$viewName][$name] = $name;
+			}
+		}
+		elseif ($tabName == 'publishing')
+		{
+			if (!in_array($name, $this->defaultFields))
+			{
+				if (isset($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]))
+				{
+					$size = count($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]) + 1;
+					$this->newPublishingFields[$viewName][(int) $field['alignment']][$size] = $name;
+				}
+				else
+				{
+					$this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
+				}
+			}
 		}
 		else
 		{
@ -933,6 +1053,12 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
+			// check if publishing fields were over written
+			if (in_array($name, $this->defaultFields))
+			{
+				// just to eliminate
+				$this->movedPublishingFields[$viewName][$name] = $name;
+			}
 		}
 	}

@ -1340,6 +1466,7 @@ class Fields extends Structure
 			$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);
@ -1413,6 +1540,7 @@ class Fields extends Structure
 			    'link' => ($field['link']) ? true : false,
 			    'sort' => ($field['sort']) ? true : false,
 			    'custom' => $custom,
+			    'multiple' => $multiple,
 			    'options' => $options);

 			$this->customBuilderList[$listViewName][] = $name;
@ -1436,7 +1564,7 @@ class Fields extends Structure
 			$this->intFieldsBuilder[$viewName] .= ',"' . $name . '"';
 		}
 		// set all dynamic field of this view
-		if ($typeName != 'category' && $typeName != 'repeatable')
+		if ($typeName != 'category' && $typeName != 'repeatable' && !in_array($name, $this->defaultFields))
 		{
 			if (!isset($this->dynamicfieldsBuilder[$viewName]))
 			{
@ -1498,7 +1626,7 @@ class Fields extends Structure
 			$this->catCodeBuilder[$viewName] = array('code' => $name, 'views' => $otherViews, 'view' => $otherView);
 		}
 		// setup checkbox for this view
-		if ($typeName == 'checkbox')
+		if ($typeName == 'checkbox' || (ComponentbuilderHelper::checkArray($custom) && isset($custom['extends']) && $custom['extends'] == 'checkboxes'))
 		{
 			$this->checkboxBuilder[$viewName][] = $name;
 		}
@ -1592,6 +1720,11 @@ class Fields extends Structure
 		{
 			$tabName = $view['settings']->tabs[(int) $field['tab']];
 		}
+		elseif ((int) $field['tab'] == 15)
+		{
+			// set to publishing tab
+			$tabName = 'publishing';
+		}
 		$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 	}
 	
@ -1709,7 +1842,7 @@ class Fields extends Structure
 			// ###type### <<<DYNAMIC>>>
 			$this->fileContentDynamic['customfield_'.$data['type']]['###type###'] = $data['custom']['type'];
 			// ###type### <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_'.$data['type']]['###ADD_BUTTON###'] = $this->setAddButttonToListField($data['custom']['view']);
+			$this->fileContentDynamic['customfield_'.$data['type']]['###ADD_BUTTON###'] = $this->setAddButttonToListField($data['custom']['view'],$data['custom']['views']);
 		}
 	}

--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -854,18 +854,27 @@ class Interpretation extends Fields
 			$exel[] = "\t*/";
 			$exel[] = "\tpublic static function getFileHeaders(\$dataType)";
 			$exel[] = "\t{\t\t";
-			$exel[] = "\t\t//".$this->setLine(__LINE__)." make sure the file is loaded\t\t";
+			$exel[] = "\t\t//".$this->setLine(__LINE__)." make sure these files are loaded\t\t";
 			$exel[] = "\t\tJLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');";
+			$exel[] = "\t\tJLoader::import('ChunkReadFilter', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/PHPExcel/Reader');";
 			$exel[] = "\t\t//".$this->setLine(__LINE__)." get session object";
-			$exel[] = "\t\t\$session \t= JFactory::getSession();";
+			$exel[] = "\t\t\$session\t= JFactory::getSession();";
 			$exel[] = "\t\t\$package\t= \$session->get('package', null);";
 			$exel[] = "\t\t\$package\t= json_decode(\$package, true);";
 			$exel[] = "\t\t//".$this->setLine(__LINE__)." set the headers";
 			$exel[] = "\t\tif(isset(\$package['dir']))";
 			$exel[] = "\t\t{";
+			$exel[] = "\t\t\t\$chunkFilter = new PHPExcel_Reader_chunkReadFilter();";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." only load first three rows";
+			$exel[] = "\t\t\t\$chunkFilter->setRows(2,1);";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." identify the file type";
 			$exel[] = "\t\t\t\$inputFileType = PHPExcel_IOFactory::identify(\$package['dir']);";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." create the reader for this file type";
 			$exel[] = "\t\t\t\$excelReader = PHPExcel_IOFactory::createReader(\$inputFileType);";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." load the limiting filter";
+			$exel[] = "\t\t\t\$excelReader->setReadFilter(\$chunkFilter);";
 			$exel[] = "\t\t\t\$excelReader->setReadDataOnly(true);";
+			$exel[] = "\t\t\t//".$this->setLine(__LINE__)." load the rows (only first three)";
 			$exel[] = "\t\t\t\$excelObj = \$excelReader->load(\$package['dir']);";
 			$exel[] = "\t\t\t\$headers = array();";
 			$exel[] = "\t\t\tforeach (\$excelObj->getActiveSheet()->getRowIterator() as \$row)";
@ -4379,7 +4388,7 @@ class Interpretation extends Fields
 		{
 			$batchcopy[] = "\n\t\t\tlist(\$this->table->".$title.", \$this->table->".$alias.") = \$this->_generateNewTitle(\$this->table->".$alias.", \$this->table->".$title.");";
 		}
-		elseif (!$category && !$alias && $title && $title != 'user')
+		elseif (!$category && !$alias && $title && $title != 'user' && $title != 'jobnumber') // TODO [jobnumber] just for one project (not ideal)
 		{
 			$batchcopy[] = "\n\t\t\t\$this->table->".$title." = \$this->generateUniqe('".$title."',\$this->table->".$title.");";
 		}
@ -4618,7 +4627,11 @@ class Interpretation extends Fields

 				// setup the tables
 				$db .= "CREATE TABLE IF NOT EXISTS `#__".$component."_".$view."` (";
-				$db .= "\n\t`id` int(11) NOT NULL AUTO_INCREMENT,";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['id']))
+				{
+					$db .= "\n\t`id` int(11) NOT NULL AUTO_INCREMENT,";
+				}
 				$db .= "\n\t`asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0',";
 				ksort($fields);
 				foreach ($fields as $field => $data)
@ -4647,29 +4660,77 @@ class Interpretation extends Fields
 					}
 					// set the lenght
 					$lenght = '';
-					if (isset($data['lenght']) && $data['lenght'] > 0)
+					if ($data['lenght'] == 'Other' && isset($data['lenght_other']) && $data['lenght_other'] > 0)
+					{
+						$lenght = '('.$data['lenght_other'].')';
+					}
+					elseif (isset($data['lenght']) && $data['lenght'] > 0)
 					{
 						$lenght = '('.$data['lenght'].')';
 					}
 					// set the field to db
 					$db .= "\n\t`".$field."` ".$data['type'].$lenght." ".$default.",";
 				}
-				$db .= "\n\t`params` TEXT NOT NULL DEFAULT '',";
-				$db .= "\n\t`published` tinyint(1) NOT NULL DEFAULT '1',";
-				$db .= "\n\t`created_by` int(11) NOT NULL DEFAULT '0',";
-				$db .= "\n\t`modified_by` int(11) NOT NULL DEFAULT '0',";
-				$db .= "\n\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
-				$db .= "\n\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
-				$db .= "\n\t`checked_out` int(11) NOT NULL,";
-				$db .= "\n\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
-				$db .= "\n\t`version` int(11) NOT NULL DEFAULT '1',";
-				$db .= "\n\t`hits` int(11) NOT NULL DEFAULT '0',";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['params']))
+				{
+					$db .= "\n\t`params` TEXT NOT NULL DEFAULT '',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['published']))
+				{
+					$db .= "\n\t`published` tinyint(1) NOT NULL DEFAULT '1',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created_by']))
+				{
+					$db .= "\n\t`created_by` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified_by']))
+				{
+					$db .= "\n\t`modified_by` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created']))
+				{
+					$db .= "\n\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified']))
+				{
+					$db .= "\n\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out']))
+				{
+					$db .= "\n\t`checked_out` int(11) NOT NULL,";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out_time']))
+				{
+					$db .= "\n\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['version']))
+				{
+					$db .= "\n\t`version` int(11) NOT NULL DEFAULT '1',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['hits']))
+				{
+					$db .= "\n\t`hits` int(11) NOT NULL DEFAULT '0',";
+				}
 				// check if view has access
 				if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view]))
 				{
 					$db .= "\n\t`access` int(11) DEFAULT NULL,";
 				}
-				$db .= "\n\t`ordering` int(11) NOT NULL DEFAULT '0',";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['ordering']))
+				{
+					$db .= "\n\t`ordering` int(11) NOT NULL DEFAULT '0',";
+				}
 				// check if metadata is added to this view
 				if (isset($this->metadataBuilder[$view]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view]))
 				{
@ -4690,10 +4751,26 @@ class Interpretation extends Fields
 				{
 					$db .= ",\n\tKEY `idx_access` (`access`)";
 				}
-				$db .= ",\n\tKEY `idx_checkout` (`checked_out`)";
-				$db .= ",\n\tKEY `idx_createdby` (`created_by`)";
-				$db .= ",\n\tKEY `idx_modifiedby` (`modified_by`)";
-				$db .= ",\n\tKEY `idx_state` (`published`)";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out']))
+				{
+					$db .= ",\n\tKEY `idx_checkout` (`checked_out`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created_by']))
+				{
+					$db .= ",\n\tKEY `idx_createdby` (`created_by`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified_by']))
+				{
+					$db .= ",\n\tKEY `idx_modifiedby` (`modified_by`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['published']))
+				{
+					$db .= ",\n\tKEY `idx_state` (`published`)";
+				}
 				if (isset($this->dbKeys[$view]) && ComponentbuilderHelper::checkArray($this->dbKeys[$view]))
 				{
 					foreach ($this->dbKeys[$view] as $nr => $key)
@ -4753,6 +4830,8 @@ class Interpretation extends Fields
 		$this->langContent['admin'][$this->langPrefix.'_SAVE_WARNING']			= "The value already existed so please select another.";
 		$this->langContent['admin'][$this->langPrefix.'_HELP_MANAGER']			= "Help";
 		$this->langContent['admin'][$this->langPrefix.'_NEW']				= "New";
+		$this->langContent['admin'][$this->langPrefix.'_CREATE_NEW_S']			= "Create New %s";
+		$this->langContent['admin'][$this->langPrefix.'_EDIT_S']			= "Edit %s";
 		$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_STATE']           = "- Keep Original State -";
 		$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_ACCESS']          = "- Keep Original Access -";
 		$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_CATEGORY']        = "- Keep Original Category -";
@ -4845,6 +4924,9 @@ class Interpretation extends Fields
 		$this->langContent['site']['COM_CONTENT_FIELD_MODIFIED_DESC']	= "The last date this item was modified.";
 		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_BY_LABEL']	= "Modified By";
 		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_BY_DESC']	= "The user who did the last modification.";
+		$this->langContent['site'][$this->langPrefix.'_NEW']		= "New";
+		$this->langContent['site'][$this->langPrefix.'_CREATE_NEW_S']	= "Create New %s";
+		$this->langContent['site'][$this->langPrefix.'_EDIT_S']		= "Edit %s";

 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
@ -4993,37 +5075,41 @@ class Interpretation extends Fields
 			$body .= "\n\t\t\$canDo = ".$Helper."::getActions('".$viewName_single."',\$item,'".$viewName_list."');";
 			$body .= "\n\t?>";
 			$body .= "\n\t".'<tr class="row<?php echo $i % 2; ?>">';
-			$body .= "\n\t\t".'<td class="order nowrap center hidden-phone">';
-			// check if the item has permissions.
-			if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+			// only load if not over written
+			if (!isset($this->fieldsNames[$viewName_single]['ordering']))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')): ?>";
+				$body .= "\n\t\t".'<td class="order nowrap center hidden-phone">';
+				// check if the item has permissions.
+				if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')): ?>";
+				}
+				else
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')): ?>";
+				}
+				$body .= "\n\t\t\t<?php";
+				$body .= "\n\t\t\t\tif (\$this->saveOrder)";
+				$body .= "\n\t\t\t\t{";
+				$body .= "\n\t\t\t\t\t\$iconClass = ' inactive';";
+				$body .= "\n\t\t\t\t}";
+				$body .= "\n\t\t\t\telse";
+				$body .= "\n\t\t\t\t{";
+				$body .= "\n\t\t\t\t\t\$iconClass = ' inactive tip-top".'" hasTooltip" title="'."' . JHtml::tooltipText('JORDERINGDISABLED');";
+				$body .= "\n\t\t\t\t}";
+				$body .= "\n\t\t\t?>";
+				$body .= "\n\t\t\t".'<span class="sortable-handler<?php echo $iconClass; ?>">';
+				$body .= "\n\t\t\t\t".'<i class="icon-menu"></i>';
+				$body .= "\n\t\t\t</span>";
+				$body .= "\n\t\t\t<?php if (\$this->saveOrder) : ?>";
+				$body .= "\n\t\t\t\t".'<input type="text" style="display:none" name="order[]" size="5"';
+				$body .= "\n\t\t\t\t".'value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />';
+				$body .= "\n\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t<?php else: ?>";
+				$body .= "\n\t\t\t&#8942;";
+				$body .= "\n\t\t<?php endif; ?>";
+				$body .= "\n\t\t</td>";
 			}
-			else
-			{
-				$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')): ?>";
-			}
-			$body .= "\n\t\t\t<?php";
-			$body .= "\n\t\t\t\tif (\$this->saveOrder)";
-			$body .= "\n\t\t\t\t{";
-			$body .= "\n\t\t\t\t\t\$iconClass = ' inactive';";
-			$body .= "\n\t\t\t\t}";
-			$body .= "\n\t\t\t\telse";
-			$body .= "\n\t\t\t\t{";
-			$body .= "\n\t\t\t\t\t\$iconClass = ' inactive tip-top".'" hasTooltip" title="'."' . JHtml::tooltipText('JORDERINGDISABLED');";
-			$body .= "\n\t\t\t\t}";
-			$body .= "\n\t\t\t?>";
-			$body .= "\n\t\t\t".'<span class="sortable-handler<?php echo $iconClass; ?>">';
-			$body .= "\n\t\t\t\t".'<i class="icon-menu"></i>';
-			$body .= "\n\t\t\t</span>";
-			$body .= "\n\t\t\t<?php if (\$this->saveOrder) : ?>";
-			$body .= "\n\t\t\t\t".'<input type="text" style="display:none" name="order[]" size="5"';
-			$body .= "\n\t\t\t\t".'value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />';
-			$body .= "\n\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t<?php else: ?>";
-			$body .= "\n\t\t\t&#8942;";
-			$body .= "\n\t\t<?php endif; ?>";
-			$body .= "\n\t\t</td>";
 			$body .= "\n\t\t".'<td class="nowrap center">';
 			// check if the item has permissions.
 			if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit']]))
@ -5060,7 +5146,10 @@ class Interpretation extends Fields
 				if (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']))
 				{
 					$item['id'] = $item['code'];
-					$item['code'] = $item['code'].'_'.$item['custom']['text'];
+					if (!$item['multiple'])
+					{
+						$item['code'] = $item['code'].'_'.$item['custom']['text'];
+					}
 				}
 				// check if translated vlaue is used
 				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
@ -5107,12 +5196,12 @@ class Interpretation extends Fields
 					elseif ($item['type'] == 'user' && !$item['title'])
 					{
 						// user and linked
-						$body .= "\n\t\t<?php \$itemUser = JFactory::getUser(\$item->user); ?>";
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
 						$body .= "\n\t\t".'<td class="nowrap">';
 						$body .= "\n\t\t\t<?php if (\$this->user->authorise('core.edit', 'com_users')): ?>";
-						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->user ?>"><?php echo $itemUser->name; ?></a>';
+						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->'.$item['code'].' ?>"><?php echo $'.$item['code'].'User->name; ?></a>';
 						$body .= "\n\t\t\t<?php else: ?>";
-						$body .= "\n\t\t\t\t<?php echo \$itemUser->name; ?>";
+						$body .= "\n\t\t\t\t<?php echo \$".$item['code']."User->name; ?>";
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
@ -5232,6 +5321,14 @@ class Interpretation extends Fields
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
+					elseif ($item['type'] == 'user')
+					{
+						// user name only
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
+						$body .= "\n\t\t".'<td class="nowrap">';
+						$body .= "\n\t\t\t<?php echo \$".$item['code']."User->name; ?>";
+						$body .= "\n\t\t</td>";
+					}
 					else
 					{
 						// normal not linked
@ -5242,32 +5339,38 @@ class Interpretation extends Fields
 				}
 			}
 			// add the defaults
-			$body .= "\n\t\t".'<td class="center">';
-			// check if the item has permissions.
-			if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')) : ?>";
-			}
-			else
+				$body .= "\n\t\t".'<td class="center">';
+				// check if the item has permissions.
+				if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')) : ?>";
+				}
+				else
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')) : ?>";
+				}
+				$body .= "\n\t\t\t\t<?php if (\$item->checked_out) : ?>";
+				$body .= "\n\t\t\t\t\t<?php if (\$canCheckin) : ?>";
+				$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
+				$body .= "\n\t\t\t\t\t<?php else: ?>";
+				$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
+				$body .= "\n\t\t\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t\t\t<?php else: ?>";
+				$body .= "\n\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
+				$body .= "\n\t\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t<?php else: ?>";
+				$body .= "\n\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
+				$body .= "\n\t\t<?php endif; ?>";
+				$body .= "\n\t\t</td>";
+			}	
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')) : ?>";
+				$body .= "\n\t\t".'<td class="nowrap center hidden-phone">';
+				$body .= "\n\t\t\t<?php echo \$item->id; ?>";
+				$body .= "\n\t\t</td>";
 			}
-			$body .= "\n\t\t\t\t<?php if (\$item->checked_out) : ?>";
-			$body .= "\n\t\t\t\t\t<?php if (\$canCheckin) : ?>";
-			$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
-			$body .= "\n\t\t\t\t\t<?php else: ?>";
-			$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
-			$body .= "\n\t\t\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t\t\t<?php else: ?>";
-			$body .= "\n\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
-			$body .= "\n\t\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t<?php else: ?>";
-			$body .= "\n\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
-			$body .= "\n\t\t<?php endif; ?>";
-			$body .= "\n\t\t</td>";
-			$body .= "\n\t\t".'<td class="nowrap center hidden-phone">';
-			$body .= "\n\t\t\t<?php echo \$item->id; ?>";
-			$body .= "\n\t\t</td>";
 			$body .= "\n\t</tr>";
 			$body .= "\n<?php endforeach; ?>";
 			// return the build
@ -5299,9 +5402,12 @@ class Interpretation extends Fields
 			// set default
 			$head = '<tr>';
 			$head .= "\n\t<?php if (\$this->canEdit&& \$this->canState): ?>";
-			$head .= "\n\t\t".'<th width="1%" class="nowrap center hidden-phone">';
-			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".'<i class="icon-menu-2"></i>'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>";
-			$head .= "\n\t\t</th>";
+			if (!isset($this->fieldsNames[$viewName_single]['ordering']))
+			{
+				$head .= "\n\t\t".'<th width="1%" class="nowrap center hidden-phone">';
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".'<i class="icon-menu-2"></i>'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>";
+				$head .= "\n\t\t</th>";
+			}
 			$head .= "\n\t\t".'<th width="20" class="nowrap center">';
 			$head .= "\n\t\t\t<?php echo JHtml::_('grid.checkall'); ?>";
 			$head .= "\n\t\t</th>";
@ -5338,18 +5444,24 @@ class Interpretation extends Fields
 				$this->listColnrBuilder[$viewName_list]++;
 			}
 			// set default
-			$head .= "\n\t<?php if (\$this->canState): ?>";
- 			$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
-   			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$statusLangName."', 'published', \$this->listDirn, \$this->listOrder); ?>";
- 			$head .= "\n\t\t</th>";
-			$head .= "\n\t<?php else: ?>";
- 			$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
-   			$head .= "\n\t\t\t<?php echo JText::_('".$statusLangName."'); ?>";
- 			$head .= "\n\t\t</th>";
-			$head .= "\n\t<?php endif; ?>";
- 			$head .= "\n\t".'<th width="5" class="nowrap center hidden-phone" >';
- 			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$idLangName."', 'id', \$this->listDirn, \$this->listOrder); ?>";
- 			$head .= "\n\t</th>";
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
+			{
+				$head .= "\n\t<?php if (\$this->canState): ?>";
+				$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$statusLangName."', 'published', \$this->listDirn, \$this->listOrder); ?>";
+				$head .= "\n\t\t</th>";
+				$head .= "\n\t<?php else: ?>";
+				$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
+				$head .= "\n\t\t\t<?php echo JText::_('".$statusLangName."'); ?>";
+				$head .= "\n\t\t</th>";
+				$head .= "\n\t<?php endif; ?>";
+			}
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
+			{
+				$head .= "\n\t".'<th width="5" class="nowrap center hidden-phone" >';
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$idLangName."', 'id', \$this->listDirn, \$this->listOrder); ?>";
+				$head .= "\n\t</th>";
+			}
 			$head .= "\n</tr>";

 			return $head;
@ -5690,14 +5802,23 @@ class Interpretation extends Fields
 			{
 				$this->langContent[$this->lang][$tabLangName] = 'Publishing';
 			}
-			// check if access is added to this view
-			if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
+			// TODO add new publishing fields <-- nice to have, but no time now to do this
+			// $this->newPublishingFields[$viewName_single]
+			// the default publishing items
+			$items = array();
+			foreach ($this->defaultFields as $defaultField)
 			{
-				$addAccess = ",\n\t'access'";
-			}
-			else
-			{
-				$addAccess = "";
+				if (!isset($this->movedPublishingFields[$viewName_single][$defaultField]))
+				{
+					if ($defaultField != 'access')
+					{
+						$items[] = $defaultField;
+					}
+					elseif ($defaultField == 'access' && isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
+					{
+						$items[] = $defaultField;
+					}
+				}
 			}
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName_single]))
@ -5706,10 +5827,21 @@ class Interpretation extends Fields
 				$tabCodeNameLeft = 'publishing';
 				$tabCodeNameRight = 'metadata';
 				// the default publishing tiems
-				$items = "'created',\n\t'created_by',\n\t'modified',\n\t'modified_by',\n\t'published',\n\t'ordering'".$addAccess.",\n\t'version',\n\t'hits',\n\t'id'";
-				// set the publishing layout
-				$this->setLayout($viewName_single, $tabCodeNameLeft, $items, 'layoutpublished');
-				$this->setLayout($viewName_single, $tabCodeNameRight, false, 'layoutmetadata');
+				if (ComponentbuilderHelper::checkArray($items))
+				{
+					// load all items
+					$items_one = "'". implode("',\n\t'", $items)."'";
+					// set the publishing layout
+					$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+					$items_one = true;
+				}
+				else
+				{
+					$items_one = false;				
+				}
+				// set the metadata layout
+				$this->setLayout($viewName_single, $tabCodeNameRight, false, 'layoutmetadata');	
+				$items_two = true;
 			}
 			else
 			{
@ -5717,41 +5849,98 @@ class Interpretation extends Fields
 				$tabCodeNameLeft = 'publishing';
 				$tabCodeNameRight = 'publlshing';
 				// the default publishing tiems
-				$items_one = "'created',\n\t'created_by',\n\t'modified',\n\t'modified_by'";
-				$items_two = "'published',\n\t'ordering'".$addAccess.",\n\t'version',\n\t'hits',\n\t'id'";
-				// set the publishing layout
-				$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
-				$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
-			}
-			// check if the item has permissions.
-			$publishingPer = array();
-			$allToBeChekced = array('core.delete','core.edit.created_by','core.edit.state','core.edit.created');
-			foreach ($allToBeChekced as $core_permission)
-			{
-				if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($viewName_single,$this->permissionBuilder['global'][$core[$core_permission]]))
+				if (ComponentbuilderHelper::checkArray($items))
 				{
-					// set permissions.
-					$publishingPer[] = "\$this->canDo->get('".$core[$core_permission]."')";
+					
+					$items_one = array('created', 'created_by', 'modified', 'modified_by');
+					$items_two = array('published', 'ordering', 'access', 'version', 'hits', 'id');
+					// check all items
+					foreach ($items_one as $key_one => $item_one)
+					{
+						if (!in_array($item_one, $items))
+						{
+							unset($items_one[$key_one]);
+						}
+					}
+					foreach ($items_two as $key_two => $item_two)
+					{
+						if (!in_array($item_two, $items))
+						{
+							unset($items_two[$key_two]);
+						}
+					}
+					// load all items that remain
+					if (ComponentbuilderHelper::checkArray($items_one))
+					{
+						// load all items
+						$items_one = "'". implode("',\n\t'", $items_one)."'";
+						// set the publishing layout
+						$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+						$items_one = true;
+					}
+					// load all items that remain
+					if (ComponentbuilderHelper::checkArray($items_two))
+					{
+						// load all items
+						$items_two = "'". implode("',\n\t'", $items_two)."'";
+						// set the publishing layout
+						$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
+						$items_two = true;
+					}
 				}
 				else
 				{
-					// set permissions.
-					$publishingPer[] = "\$this->canDo->get('".$core_permission."')";
+					$items_one = false;
+					$items_two = false;					
 				}
 			}
-			$body .= "\n\n\t<?php if (".implode(' || ', $publishingPer).") : ?>";
-			// set the default publishing tab
-			$body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>";
-			$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
-			$body .= "\n\t\t\t".'<div class="span6">';
-			$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>";
-			$body .= "\n\t\t\t</div>";
-			$body .= "\n\t\t\t".'<div class="span6">';
-			$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameRight."', \$this); ?>";
-			$body .= "\n\t\t\t</div>";
-			$body .= "\n\t\t</div>";
-			$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
-			$body .= "\n\t<?php endif; ?>";
+			if ($items_one && $items_two)
+			{
+				$classs = "span6";
+			}
+			elseif ($items_one || $items_two)
+			{
+				$classs = "span12";
+			}
+			// only load this if needed
+			if ($items_one || $items_two)
+			{
+				// check if the item has permissions.
+				$publishingPer = array();
+				$allToBeChekced = array('core.delete','core.edit.created_by','core.edit.state','core.edit.created');
+				foreach ($allToBeChekced as $core_permission)
+				{
+					if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($viewName_single,$this->permissionBuilder['global'][$core[$core_permission]]))
+					{
+						// set permissions.
+						$publishingPer[] = "\$this->canDo->get('".$core[$core_permission]."')";
+					}
+					else
+					{
+						// set permissions.
+						$publishingPer[] = "\$this->canDo->get('".$core_permission."')";
+					}
+				}
+				$body .= "\n\n\t<?php if (".implode(' || ', $publishingPer).") : ?>";
+				// set the default publishing tab
+				$body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>";
+				$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
+				if ($items_one)
+				{
+					$body .= "\n\t\t\t".'<div class="'.$classs.'">';
+					$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>";
+					$body .= "\n\t\t\t</div>";
+				}
+				if ($items_two)
+				{
+					$body .= "\n\t\t\t".'<div class="'.$classs.'">';
+					$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameRight."', \$this); ?>";
+					$body .= "\n\t\t\t</div>";
+				}
+				$body .= "\n\t\t</div>";
+				$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
+				$body .= "\n\t<?php endif; ?>";
+			}
 			// make sure we dont load it to a view with the name component
 			if ($viewName_single != 'component')
 			{
@ -5814,13 +6003,48 @@ class Interpretation extends Fields
 		}
 		return '';
 	}
+	
+	public function setFadeInEfect(&$view)
+	{
+		// check if we should load the fade in affect
+		if ($view['settings']->add_fadein == 1)
+		{
+			// set view name
+			$fadein[] = "<script type=\"text/javascript\">";
+			$fadein[] = "\t// waiting spinner";
+			$fadein[] = "\tvar outerDiv = jQuery('body');";
+			$fadein[] = "\tjQuery('<div id=\"loading\"></div>')";
+			$fadein[] = "\t\t.css(\"background\", \"rgba(255, 255, 255, .8) url('components/com_".$this->fileContentStatic['###component###']."/assets/images/import.gif') 50% 15% no-repeat\")";
+			$fadein[] = "\t\t.css(\"top\", outerDiv.position().top - jQuery(window).scrollTop())";
+			$fadein[] = "\t\t.css(\"left\", outerDiv.position().left - jQuery(window).scrollLeft())";
+			$fadein[] = "\t\t.css(\"width\", outerDiv.width())";
+			$fadein[] = "\t\t.css(\"height\", outerDiv.height())";
+			$fadein[] = "\t\t.css(\"position\", \"fixed\")";
+			$fadein[] = "\t\t.css(\"opacity\", \"0.80\")";
+			$fadein[] = "\t\t.css(\"-ms-filter\", \"progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)\")";
+			$fadein[] = "\t\t.css(\"filter\", \"alpha(opacity = 80)\")";
+			$fadein[] = "\t\t.css(\"display\", \"none\")";
+			$fadein[] = "\t\t.appendTo(outerDiv);";
+			$fadein[] = "\tjQuery('#loading').show();";
+			$fadein[] = "\t// when page is ready remove and show";
+			$fadein[] = "\tjQuery(window).load(function() {";
+			$fadein[] = "\t\tjQuery('#".$this->fileContentStatic['###component###']."_loader').fadeIn('fast');";
+			$fadein[] = "\t\tjQuery('#loading').hide();";
+			$fadein[] = "\t});";
+			$fadein[] = "</script>";
+			$fadein[] = "<div id=\"".$this->fileContentStatic['###component###']."_loader\" style=\"display: none;\">";
+
+			return implode("\n", $fadein);
+		}
+		return "<div id=\"".$this->fileContentStatic['###component###']."_loader\">";
+	}

 	/**
 	 * @param $viewName_single
 	 * @param $layoutName
 	 * @param $items
 	 * @param $type
-     */
+	*/
 	public function setLayout($viewName_single, $layoutName, $items, $type)
 	{
 		// first build the layout file
@ -5974,7 +6198,7 @@ class Interpretation extends Fields
 	 * @param $viewName_list
 	 * @param $refview
 	 * @return string
-     */
+	*/
 	public function setListBodyLinked($viewName_single, $viewName_list, $refview)
 	{
 		if (isset($this->listBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->listBuilder[$viewName_list]))
@ -6014,7 +6238,10 @@ class Interpretation extends Fields
 				if (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']))
 				{
 					$item['id'] = $item['code'];
-					$item['code'] = $item['code'].'_'.$item['custom']['text'];
+					if (!$item['multiple'])
+					{
+						$item['code'] = $item['code'].'_'.$item['custom']['text'];
+					}
 				}
 				// check if translated vlaue is used
 				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
@ -6062,12 +6289,12 @@ class Interpretation extends Fields
 					elseif ($item['type'] == 'user' && !$item['title'])
 					{
 						// user and linked
-						$body .= "\n\t\t<?php \$itemUser = JFactory::getUser(\$item->user); ?>";
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
 						$body .= "\n\t\t".'<td class="nowrap">';
 						$body .= "\n\t\t\t<?php if (\$user->authorise('core.edit', 'com_users')): ?>";
-						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->user ?>"><?php echo $itemUser->name; ?></a>';
+						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->'.$item['code'].' ?>"><?php echo $'.$item['code'].'User->name; ?></a>';
 						$body .= "\n\t\t\t<?php else: ?>";
-						$body .= "\n\t\t\t\t<?php echo \$itemUser->name; ?>";
+						$body .= "\n\t\t\t\t<?php echo \$".$item['code']."User->name; ?>";
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
@ -6198,6 +6425,14 @@ class Interpretation extends Fields
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
+					elseif ($item['type'] == 'user')
+					{
+						// user name only
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
+						$body .= "\n\t\t".'<td class="nowrap">';
+						$body .= "\n\t\t\t<?php echo \$".$item['code']."User->name; ?>";
+						$body .= "\n\t\t</td>";
+					}
 					else
 					{
 						// normal not linked
@ -6694,6 +6929,8 @@ class Interpretation extends Fields
 			$query .= "\n\t\t//".$this->setLine(__LINE__)." setup the query";
 			$query .= "\n\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$pks))";
 			$query .= "\n\t\t{";
+			$query .= "\n\t\t\t//".$this->setLine(__LINE__)." Set a value to know this is exporting method.";
+			$query .= "\n\t\t\t\$_export = true;";
 			$query .= "\n\t\t\t//".$this->setLine(__LINE__)." Get the user object.";
 			$query .= "\n\t\t\t\$user = JFactory::getUser();";
 			$query .= "\n\t\t\t//".$this->setLine(__LINE__)." Create a new query object.";
@ -6902,16 +7139,28 @@ class Interpretation extends Fields
 		$target = array('admin' => 'import_'.$viewName_list);
 		$this->buildDynamique($target,'customimport');
 		// load the custom script to the files
+		if (isset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]))
+		{
+			// ###IMPORT_DISPLAY_METHOD_CUSTOM### <<<DYNAMIC>>>
+			$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_display']['import_'.$viewName_list]);
+			unset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]);
+		}
 		if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]))
 		{
-			// ###IMPORT_SETDATE_METOD_CUSTOM### <<<DYNAMIC>>>
-			$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
+			// ###IMPORT_SETDATE_METHOD_CUSTOM### <<<DYNAMIC>>>
+			$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SETDATE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
 			unset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]);
 		}
+		if (isset($this->customScriptBuilder['php_import']['import_'.$viewName_list]))
+		{
+			// ###IMPORT_METHOD_CUSTOM### <<<DYNAMIC>>>
+			$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import']['import_'.$viewName_list]);
+			unset($this->customScriptBuilder['php_import']['import_'.$viewName_list]);
+		}
 		if (isset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]))
 		{
-			// ###IMPORT_SAVE_METOD_CUSTOM### <<<DYNAMIC>>>
-			$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
+			// ###IMPORT_SAVE_METHOD_CUSTOM### <<<DYNAMIC>>>
+			$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_SAVE_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
 			unset($this->customScriptBuilder['php_import_save']['import_'.$viewName_list]);
 		}
 		if (isset($this->customScriptBuilder['html_import_view']['import_'.$viewName_list]))
@ -7106,7 +7355,7 @@ class Interpretation extends Fields
 		}
 	}

-	public function setAddButttonToListField($targetView)
+	public function setAddButttonToListField($targetView,$targetViews)
 	{
 		$addButton = array();
 		$addButton[] = "\n\t/**";
@ -7125,6 +7374,25 @@ class Interpretation extends Fields
 		$addButton[] = "\t\t//".$this->setLine(__LINE__)." if true set button";
 		$addButton[] = "\t\tif (\$setButton === 'true')";
 		$addButton[] = "\t\t{";
+		$addButton[] = "\t\t\t\$button = array();";
+		$addButton[] = "\t\t\t\$script = array();";
+		$addButton[] = "\t\t\t\$buttonName = \$this->getAttribute('name');";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." get the input from url";
+		$addButton[] = "\t\t\t\$jinput = JFactory::getApplication()->input;";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." get the view name & id";
+		$addButton[] = "\t\t\t\$values = \$jinput->getArray(array(";
+		$addButton[] = "\t\t\t\t'id' => 'int',";
+		$addButton[] = "\t\t\t\t'view' => 'word'";
+		$addButton[] = "\t\t\t));";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." check if new item";
+		$addButton[] = "\t\t\t\$ref = '';";
+		$addButton[] = "\t\t\t\$refJ = '';";
+		$addButton[] = "\t\t\tif (!is_null(\$values['id']) && strlen(\$values['view']))";
+		$addButton[] = "\t\t\t{";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." only load referal if not new item.";
+		$addButton[] = "\t\t\t\t\$ref = '&amp;ref=' . \$values['view'] . '&amp;refid=' . \$values['id'];";
+		$addButton[] = "\t\t\t\t\$refJ = '&ref=' . \$values['view'] . '&refid=' . \$values['id'];";
+		$addButton[] = "\t\t\t}";
 		$addButton[] = "\t\t\t\$user = JFactory::getUser();";
 		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." only add if user allowed to create " . $targetView;
 		// get core permissions
@ -7144,26 +7412,75 @@ class Interpretation extends Fields
 			$addButton[] = "\t\t\tif (\$user->authorise('core.create', 'com_".$this->fileContentStatic['###component###']."'))";
 		}
 		$addButton[] = "\t\t\t{";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." get the input from url";
-		$addButton[] = "\t\t\t\t\$jinput = JFactory::getApplication()->input;";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." get the view name & id";
-		$addButton[] = "\t\t\t\t\$values = \$jinput->getArray(array(";
-		$addButton[] = "\t\t\t\t\t'id' => 'int',";
-		$addButton[] = "\t\t\t\t\t'view' => 'word'";
-		$addButton[] = "\t\t\t\t));";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." check if new item";
-		$addButton[] = "\t\t\t\t\$ref = '';";
-		$addButton[] = "\t\t\t\tif (!is_null(\$values['id']) && strlen(\$values['view']))";
-		$addButton[] = "\t\t\t\t{";
-		$addButton[] = "\t\t\t\t\t//".$this->setLine(__LINE__)." only load referal if not new item.";
-		$addButton[] = "\t\t\t\t\t\$ref = '&amp;ref=' . \$values['view'] . '&amp;refid=' . \$values['id'];";
-		$addButton[] = "\t\t\t\t}";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build the button";
-		$addButton[] = "\t\t\t\t\$button = '<a class=\"btn btn-small btn-success\"";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build Create button";
+		$addButton[] = "\t\t\t\t\$buttonNamee = trim(\$buttonName);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
+		$addButton[] = "\t\t\t\t\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
+		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Create\" class=\"btn btn-small btn-success hasTooltip\" title=\"'.JText::sprintf('".$this->langPrefix."_CREATE_NEW_S', \$buttonNamee).'\" style=\"border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;\"";
 		$addButton[] = "\t\t\t\t\thref=\"index.php?option=com_" . $this->fileContentStatic['###component###'] . "&amp;view=" . $targetView . "&amp;layout=edit'.\$ref.'\" >";
-		$addButton[] = "\t\t\t\t\t<span class=\"icon-new icon-white\"></span>' . JText::_('COM_".$this->fileContentStatic['###COMPONENT###']."_NEW') . '</a>';";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." return the button attached to input field";
-		$addButton[] = "\t\t\t\treturn \$html . \$button;";
+		$addButton[] = "\t\t\t\t\t<span class=\"icon-new icon-white\"></span></a>';";
+		$addButton[] = "\t\t\t}";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." only add if user allowed to edit " . $targetView;
+		// check if the item has permissions.
+		if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($targetView,$this->permissionBuilder['global'][$core['core.edit']]))
+		{
+			$addButton[] = "\t\t\tif ((\$buttonName == '".$targetView."' || \$buttonName == '".$targetViews."') && \$user->authorise('".$core['core.edit']."', 'com_".$this->fileContentStatic['###component###']."'))";
+		}
+		else
+		{
+			$addButton[] = "\t\t\tif ((\$buttonName == '".$targetView."' || \$buttonName == '".$targetViews."')  && \$user->authorise('core.edit', 'com_".$this->fileContentStatic['###component###']."'))";
+		}
+		$addButton[] = "\t\t\t{";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build edit button";
+		$addButton[] = "\t\t\t\t\$buttonNamee = trim(\$buttonName);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/_+/', ' ', \$buttonNamee);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace('/\s+/', ' ', \$buttonNamee);";
+                $addButton[] = "\t\t\t\t\$buttonNamee = preg_replace(\"/[^A-Za-z ]/\", '', \$buttonNamee);";
+		$addButton[] = "\t\t\t\t\$buttonNamee = ucfirst(strtolower(\$buttonNamee));";
+		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.JText::sprintf('".$this->langPrefix."_EDIT_S', \$buttonNamee).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
+		$addButton[] = "\t\t\t\t\t<span class=\"icon-edit\"></span></a>';";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build script";
+		$addButton[] = "\t\t\t\t\$script[] = \"";
+		$addButton[] = "\t\t\t\t\tjQuery(document).ready(function() {";
+		$addButton[] = "\t\t\t\t\t\tjQuery('#adminForm').on('change', '#jform_\".\$buttonName.\"',function (e) {";
+		$addButton[] = "\t\t\t\t\t\t\te.preventDefault();";
+		$addButton[] = "\t\t\t\t\t\t\tvar \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
+		$addButton[] = "\t\t\t\t\t\t\t\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
+		$addButton[] = "\t\t\t\t\t\t});";		
+		$addButton[] = "\t\t\t\t\t\tvar \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
+		$addButton[] = "\t\t\t\t\t\t\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
+		$addButton[] = "\t\t\t\t\t});";
+		$addButton[] = "\t\t\t\t\tfunction \".\$buttonName.\"Button(value) {";
+		$addButton[] = "\t\t\t\t\t\tif (value > 0) {"; // TODO not ideal since value may not be an (int)
+		$addButton[] = "\t\t\t\t\t\t\t// hide the create button";
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Create').hide();";
+		$addButton[] = "\t\t\t\t\t\t\t// show edit button";
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').show();";
+		$addButton[] = "\t\t\t\t\t\t\tvar url = 'index.php?option=com_" . $this->fileContentStatic['###component###'] . "&view=".$targetViews."&task=" . $targetView . ".edit&id='+value+'\".\$refJ.\"';"; // TODO this value may not be the ID
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').attr('href', url);";
+		$addButton[] = "\t\t\t\t\t\t} else {";
+		$addButton[] = "\t\t\t\t\t\t\t// show the create button";
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Create').show();";
+		$addButton[] = "\t\t\t\t\t\t\t// hide edit button";
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').hide();";
+		$addButton[] = "\t\t\t\t\t\t}";
+		$addButton[] = "\t\t\t\t\t}\";";
+		$addButton[] = "\t\t\t}";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." check if button was created for " . $targetView ." field.";
+		$addButton[] = "\t\t\tif (is_array(\$button) && count(\$button) > 0)";
+		$addButton[] = "\t\t\t{";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." 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}";
 		$addButton[] = "\t\t}";
 		$addButton[] = "\t\treturn \$html;";
@ -7243,7 +7560,7 @@ class Interpretation extends Fields
 							$functions[$uniqueVar][0]	= $matchName;
 							$matchNames[$matchName]		= $condition['match_name'];
 							// get the select value
-							$getValue[$matchName]		= $this->getValueScript($condition['match_type'],$condition['match_name'],$uniqueVar);
+							$getValue[$matchName]		= $this->getValueScript($condition['match_type'],$condition['match_name'],$condition['match_extends'],$uniqueVar);
 							// get the options
 							$options			= $this->getOptionsScript($condition['match_type'],$condition['match_options']);
 							// set the if values
@ -7264,7 +7581,7 @@ class Interpretation extends Fields
 									$matchNames[$relationName]	= $relation['match_name'];
 									// get the relation option
 									$relationOptions		= $this->getOptionsScript($relation['match_type'],$relation['match_options']);
-									$getValue[$relationName]	= $this->getValueScript($relation['match_type'],$relation['match_name'],$uniqueVar);
+									$getValue[$relationName]	= $this->getValueScript($relation['match_type'],$relation['match_name'],$condition['match_extends'],$uniqueVar);
 									$ifValue[$relationName]		= $this->ifValueScript($relationName,$relation['match_behavior'],$relation['match_type'],$relationOptions);
 								}
 							}
@ -7281,7 +7598,7 @@ class Interpretation extends Fields
 						$functions[$uniqueVar][0]	= $matchName;
 						$matchNames[$matchName]		= $condition['match_name'];
 						// get the select value
-						$getValue[$matchName]		= $this->getValueScript($condition['match_type'],$condition['match_name'],$uniqueVar);
+						$getValue[$matchName]		= $this->getValueScript($condition['match_type'],$condition['match_name'],$condition['match_extends'],$uniqueVar);
 						// get the options
 						$options			= $this->getOptionsScript($condition['match_type'],$condition['match_options']);
 						// set the if values
@ -8111,12 +8428,12 @@ class Interpretation extends Fields
 		return $buket;
 	}

-	public function getValueScript($type,$name,$unique)
+	public function getValueScript($type,$name,$extends,$unique)
 	{
 		$select		= '';
 		$isArray	= false;
 		$keyName	= $name.'_'.$unique;
-		if ($type == 'checkboxes')
+		if ($type == 'checkboxes' || $extends == 'checkboxes')
 		{
 			$select =  "var ".$keyName." = [];\n\tjQuery('#jform_".$name." input[type=checkbox]').each(function()\n\t{\n\t\tif (jQuery(this).is(':checked'))\n\t\t{\n\t\t\t".$keyName.".push(jQuery(this).prop('value'));\n\t\t}\n\t});";
 			$isArray = true;
@ -8488,6 +8805,11 @@ class Interpretation extends Fields
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
 						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JText::_(\$text));";
 					}
+					elseif ($filter['type'] == 'user')
+					{
+						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
+						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JFactory::getUser(\$".$filter['code'].")->name);";
+					}
 					else
 					{
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
@ -9967,6 +10289,8 @@ class Interpretation extends Fields

 	public function setSortFields($view)
 	{
+		// keep track of all fields already added
+		$donelist = array('sorting','published');
 		// set the default first
 		$fields = "return array(";
 		$fields .= "\n\t\t\t'a.sorting' => JText::_('JGRID_HEADING_ORDERING')";
@ -9977,17 +10301,20 @@ class Interpretation extends Fields
 		{
 			foreach ($this->sortBuilder[$view] as $filter)
 			{
-				if ($filter['type'] == 'category')
+				if (!in_array($filter['code'], $donelist))
 				{
-					$fields .= ",\n\t\t\t'c.category_title' => JText::_('".$filter['lang']."')";
-				}
-				elseif (ComponentbuilderHelper::checkArray($filter['custom']))
-				{
-					$fields .= ",\n\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."' => JText::_('".$filter['lang']."')";
-				}
-				else
-				{
-					$fields .= ",\n\t\t\t'a.".$filter['code']."' => JText::_('".$filter['lang']."')";
+					if ($filter['type'] == 'category')
+					{
+						$fields .= ",\n\t\t\t'c.category_title' => JText::_('".$filter['lang']."')";
+					}
+					elseif (ComponentbuilderHelper::checkArray($filter['custom']))
+					{
+						$fields .= ",\n\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."' => JText::_('".$filter['lang']."')";
+					}
+					else
+					{
+						$fields .= ",\n\t\t\t'a.".$filter['code']."' => JText::_('".$filter['lang']."')";
+					}
 				}
 			}
 		}
@ -10258,11 +10585,17 @@ class Interpretation extends Fields
 							$fix .= "\n\t".$tab."\t\t\t\t}";
 							$fix .= "\n\t".$tab."\t\t\t}";
 						}
+						elseif ($item['method'] == 1 && !$export)
+						{
+							// TODO we check if this works well.
+							$fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
+							$fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');";
+						}
 						else
 						{
 							if (!$export)
 							{
-								// TODO we must add options for multi custom selection.
+								// For thos we have not cached yet.
 								$fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
 								$fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].");";
 							}
@ -12362,8 +12695,12 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 										$view['settings']->permissions = array();
 										$view['settings']->permissions[] = $fieldView;
 									}
-									// load to global field permission set
-									$this->permissionFields[$nameView][$fieldName] = $fieldType;
+									// insure that no default field get loaded
+									if (!in_array($fieldName, $this->defaultFields))
+									{
+										// load to global field permission set
+										$this->permissionFields[$nameView][$fieldName] = $fieldType;
+									}
 								}
 							}
 						}
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@ -273,6 +273,9 @@ class Infusion extends Interpretation

 						// ###EDITBODY### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$viewName_single]['###EDITBODY###'] = $this->setEditBody($view);
+						
+						// ###EDITBODY### <<<DYNAMIC>>>
+						$this->fileContentDynamic[$viewName_single]['###EDITBODYFADEIN###'] = $this->setFadeInEfect($view);

 						// ###JTABLECONSTRUCTOR### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$viewName_single]['###JTABLECONSTRUCTOR###'] = $this->setJtableConstructor($viewName_single);
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@ -75,11 +75,9 @@ abstract class ComponentbuilderHelper
 	{
 		// set image
 		$image = JPATH_SITE.'/'.$path;
-		// chack if exists
-		if (file_exists($image))
+		// check if exists
+		if (file_exists($image) && $result = @getimagesize($image))
 		{
-			// get image info
-			$result = getimagesize($image);
 			// return type request
 			switch ($request)
 			{
@ -603,18 +601,27 @@ abstract class ComponentbuilderHelper
 	*/
 	public static function getFileHeaders($dataType)
 	{		
-		// make sure the file is loaded		
+		// make sure these files are loaded		
 		JLoader::import('PHPExcel', JPATH_COMPONENT_ADMINISTRATOR . '/helpers');
+		JLoader::import('ChunkReadFilter', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/PHPExcel/Reader');
 		// get session object
-		$session 	= JFactory::getSession();
+		$session	= JFactory::getSession();
 		$package	= $session->get('package', null);
 		$package	= json_decode($package, true);
 		// set the headers
 		if(isset($package['dir']))
 		{
+			$chunkFilter = new PHPExcel_Reader_chunkReadFilter();
+			// only load first three rows
+			$chunkFilter->setRows(2,1);
+			// identify the file type
 			$inputFileType = PHPExcel_IOFactory::identify($package['dir']);
+			// create the reader for this file type
 			$excelReader = PHPExcel_IOFactory::createReader($inputFileType);
+			// load the limiting filter
+			$excelReader->setReadFilter($chunkFilter);
 			$excelReader->setReadDataOnly(true);
+			// load the rows (only first three)
 			$excelObj = $excelReader->load($package['dir']);
 			$headers = array();
 			foreach ($excelObj->getActiveSheet()->getRowIterator() as $row)
@ -710,31 +717,33 @@ abstract class ComponentbuilderHelper
 		return false;
 	}

-	public static function jsonToString($value, $sperator = ", ")
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
                // check if string is JSON
                $result = json_decode($value, true);
-                if (json_last_error() === JSON_ERROR_NONE) {
-                // is JSON
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
+			// is JSON
 			if (self::checkArray($result))
 			{
-				$value = '';
-				$counter = 0;
-				foreach ($result as $string)
+				if (self::checkString($table))
 				{
-					if ($counter)
+					$names = array();
+					foreach ($result as $val)
 					{
-						$value .= $sperator.$string;
+						if ($name = self::getVar($table, $val, 'id', 'name'))
+						{
+							$names[] = $name;
+						}
 					}
-					else
+					if (self::checkArray($names))
 					{
-						$value .= $string;
-					}
-					$counter++;
+						return (string) implode($sperator,$names);
+					}	
 				}
-				return $value;
+				return (string) implode($sperator,$result);
 			}
-                        return json_decode($value);
+                        return (string) json_decode($value);
                }
                return $value;
        }
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php
--- a/admin/helpers/indenter.php
+++ b/admin/helpers/indenter.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php
--- a/admin/helpers/js.php
+++ b/admin/helpers/js.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php
--- a/admin/helpers/minify.php
+++ b/admin/helpers/minify.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -50,6 +50,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ABOVE_TABS="Above Tabs"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_DESCRIPTION="Enter Action Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ACTION_LABEL="Action Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ACTIVE_ONLY_FOUR_TEXT_FIELD="Active (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD="Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS="Addconditions"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_DESCRIPTION="Conditional setup for the above fields."
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADDCONDITIONS_SELECT="Add"
@ -75,6 +76,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW_LABEL="Add CSS (view)"
 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"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN="Add Fadein"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_DESCRIPTION="Should the fade in affect be added to the admin edit view."
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL="Fade In Affect"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FILE="Add Javascript Views File"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FILE_LABEL="Add JavaScript (views-file)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_JAVASCRIPT_VIEWS_FOOTER="Add Javascript Views Footer"
@ -133,10 +137,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED="core.edit.created"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY="core.edit.created_by"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN="core.edit.own"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE="core.edit.state"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created the Admin View."
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date Admin View was created."
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Admin View."
+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_CSS="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS="Css Views"
@ -234,6 +238,10 @@ 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_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)"
+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_MYSQL="MySQL"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT="Name Here"
@ -314,6 +322,14 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY="Php Getlistquery"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT="// PHP Here that should run in the getlistquery Method (to add custom filtering)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT="Php Import"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY="Php Import Display"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION="Add your PHP here!"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT="// The display method for the view.html.php file."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL="PHP (display)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT="// PHP Here that should run in the save Method, $data, $table"
@ -334,6 +350,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PUBLISHING="Publishing"
 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_RIGHT_IN_TAB="Right in Tab"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RIGHT_OF_TABS="Right of Tabs"
 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."
@ -461,6 +478,9 @@ COM_COMPONENTBUILDER_COMPONENT_ADD_ADMIN_EVENT="Add Admin Event"
 COM_COMPONENTBUILDER_COMPONENT_ADD_ADMIN_EVENT_LABEL="Add Global Admin Event"
 COM_COMPONENTBUILDER_COMPONENT_ADD_CSS="Add Css"
 COM_COMPONENTBUILDER_COMPONENT_ADD_CSS_LABEL="Add CSS"
+COM_COMPONENTBUILDER_COMPONENT_ADD_EMAIL_HELPER="Add Email Helper"
+COM_COMPONENTBUILDER_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION="Adding the email helper class, that can be used to send emails."
+COM_COMPONENTBUILDER_COMPONENT_ADD_EMAIL_HELPER_LABEL="Add Email Helper"
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE="Add License"
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE_DESCRIPTION="Add the option to use a license in the component."
 COM_COMPONENTBUILDER_COMPONENT_ADD_LICENSE_LABEL="Add License (whmcs)"
@ -570,10 +590,10 @@ COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT="Copyright"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_DESCRIPTION="Add Copyright Here"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_HINT="Add Copyright Here"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_LABEL="Copyright"
-COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_DESC="The user that created the Component."
-COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC="The date Component was created."
-COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_DESC="The user that created this Component."
+COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC="The date this Component was created."
+COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_COMPONENT_CREATUSERHELPER="Creatuserhelper"
 COM_COMPONENTBUILDER_COMPONENT_CREATUSERHELPER_LABEL="Add Create User Helper Method"
 COM_COMPONENTBUILDER_COMPONENT_CREDIT="Credit"
@ -614,9 +634,9 @@ COM_COMPONENTBUILDER_COMPONENT_EDIT="Editing the Component"
 COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_DESCRIPTION="add site edit & create view for this admin view"
 COM_COMPONENTBUILDER_COMPONENT_EDIT_CREATE_SITE_VIEW_LABEL="Edit/Create Site View"
 COM_COMPONENTBUILDER_COMPONENT_EMAIL="Email"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_DESCRIPTION="Enter Email"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_HINT="demo@example.com"
-COM_COMPONENTBUILDER_COMPONENT_EMAIL_LABEL="Email"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_DESCRIPTION="Enter Author Email"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_HINT="Author Email Here"
+COM_COMPONENTBUILDER_COMPONENT_EMAIL_LABEL="Author Email"
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS="Emptycontributors"
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS_DESCRIPTION="Set if a list of empty contributor fields should be added."
 COM_COMPONENTBUILDER_COMPONENT_EMPTYCONTRIBUTORS_LABEL="Empty Contributor Fields"
@ -726,6 +746,10 @@ COM_COMPONENTBUILDER_COMPONENT_METADATA_LABEL="Has Metadata"
 COM_COMPONENTBUILDER_COMPONENT_MINUS="Minus"
 COM_COMPONENTBUILDER_COMPONENT_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_COMPONENT_MOBILE="Mobile"
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_BY_DESC="The last user that modified this Component."
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_DESC="The date this Component was modified."
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_COMPONENT_MOVE="Move"
 COM_COMPONENTBUILDER_COMPONENT_MUSIC="Music"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_DESCRIPTION="Update Dump"
@ -987,7 +1011,7 @@ COM_COMPONENTBUILDER_COMPONENT_WARNING_CIRCLE="Warning Circle"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE="Website"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE_DESCRIPTION="Enter website address"
 COM_COMPONENTBUILDER_COMPONENT_WEBSITE_HINT="http://www.example.com"
-COM_COMPONENTBUILDER_COMPONENT_WEBSITE_LABEL="Website"
+COM_COMPONENTBUILDER_COMPONENT_WEBSITE_LABEL="Author Website"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY="Whmcs Key"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY_DESCRIPTION="Add your WHMCS Secret Key here that is needed for this license"
 COM_COMPONENTBUILDER_COMPONENT_WHMCS_KEY_HINT="Secret Key"
@ -1090,6 +1114,7 @@ COM_COMPONENTBUILDER_CONFIG_UIKIT_STYLE_LABEL="css Style"
 COM_COMPONENTBUILDER_CONFIG_YES="Yes"
 COM_COMPONENTBUILDER_CONTRIBUTOR="Contributor"
 COM_COMPONENTBUILDER_CONTRIBUTORS="Contributors"
+COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW="Custom Admin View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_ACCESS="Custom Admin Views Access"
@ -1213,10 +1238,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMMENTS_TWO="Comments 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMPASS="Compass"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTRACT="Contract"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTRACT_TWO="Contract 2"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_DESC="The user that created the Custom Admin View."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_DESC="The date Custom Admin View was created."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Custom Admin View."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_DESC="The date this Custom Admin View was created."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREDIT="Credit"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS="Css"
@ -1327,6 +1352,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_LABEL="Target Controller Method"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS="Minus"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MOBILE="Mobile"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_BY_DESC="The last user that modified this Custom Admin View."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Custom Admin View was modified."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MOVE="Move"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MUSIC="Music"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME="Name"
@ -1568,10 +1597,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_BB="bb"
 COM_COMPONENTBUILDER_DYNAMIC_GET_C="c"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CATEGORIES="Categories"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CC="cc"
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_DESC="The user that created the Dynamic Get."
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_DESC="The date Dynamic Get was created."
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_DESC="The user that created this Dynamic Get."
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_DESC="The date this Dynamic Get was created."
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CUSTOM="Custom"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_DYNAMIC_GET_D="d"
@ -1658,6 +1687,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE="Main Source"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_DESCRIPTION="Select the main source of this dynamic get method."
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL="Main Source"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MM="mm"
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_BY_DESC="The last user that modified this Dynamic Get."
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_DESC="The date this Dynamic Get was modified."
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE="Multiple"
 COM_COMPONENTBUILDER_DYNAMIC_GET_N="n"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NAME="Name"
@ -1786,6 +1819,7 @@ COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date."
+COM_COMPONENTBUILDER_EDIT_S="Edit %s"
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
 COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
@ -1889,10 +1923,10 @@ COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION="Select if the value is ad
 COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL="Adjustable"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_LABEL="Category"
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC="The user that created the Fieldtype."
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC="The date Fieldtype was created."
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC="The user that created this Fieldtype."
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC="The date this Fieldtype was created."
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT="Add Description Here"
@ -1907,6 +1941,10 @@ COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY="Fieldtype Category"
 COM_COMPONENTBUILDER_FIELDTYPE_ID="Id"
 COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION="Select if the property is mandatory."
 COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_LABEL="Mandatory"
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_DESC="The last user that modified this Fieldtype."
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_DESC="The date this Fieldtype was modified."
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME="Name"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT="Name Here"
@ -1947,10 +1985,10 @@ COM_COMPONENTBUILDER_FIELD_BIGINT="BIGINT"
 COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELD_CATID_LABEL="Category"
 COM_COMPONENTBUILDER_FIELD_CHAR="CHAR"
-COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC="The user that created the Field."
-COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date Field was created."
-COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC="The user that created this Field."
+COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date this Field was created."
+COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEWS="Css Views"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
@ -2009,6 +2047,10 @@ COM_COMPONENTBUILDER_FIELD_JSON="JSON"
 COM_COMPONENTBUILDER_FIELD_KEY="KEY"
 COM_COMPONENTBUILDER_FIELD_LONGTEXT="LONGTEXT"
 COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT="MEDIUMTEXT"
+COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC="The last user that modified this Field."
+COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_DESC="The date this Field was modified."
+COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_FIELD_NAME="Name"
 COM_COMPONENTBUILDER_FIELD_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_FIELD_NAME_HINT="Name Here"
@ -2127,15 +2169,16 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view being
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL="Admin Views"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS="Alias"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_HINT="Auto-generated from name"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_LABEL="Alias"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ALL="All"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE="Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE_LABEL="Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_CONTENT="Content"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_CONTENT_LABEL="Content"
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC="The user that created the Help Document."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC="The date Help Document was created."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC="The user that created this Help Document."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC="The date this Help Document was created."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_DETAILS="Details"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_EDIT="Editing the Help Document"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS="Another Help Document has the same alias."
@ -2147,6 +2190,10 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_JOOMLA_ARTICLE="Joomla Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION="Location"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_DESCRIPTION="Select the help target location."
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL="Location"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_DESC="The last user that modified this Help Document."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_DESC="The date this Help Document was modified."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_NEW="A New Help Document"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ORDERING_LABEL="Ordering"
@ -2280,10 +2327,10 @@ COM_COMPONENTBUILDER_LAYOUT_ALIAS="Alias"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_HINT="codename"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_LABEL="Name in Code"
-COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC="The user that created the Layout."
-COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC="The date Layout was created."
-COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC="The user that created this Layout."
+COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC="The date this Layout was created."
+COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_LAYOUT_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_DESCRIPTION="Enter some description"
@ -2301,6 +2348,10 @@ COM_COMPONENTBUILDER_LAYOUT_ID="Id"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT="// Add the layout code here. $displayData is the Object that is used inside the layout file to build displayed output"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL="Layout"
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_DESC="The last user that modified this Layout."
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_DESC="The date this Layout was modified."
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_LAYOUT_NAME="Name"
 COM_COMPONENTBUILDER_LAYOUT_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_LAYOUT_NAME_HINT="Name Here"
@ -2468,10 +2519,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_COMMENTS_TWO="Comments 2"
 COM_COMPONENTBUILDER_SITE_VIEW_COMPASS="Compass"
 COM_COMPONENTBUILDER_SITE_VIEW_CONTRACT="Contract"
 COM_COMPONENTBUILDER_SITE_VIEW_CONTRACT_TWO="Contract 2"
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_DESC="The user that created the Site View."
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_DESC="The date Site View was created."
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_DESC="The user that created this Site View."
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_DESC="The date this Site View was created."
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_SITE_VIEW_CREDIT="Credit"
 COM_COMPONENTBUILDER_SITE_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_SITE_VIEW_CSS="Css"
@ -2594,6 +2645,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_METHOD_NAME_LABEL="Method Name"
 COM_COMPONENTBUILDER_SITE_VIEW_MINUS="Minus"
 COM_COMPONENTBUILDER_SITE_VIEW_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_SITE_VIEW_MOBILE="Mobile"
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_BY_DESC="The last user that modified this Site View."
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_DATE_DESC="The date this Site View was modified."
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_SITE_VIEW_MOVE="Move"
 COM_COMPONENTBUILDER_SITE_VIEW_MUSIC="Music"
 COM_COMPONENTBUILDER_SITE_VIEW_NAME="Name"
@ -2806,10 +2861,10 @@ COM_COMPONENTBUILDER_SNIPPETS_SUBMENU="Snippets Submenu"
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the snippet"
 COM_COMPONENTBUILDER_SNIPPET_CHARTS="Charts"
 COM_COMPONENTBUILDER_SNIPPET_COMMON="Common"
-COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC="The user that created the Snippet."
-COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC="The date Snippet was created."
-COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC="The user that created this Snippet."
+COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC="The date this Snippet was created."
+COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_HINT="Add Description Here"
@ -2825,6 +2880,10 @@ COM_COMPONENTBUILDER_SNIPPET_HEADING_LABEL="Heading"
 COM_COMPONENTBUILDER_SNIPPET_ID="Id"
 COM_COMPONENTBUILDER_SNIPPET_JAVASCRIPT="JavaScript"
 COM_COMPONENTBUILDER_SNIPPET_LAYOUT="Layout"
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_DESC="The last user that modified this Snippet."
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_DESC="The date this Snippet was modified."
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_SNIPPET_NAME="Name"
 COM_COMPONENTBUILDER_SNIPPET_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_SNIPPET_NAME_HINT="Name Here"
@ -2918,10 +2977,10 @@ COM_COMPONENTBUILDER_TEMPLATE_ALIAS="Alias"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_HINT="codename"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_LABEL="Name in Code"
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC="The user that created the Template."
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC="The date Template was created."
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC="The user that created this Template."
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC="The date this Template was created."
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_TEMPLATE_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_DESCRIPTION="Enter some description"
@ -2936,6 +2995,10 @@ COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL="Dynamic Values"
 COM_COMPONENTBUILDER_TEMPLATE_EDIT="Editing the Template"
 COM_COMPONENTBUILDER_TEMPLATE_ERROR_UNIQUE_ALIAS="Another Template has the same alias."
 COM_COMPONENTBUILDER_TEMPLATE_ID="Id"
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_DESC="The last user that modified this Template."
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_DESC="The date this Template was modified."
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_TEMPLATE_NAME="Name"
 COM_COMPONENTBUILDER_TEMPLATE_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_TEMPLATE_NAME_HINT="Name Here"
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php
--- a/admin/layouts/admin_view/custom_import_fullwidth.php
+++ b/admin/layouts/admin_view/custom_import_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
@ -34,7 +34,9 @@ $fields = $displayData->get('fields') ?: array(
 	'note_beginner_import',
 	'note_advanced_import',
 	'add_custom_import',
+	'php_import_display',
 	'html_import_view',
+	'php_import',
 	'php_import_setdata',
 	'php_import_save'
 );
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 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->vxdfields;
+$items	= $displayData->vxffields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=fields&task=field.edit";
@ -43,34 +43,34 @@ $can	= ComponentbuilderHelper::getActions('field');
 	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_COMPONENTBUILDER_NEW'); ?></a><br /><br />
 <?php endif; ?>
 <?php if (ComponentbuilderHelper::checkArray($items)): ?>
-<table class="footable table data fields metro-blue" data-page-size="20" data-filter="#filter_fields">
+<table class="footable table data fields" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
 <thead>
 	<tr>
-		<th data-toggle="true">
+		<th data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_NAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'); ?>
 		</th>
-		<th data-hide="all">
+		<th data-breakpoints="all" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'); ?>
 		</th>
-		<th width="10" data-hide="phone,tablet">
+		<th width="10" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STATUS'); ?>
 		</th>
-		<th width="5" data-type="numeric" data-hide="phone,tablet">
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_ID'); ?>
 		</th>
 	</tr>
@ -120,25 +120,25 @@ $can	= ComponentbuilderHelper::getActions('field');
 			<?php echo JText::_($item->store); ?>
 		</td>
 		<?php if ($item->published == 1):?>
-			<td class="center"  data-value="1">
+			<td class="center"  data-sort-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
 					<?php echo JText::_('PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0):?>
-			<td class="center"  data-value="2">
+			<td class="center"  data-sort-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
 					<?php echo JText::_('INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2):?>
-			<td class="center"  data-value="3">
+			<td class="center"  data-sort-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2):?>
-			<td class="center"  data-value="4">
+			<td class="center"  data-sort-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
@ -150,13 +150,6 @@ $can	= ComponentbuilderHelper::getActions('field');
 	</tr>
 <?php endforeach; ?>
 </tbody>
-<tfoot class="hide-if-no-paging">
-	<tr>
-		<td colspan="9">
-			<div class="pagination pagination-centered"></div>
-		</td>
-	</tr>
-</tfoot>
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
--- a/admin/layouts/admin_view/settings_above.php
+++ b/admin/layouts/admin_view/settings_above.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php
--- a/admin/layouts/admin_view/settings_left.php
+++ b/admin/layouts/admin_view/settings_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
@ -36,6 +36,7 @@ $fields = $displayData->get('fields') ?: array(
 	'type',
 	'short_description',
 	'description',
+	'add_fadein',
 	'icon',
 	'icon_add',
 	'icon_category'
--- a/admin/layouts/admin_view/settings_right.php
+++ b/admin/layouts/admin_view/settings_right.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
--- a/admin/layouts/admin_view/settings_under.php
+++ b/admin/layouts/admin_view/settings_under.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php
--- a/admin/layouts/component/admin_views_fullwidth.php
+++ b/admin/layouts/component/admin_views_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php
@ -43,25 +43,25 @@ $can	= ComponentbuilderHelper::getActions('admin_view');
 	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_COMPONENTBUILDER_NEW'); ?></a><br /><br />
 <?php endif; ?>
 <?php if (ComponentbuilderHelper::checkArray($items)): ?>
-<table class="footable table data admin_views metro-blue" data-page-size="20" data-filter="#filter_admin_views">
+<table class="footable table data admin_views" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
 <thead>
 	<tr>
-		<th data-toggle="true">
+		<th data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_LABEL'); ?>
 		</th>
-		<th width="10" data-hide="phone,tablet">
+		<th width="10" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_STATUS'); ?>
 		</th>
-		<th width="5" data-type="numeric" data-hide="phone,tablet">
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ID'); ?>
 		</th>
 	</tr>
@ -94,25 +94,25 @@ $can	= ComponentbuilderHelper::getActions('admin_view');
 			<?php echo $displayData->escape($item->short_description); ?>
 		</td>
 		<?php if ($item->published == 1):?>
-			<td class="center"  data-value="1">
+			<td class="center"  data-sort-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
 					<?php echo JText::_('PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0):?>
-			<td class="center"  data-value="2">
+			<td class="center"  data-sort-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
 					<?php echo JText::_('INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2):?>
-			<td class="center"  data-value="3">
+			<td class="center"  data-sort-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2):?>
-			<td class="center"  data-value="4">
+			<td class="center"  data-sort-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
@ -124,13 +124,6 @@ $can	= ComponentbuilderHelper::getActions('admin_view');
 	</tr>
 <?php endforeach; ?>
 </tbody>
-<tfoot class="hide-if-no-paging">
-	<tr>
-		<td colspan="6">
-			<div class="pagination pagination-centered"></div>
-		</td>
-	</tr>
-</tfoot>
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">
--- a/admin/layouts/component/details_above.php
+++ b/admin/layouts/component/details_above.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
--- a/admin/layouts/component/details_left.php
+++ b/admin/layouts/component/details_left.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
--- a/admin/layouts/component/details_right.php
+++ b/admin/layouts/component/details_right.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
--- a/admin/layouts/component/details_under.php
+++ b/admin/layouts/component/details_under.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
--- a/admin/layouts/component/ftp_servers_fullwidth.php
+++ b/admin/layouts/component/ftp_servers_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ftp_servers_fullwidth.php
--- a/admin/layouts/component/publishing.php
+++ b/admin/layouts/component/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
--- a/admin/layouts/component/publlshing.php
+++ b/admin/layouts/component/publlshing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.6
-	@build			4th May, 2016
+	@version		2.1.12
+	@build			3rd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Llewellyn van der Merwe	d82d4aeb22	Added email helper class.	2016-06-03 07:28:32 +01:00
Llewellyn van der Merwe	5cd07f3b88	Removed the PDF lib since it made the installer to big for most servers. We will setup an another lib installer for the PDF library.	2016-06-02 17:34:46 +01:00
Llewellyn van der Merwe	5d19f46070	Added the option to overwrite the default-fields, so you can add them to the list view in admin area and change their layout position in the edit view. Also fixed some minor bugs.	2016-06-02 17:18:49 +01:00
Llewellyn van der Merwe	02f9523e1b	Fixed fade-in affect problem of not loading the affect when added.	2016-05-31 06:36:31 +01:00
Llewellyn van der Merwe	7f52decf16	Added fade-in option for admin views, added pdf lib to custom folder for use in projects.	2016-05-31 06:11:07 +01:00
Llewellyn van der Merwe	d2aa1fce0b	Improved the custom import option to include the display method override.	2016-05-20 06:00:31 +01:00
Llewellyn van der Merwe	3b774a8385	This fixes #3 to insure that custom/other Data Length/Values can be set.	2016-05-12 02:26:54 +01:00
Llewellyn van der Merwe	ee2fea1db8	Updated the readme file.	2016-05-10 06:47:47 +01:00
Llewellyn van der Merwe	c9150e930d	Changed over to V3 of footable, fixed icon display in the repeatable icon selections.	2016-05-07 02:12:30 +01:00
Llewellyn van der Merwe	e21980bbea	Added editing feature to custom list fields and improved the buttons to great and edit the list values.	2016-05-07 00:41:41 +01:00
Llewellyn van der Merwe	32e3f6b86e	Added the import method to custom import tab, and improved the import custom concept.	2016-05-05 00:14:20 +01:00
Llewellyn van der Merwe	0fd9d9d169	Bug fix in the custom import option.	2016-05-04 06:51:30 +01:00