New Release

Removed $_GET from all callback response and used JInput instead
2016-06-27 12:12:29 +01:00 · 2016-06-27 12:05:53 +01:00 · 2016-06-24 15:23:01 +01:00 · 2016-06-23 16:05:37 +01:00 · 2016-06-03 07:28:32 +01:00 · 2016-06-02 17:34:46 +01:00
467 changed files with 15831 additions and 8004 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Component Builder (2.1.3)
+# Component Builder (2.1.14)

 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*: 22nd April, 2016
-+ *Version*: 2.1.3
+ *Last Build*: 27th June, 2016
+ *Version*: 2.1.14
 + *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
-
-**225 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*: **80585**
-+ *File count*: **495**
+ *Line count*: **83201**
+ *File count*: **507**
 + *Folder count*: **98**

-**148 Hours** or **19 Eight Hour Days** (the actual time the author spent)
-
-> (with the following break down:
-> **debugging @56hours** = codingtime / 4;
-> **planning @32hours** = codingtime / 7;
-> **mapping @22hours** = codingtime / 10;
-> **office @37hours** = codingtime / 6;)
-
-**373 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css
--- a/admin/assets/images/component-300.jpg
+++ b/admin/assets/images/component-300.jpg
--- a/admin/assets/images/component-300.png
+++ b/admin/assets/images/component-300.png
--- 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
@ -102,9 +102,15 @@ abstract class ###Component###Helper
 		$db = JFactory::getDbo();
 		// Create a new query object.
 		$query = $db->getQuery(true);
-
 		$query->select($db->quoteName(array($what)));
-		$query->from($db->quoteName('#__'.$main.'_'.$table));
+		if (empty($table))
+		{
+			$query->from($db->quoteName('#__'.$main));
+		}
+		else
+		{
+			$query->from($db->quoteName('#__'.$main.'_'.$table));
+		}
 		if (is_numeric($where))
 		{
 			$query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where);
@ -162,31 +168,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;
        }
@ -841,7 +849,7 @@ abstract class ###Component###Helper
 					$w .= ' ';
 					if($r < 100)
 					{
-						$word .= 'and ';
+						$w .= 'and ';
 					}
 					$w .= self::numberToString($r);
 				}
--- 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');
@ -222,13 +234,13 @@ abstract class ###Component###Email
 			$numReplyTo = count($mailreply);
 			for ($i=0; $i < $numReplyTo; $i++)
 			{
-				$mail->addReplyTo( array($mailreply[$i], $replyname[$i]) );
+				$mail->addReplyTo($mailreply[$i], $replyname[$i]);
 			}
 		}
 		elseif (!empty($mailreply))
 		{
 			$mail->ClearReplyTos();
-			$mail->addReplyTo( array( $mailreply, $replyname ) );
+			$mail->addReplyTo($mailreply, $replyname);
 		}
 		
 		// check if we can add the DKIM to email
@ -256,6 +268,12 @@ abstract class ###Component###Email
 			@unlink($tmp);
 		}
 		
+		if (method_exists('###Component###Helper','storeMessage'))
+		{
+			// store the massage if the method is set
+			###Component###Helper::storeMessage($sendmail, $recipient, $subject, $body, $textonly, $mode, 'email');
+		}
+		
 		return $sendmail;
 	}
 }
--- 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.
@ -273,9 +276,15 @@ abstract class ###Component###Helper
 		$db = JFactory::getDbo();
 		// Create a new query object.
 		$query = $db->getQuery(true);
-
-		$query->select($db->quoteName(array($what)));
-		$query->from($db->quoteName('#__'.$main.'_'.$table));
+		$query->select($db->quoteName(array($what)));		
+		if (empty($table))
+		{
+			$query->from($db->quoteName('#__'.$main));
+		}
+		else
+		{
+			$query->from($db->quoteName('#__'.$main.'_'.$table));
+		}
 		if (is_numeric($where))
 		{
 			$query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where);
@ -832,7 +841,7 @@ abstract class ###Component###Helper
 					$w .= ' ';
 					if($r < 100)
 					{
-						$word .= 'and ';
+						$w .= 'and ';
 					}
 					$w .= self::numberToString($r);
 				}
--- a/admin/compiler/joomla_3/JControllerLegacyAjax.php
+++ b/admin/compiler/joomla_3/JControllerLegacyAjax.php
@ -63,9 +63,9 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		}
                else
                {
-			if(array_key_exists('callback',$_GET))
+			if($callback = $jinput->get('callback', null, 'CMD'))
                        {
-				echo $_GET['callback']."(".json_encode(false).");";
+				echo $callback."(".json_encode(false).");";
 			}
                        else
                        {
--- a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php
+++ b/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php
@ -63,9 +63,9 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		}
                else
                {
-			if(array_key_exists('callback',$_GET))
+			if($callback = $jinput->get('callback', null, 'CMD')
                        {
-				echo $_GET['callback']."(".json_encode(false).");";
+				echo $callback."(".json_encode(false).");";
 			}
                        else
                        {
--- a/admin/compiler/joomla_3/JControllerLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JControllerLegacy_import_custom.php
@ -0,0 +1,70 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  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');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * ###Component### ###View### Controller
+ */
+class ###Component###Controller###View### extends JControllerLegacy
+{
+	/**
+	 * Import an spreadsheet.
+	 *
+	 * @return  void
+	 */
+	public function import()
+	{
+		// Check for request forgeries
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel('###View###');
+		if ($model->import())
+		{
+			$cache = JFactory::getCache('mod_menu');
+			$cache->clean();
+			// TODO: Reset the users acl here as well to kill off any missing bits
+		}
+
+		$app = JFactory::getApplication();
+		$redirect_url = $app->getUserState('com_###component###.redirect_url');
+		if (empty($redirect_url))
+		{
+			$redirect_url = JRoute::_('index.php?option=com_###component###&view=###view###', false);
+		}
+		else
+		{
+			// wipe out the user state when we're going to redirect
+			$app->setUserState('com_###component###.redirect_url', '');
+			$app->setUserState('com_###component###.message', '');
+			$app->setUserState('com_###component###.extension_message', '');
+		}
+		$this->setRedirect($redirect_url);
+	}
+}
--- 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
@ -0,0 +1,366 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  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');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * ###Component### ###View### Model
+ */
+class ###Component###Model###View### extends JModelLegacy
+{
+	/**
+	 * @var object JTable object
+	 */
+	protected $_table = null;
+
+	/**
+	 * @var object JTable object
+	 */
+	protected $_url = null;
+
+	/**
+	 * Model context string.
+	 *
+	 * @var        string
+	 */
+	protected $_context = 'com_###component###.###view###';
+	
+	/**
+	 * Import Settings
+	 */
+	protected $getType 	= NULL;
+	protected $dataType	= NULL;
+	
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 *
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('administrator');
+
+		$this->setState('message', $app->getUserState('com_###component###.message'));
+		$app->setUserState('com_###component###.message', '');
+
+		// Recall the 'Import from Directory' path.
+		$path = $app->getUserStateFromRequest($this->_context . '.import_directory', 'import_directory', $app->get('tmp_path'));
+		$this->setState('import.directory', $path);
+		// set uploading values
+		$this->use_streams = false;
+		$this->allow_unsafe = false;
+		$this->safeFileOptions = array();
+		parent::populateState();
+	}
+	###IMPORT_METHOD_CUSTOM### 
+
+	/**
+	 * Works out an importation spreadsheet from a HTTP upload
+	 *
+	 * @return spreadsheet definition or false on failure
+	 */
+	protected function _getPackageFromUpload()
+	{		
+		// Get the uploaded file information
+		$input    = JFactory::getApplication()->input;
+
+		// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
+		$userfile = $input->files->get('import_package', null, 'raw');
+		
+		// Make sure that file uploads are enabled in php
+		if (!(bool) ini_get('file_uploads'))
+		{
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTFILE'));
+			return false;
+		}
+
+		// If there is no uploaded file, we have a problem...
+		if (!is_array($userfile))
+		{
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_NO_FILE_SELECTED'));
+			return false;
+		}
+
+		// Check if there was a problem uploading the file.
+		if ($userfile['error'] || $userfile['size'] < 1)
+		{
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_WARNIMPORTUPLOADERROR'));
+			return false;
+		}
+
+		// Build the appropriate paths
+		$config		= JFactory::getConfig();
+		$tmp_dest	= $config->get('tmp_path') . '/' . $userfile['name'];
+		$tmp_src	= $userfile['tmp_name'];
+
+		// Move uploaded file
+		jimport('joomla.filesystem.file');
+		$p_file = JFile::upload($tmp_src, $tmp_dest, $this->use_streams, $this->allow_unsafe, $this->safeFileOptions);
+
+		// Was the package downloaded?
+		if (!$p_file)
+		{
+			$session = JFactory::getSession();
+			$session->clear('package');
+			$session->clear('dataType');
+			$session->clear('hasPackage');
+			// was not uploaded
+			return false;
+		}
+
+		// check that this is a valid spreadsheet
+		$package = $this->check($userfile['name']);
+
+		return $package;
+	}
+
+	/**
+	 * Import an spreadsheet from a directory
+	 *
+	 * @return  array  Spreadsheet details or false on failure
+	 *
+	 */
+	protected function _getPackageFromFolder()
+	{
+		$input = JFactory::getApplication()->input;
+
+		// Get the path to the package to import
+		$p_dir = $input->getString('import_directory');
+		$p_dir = JPath::clean($p_dir);
+		// Did you give us a valid path?
+		if (!file_exists($p_dir))
+		{
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'));
+			return false;
+		}
+
+		// Detect the package type
+		$type = $this->getType;
+
+		// Did you give us a valid package?
+		if (!$type)
+		{
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'));
+		}
+		
+		// check the extention
+		switch(strtolower(pathinfo($p_dir, PATHINFO_EXTENSION))){
+			case 'xls':
+			case 'ods':
+			case 'csv':
+			break;
+			
+			default:
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			return false;
+			break;
+		}
+		
+		$package['packagename'] = null;
+		$package['dir'] 		= $p_dir;
+		$package['type'] 		= $type;
+
+		return $package;
+	}
+
+	/**
+	 * Import an spreadsheet from a URL
+	 *
+	 * @return  Package details or false on failure
+	 *
+	 */
+	protected function _getPackageFromUrl()
+	{
+		$input = JFactory::getApplication()->input;
+
+		// Get the URL of the package to import
+		$url = $input->getString('import_url');
+
+		// Did you give us a URL?
+		if (!$url)
+		{
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_ENTER_A_URL'));
+			return false;
+		}
+
+		// Download the package at the URL given
+		$p_file = JInstallerHelper::downloadPackage($url);
+
+		// Was the package downloaded?
+		if (!$p_file)
+		{
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_INVALID_URL'));
+			return false;
+		}
+
+		// check that this is a valid spreadsheet
+		$package = $this->check($p_file);
+
+		return $package;
+	}
+	
+	/**
+	 * Check a file and verifies it as a spreadsheet file
+	 * Supports .csv .xlsx .xls and .ods
+	 *
+	 * @param   string  $p_filename  The uploaded package filename or import directory
+	 *
+	 * @return  array  of elements
+	 *
+	 */
+	protected function check($archivename)
+	{
+		// Clean the name
+		$archivename = JPath::clean($archivename);
+		
+		// check the extention
+		switch(strtolower(pathinfo($archivename, PATHINFO_EXTENSION))){
+			case 'xls':
+			case 'ods':
+			case 'csv':
+			break;
+			
+			default:
+			// Cleanup the import files
+			$this->remove($archivename);
+			JError::raiseWarning('', JText::_('COM_###COMPONENT###_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'));
+			return false;
+			break;
+		}	
+		
+		$config					= JFactory::getConfig();
+		// set Package Name
+		$check['packagename']	= $archivename;
+		
+		// set directory
+		$check['dir']		= $config->get('tmp_path'). '/' .$archivename;
+		
+		// set type
+		$check['type']		= $this->getType;
+		
+		return $check;
+	}
+	
+	/**
+	 * Clean up temporary uploaded spreadsheet
+	 *
+	 * @param   string  $package    Name of the uploaded spreadsheet file
+	 *
+	 * @return  boolean  True on success
+	 *
+	 */
+	protected function remove($package)
+	{
+		jimport('joomla.filesystem.file');
+		
+		$config		= JFactory::getConfig();
+		$package	= $config->get('tmp_path'). '/' .$package;
+
+		// Is the package file a valid file?
+		if (is_file($package))
+		{
+			JFile::delete($package);
+		}
+		elseif (is_file(JPath::clean($package)))
+		{
+			// It might also be just a base filename
+			JFile::delete(JPath::clean($package));
+		}
+	}
+	###IMPORT_SETDATE_METHOD_CUSTOM### 
+	###IMPORT_SAVE_METHOD_CUSTOM###
+	
+	protected function getAlias($name,$type = false)
+	{
+		// sanitize the name to an alias
+		if (JFactory::getConfig()->get('unicodeslugs') == 1)
+		{
+			$alias = JFilterOutput::stringURLUnicodeSlug($name);
+		}
+		else
+		{
+			$alias = JFilterOutput::stringURLSafe($name);
+		}
+		// must be a uniqe alias
+		if ($type)
+		{
+			return $this->getUniqe($alias,'alias',$type);
+		}
+		return $alias;
+	}
+	
+	/**
+	 * Method to generate a uniqe value.
+	 *
+	 * @param   string  $field name.
+	 * @param   string  $value data.
+	 * @param   string  $type table.
+	 *
+	 * @return  string  New value.
+	 */
+	protected function getUniqe($value,$field,$type)
+	{
+		// insure the filed is always uniqe
+		while (isset($this->uniqeValueArray[$type][$field][$value]))
+		{
+			$value = JString::increment($value, 'dash');
+		}
+		$this->uniqeValueArray[$type][$field][$value] = $value;
+		return $value;
+	}
+	
+	protected function getAliasesUsed($table)
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+		// first we check if there is a alias column
+		$columns = $db->getTableColumns('#__###component###_'.$table);
+		if(isset($columns['alias'])){
+			// Create a new query object.
+			$query = $db->getQuery(true);
+			$query->select($db->quoteName(array('alias')));
+			$query->from($db->quoteName('#__###component###_'.$table));
+			$db->setQuery($query);
+			$db->execute();
+			if ($db->getNumRows())
+			{
+				$aliases = $db->loadColumn();
+				foreach($aliases as $alias)
+				{
+					$this->uniqeValueArray[$table]['alias'][$alias] = $alias;
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+}
--- a/admin/compiler/joomla_3/JViewLegacy_edit.php
+++ b/admin/compiler/joomla_3/JViewLegacy_edit.php
@ -122,7 +122,7 @@ class ###Component###View###View### extends JViewLegacy
 		$document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
 		$document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###view###.css");###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
 		$document->addScript(JURI::root() . $this->script);
-		$document->addScript(JURI::root() . "administrator/components/com_###component###/views/###view###/submitbutton.js");
+		$document->addScript(JURI::root() . "administrator/components/com_###component###/views/###view###/submitbutton.js"); ###DOCUMENT_CUSTOM_PHP###
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/compiler/joomla_3/JViewLegacy_edit_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_edit_site.php
@ -131,7 +131,7 @@ class ###Component###View###View### extends JViewLegacy
 		$document->addStyleSheet(JURI::root()."components/com_###component###/assets/css/###view###.css");###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
 		// default javascript of this view
 		$document->addScript(JURI::root().$this->script);
-		$document->addScript(JURI::root(). "components/com_###component###/views/###view###/submitbutton.js");
+		$document->addScript(JURI::root(). "components/com_###component###/views/###view###/submitbutton.js"); ###DOCUMENT_CUSTOM_PHP###
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/compiler/joomla_3/JViewLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JViewLegacy_import_custom.php
@ -0,0 +1,61 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  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');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
+
+// import Joomla view library
+jimport('joomla.application.component.view');
+
+/**
+ * ###Component### ###View### View
+ */
+class ###Component###View###View### extends JViewLegacy
+{###IMPORT_DISPLAY_METHOD_CUSTOM###
+
+	/**
+	 * Setting the toolbar
+	 */
+	protected function addToolBar()
+	{
+		JToolBarHelper::title(JText::_('COM_###COMPONENT###_IMPORT_TITLE'), 'upload');
+		JHtmlSidebar::setAction('index.php?option=com_###component###&view=###view###');
+
+		if ($this->canDo->get('core.admin') || $this->canDo->get('core.options'))
+		{
+			JToolBarHelper::preferences('com_###component###');
+		}
+
+		// set help url for this view if found
+                $help_url = ###Component###Helper::getHelpUrl('###view###');
+                if (###Component###Helper::checkString($help_url))
+                {
+                       JToolbarHelper::help('COM_###COMPONENT###_HELP_MANAGER', false, $help_url);
+                }
+	}
+}
--- a/admin/compiler/joomla_3/ajax.json.php
+++ b/admin/compiler/joomla_3/ajax.json.php
@ -55,7 +55,8 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($user->id != 0 && $token == $call_token){
+		if($user->id != 0 && $token == $call_token)
+		{
 			$task = $this->getTask();
 			switch($task){
 				case 'fieldRequired':
@ -73,26 +74,37 @@ class ###Component###ControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET)){
-							echo $_GET['callback'] . "(".json_encode($result).");";
-						} else {
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						else
+						{
 							echo "(".json_encode($result).");";
 						}
 					}
-						catch(Exception $e)
+					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET)){
-							echo $_GET['callback']."(".json_encode($e).");";
-						} else {
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
 							echo "(".json_encode($e).");";
 						}
 					}
 				break;
 			}
-		} else {
-			if(array_key_exists('callback',$_GET)){
-				echo $_GET['callback']."(".json_encode(false).");";
-			} else {
+		}
+		else
+		{
+			if($callback = $jinput->get('callback', null, 'CMD'))
+			{
+				echo $callback."(".json_encode(false).");";
+			}
+			else
+			{
 				echo "(".json_encode(false).");";
 			}
 		}
--- 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_import_custom.php
+++ b/admin/compiler/joomla_3/default_import_custom.php
@ -0,0 +1,35 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  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');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('script', 'system/core.js', false, true);
+?>###IMPORT_DEFAULT_VIEW_CUSTOM###
--- 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/compiler/joomla_3/settings.json
+++ b/admin/compiler/joomla_3/settings.json
@ -465,6 +465,28 @@
          "rename": false,
          "type": "import"
        },
+        "JControllerLegacy_import_custom.php": {
+          "path": "c0mp0n3nt/admin/controllers",
+          "rename": "JControllerLegacy_import_custom",
+          "type": "customimport"
+        },
+        "JModelLegacy_import_custom.php": {
+          "path": "c0mp0n3nt/admin/models",
+          "rename": "JModelLegacy_import_custom",
+          "type": "customimport"
+        },
+        "JViewLegacy_import_custom.php": {
+          "path": "c0mp0n3nt/admin/views/VIEW",
+          "rename": "new",
+          "newName": "view.html.php",
+          "type": "customimport"
+        },
+        "default_import_custom.php": {
+          "path": "c0mp0n3nt/admin/views/VIEW/tmpl",
+          "rename": "new",
+          "newName": "default.php",
+          "type": "customimport"
+        },
        "JControllerLegacyHelp.php": {
          "path": "c0mp0n3nt/admin/controllers",
          "rename": "new",
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
@ -45,6 +45,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		// load the tasks 
 		$this->registerTask('tableColumns', 'ajax');
 		$this->registerTask('fieldSelectOptions', 'ajax');
+		$this->registerTask('getImportScripts', 'ajax');
 		$this->registerTask('layoutDetails', 'ajax');
 		$this->registerTask('templateDetails', 'ajax');
 		$this->registerTask('snippetDetails', 'ajax');
@ -80,9 +81,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -95,9 +96,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -118,9 +119,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -133,9 +134,47 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
+				case 'getImportScripts':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$typeValue = $jinput->get('type', NULL, 'WORD');
+						if($typeValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->getImportScripts($typeValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -156,9 +195,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -171,9 +210,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -194,9 +233,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -209,9 +248,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -232,9 +271,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -247,9 +286,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -271,9 +310,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -286,9 +325,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -309,9 +348,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -324,9 +363,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -349,9 +388,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -364,9 +403,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -389,9 +428,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -404,9 +443,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -427,9 +466,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						{
 							$result = false;
 						}
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback'] . "(".json_encode($result).");";
+							echo $callback . "(".json_encode($result).");";
 						}
 						elseif($returnRaw)
 						{
@ -442,9 +481,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 					}
 					catch(Exception $e)
 					{
-						if(array_key_exists('callback',$_GET))
+						if($callback = $jinput->get('callback', null, 'CMD'))
 						{
-							echo $_GET['callback']."(".json_encode($e).");";
+							echo $callback."(".json_encode($e).");";
 						}
 						else
 						{
@ -456,9 +495,9 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		}
                else
                {
-			if(array_key_exists('callback',$_GET))
+			if($callback = $jinput->get('callback', null, 'CMD'))
                        {
-				echo $_GET['callback']."(".json_encode(false).");";
+				echo $callback."(".json_encode(false).");";
 			}
                        else
                        {
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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;
 								}
 							}
@ -1002,82 +1011,52 @@ class Get
 			// setup linked views to global data sets
 			$this->linkedAdminViews[$name_single] = $linked_views_sorted;
 			unset($linked_views_sorted);
-			// add_javascript_view_file
-			if ($view->add_javascript_view_file == 1)
-			{
-				$view->javascript_view_file = base64_decode($view->javascript_view_file);
-				$this->customScriptBuilder['view_file'][$name_single] = $view->javascript_view_file;
-				if (strpos($view->javascript_view_file,"token") !== false && strpos($view->javascript_view_file,"task=ajax") !== false)
-				{
-					if (!$this->customScriptBuilder['token'][$name_single])
-					{
-						$this->customScriptBuilder['token'][$name_single] = true;
-					}
-				}
-				unset($view->javascript_view_file);
-			}
-			// add_javascript_view_footer
-			if ($view->add_javascript_view_footer == 1)
-			{
-				$view->javascript_view_footer = base64_decode($view->javascript_view_footer);
-				if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
-				{
-					$this->customScriptBuilder['view_footer'][$name_single] = '';
-				}
-				$this->customScriptBuilder['view_footer'][$name_single] .= $view->javascript_view_footer;
-				if (strpos($view->javascript_view_footer,"token") !== false && strpos($view->javascript_view_footer,"task=ajax") !== false)
-				{
-					if (!$this->customScriptBuilder['token'][$name_single])
-					{
-						$this->customScriptBuilder['token'][$name_single] = true;
-					}
-				}
-				unset($view->javascript_view_footer);
-			}
-			// add_javascript_view_file
-			if ($view->add_javascript_views_file == 1)
-			{
-				$view->javascript_views_file = base64_decode($view->javascript_views_file);
-				$this->customScriptBuilder['views_file'][$name_list] = $view->javascript_views_file;
-				if (strpos($view->javascript_views_file,"token") !== false && strpos($view->javascript_views_file,"task=ajax") !== false)
-				{
-					if (!$this->customScriptBuilder['token'][$name_list])
-					{
-						$this->customScriptBuilder['token'][$name_list] = true;
-					}
-				}
-				unset($view->javascript_views_file);
-			}
-			// add_javascript_views_footer
-			if ($view->add_javascript_views_footer == 1)
-			{
-				$view->javascript_views_footer = base64_decode($view->javascript_views_footer);
-				$this->customScriptBuilder['views_footer'][$name_list] .= $view->javascript_views_footer;
-				if (strpos($view->javascript_views_footer,"token") !== false && strpos($view->javascript_views_footer,"task=ajax") !== false)
-				{
-					if (!$this->customScriptBuilder['token'][$name_list])
-					{
-						$this->customScriptBuilder['token'][$name_list] = true;
-					}
-				}
-				unset($view->javascript_views_footer);
-			}
-			// add_css_view
-			if ($view->add_css_view == 1)
-			{
-				$this->customScriptBuilder['css_view'][$name_single] .= base64_decode($view->css_view);
-				unset($view->css_view);
-			}
-			// add_css_views
-			if ($view->add_css_views == 1)
-			{
-				$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($view->css_views);
-				unset($view->css_views);
-			}
-
+			// set the lang target
 			$this->lang = 'admin';
-			$addArray = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove');
-			foreach ($addArray as $scripter)
+			// add_javascript
+			$addArrayJ = array('javascript_view_file','javascript_view_footer','javascript_views_file','javascript_views_footer');
+			foreach ($addArrayJ as $scripter)
+			{
+				if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
+				{
+					$view->$scripter = $this->setCustomContentLang(base64_decode($view->$scripter));
+					$scripter_target = str_replace('javascript_', '', $scripter);
+					if (!isset($this->customScriptBuilder[$scripter_target][$name_single]))
+					{
+						if (!isset($this->customScriptBuilder[$scripter_target]))
+						{
+							$this->customScriptBuilder[$scripter_target] = array();
+						}
+						$this->customScriptBuilder[$scripter_target][$name_single] = '';
+					}
+					$this->customScriptBuilder[$scripter_target][$name_single] .= $view->$scripter;
+					if (strpos($view->$scripter,"token") !== false && strpos($view->$scripter,"task=ajax") !== false)
+					{
+						if (!$this->customScriptBuilder['token'][$name_single])
+						{
+							$this->customScriptBuilder['token'][$name_single] = true;
+						}
+					}
+					unset($view->$scripter);
+				}
+			}
+			// add_css
+			$addArrayC = array('css_view', 'css_views');
+			foreach ($addArrayC as $scripter)
+			{
+				if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
+				{
+					if (!isset($this->customScriptBuilder[$scripter][$name_single]))
+					{
+						$this->customScriptBuilder[$scripter][$name_single] = '';
+					}
+					$this->customScriptBuilder[$scripter][$name_single] .= base64_decode($view->$scripter);
+					unset($view->$scripter);
+				}
+			}
+			// add_php
+			$addArrayP = array('php_getitem','php_save','php_postsavehook','php_getitems','php_getlistquery','php_allowedit','php_before_delete','php_after_delete','php_batchcopy','php_batchmove','php_document');
+			foreach ($addArrayP as $scripter)
 			{
 				if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1)
 				{
@ -1085,9 +1064,23 @@ class Get
 					unset($view->$scripter);
 				}
 			}
-
+			
+			// set custom import scripts
+			if (isset($view->add_custom_import) && $view->add_custom_import == 1)
+			{
+				$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)
+					{
+						$this->customScriptBuilder[$importScripter]['import_'.$name_list] = $this->setCustomContentLang(base64_decode($view->$importScripter));
+						unset($view->$importScripter);
+					}
+				}
+			}
+			
 			// 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])
@ -1114,16 +1107,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)
@ -1289,10 +1286,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);
 		}
@ -1354,125 +1356,132 @@ class Get

 			// Reset the query using our newly populated query object.
 			$db->setQuery($query);
-
-			// Load the results as a list of stdClass objects (see later for more options on retrieving data).
-			$field = $db->loadObject();
-			
-			// adding a fix for the changed name of type to fieldtype
-			$field->type = $field->fieldtype;
-
-			// load the values form params
-			$field->xml = json_decode($field->xml);
-
-			// load the type values form type params
-			$properties = json_decode($field->type_properties,true);
-			unset($field->type_properties);
-
-			if (ComponentbuilderHelper::checkArray($properties))
+			$db->execute();
+			if ($db->getNumRows())
 			{
-				foreach ($properties as $option => $values)
+				// Load the results as a list of stdClass objects (see later for more options on retrieving data).
+				$field = $db->loadObject();
+
+				// adding a fix for the changed name of type to fieldtype
+				$field->type = $field->fieldtype;
+
+				// load the values form params
+				$field->xml = json_decode($field->xml);
+
+				// load the type values form type params
+				$properties = json_decode($field->type_properties,true);
+				unset($field->type_properties);
+
+				if (ComponentbuilderHelper::checkArray($properties))
 				{
-					foreach ($values as $nr => $value)
+					foreach ($properties as $option => $values)
 					{
-						$field->properties[$nr][$option] = $value;
-					}
-				}
-			}
-			// check if we have advanced encryption
-			if (4 == $field->store &&  (!isset($this->advancedEncryption) || !$this->advancedEncryption))
-			{
-				 $this->advancedEncryption = true;
-			}
-			// check if we have basic encryption
-			elseif (3 == $field->store &&  (!isset($this->basicEncryption) || !$this->basicEncryption))
-			{
-				 $this->basicEncryption = true;
-			}
-
-			// check if we should load scripts for single view
-			if (ComponentbuilderHelper::checkString($name_single) && !isset($this->customFieldScript[$name_single][$id]))
-			{
-				// add_javascript_view_footer
-				if ($field->add_javascript_view_footer == 1)
-				{
-					if(!isset($this->customScriptBuilder['view_footer']))
-					{
-						$this->customScriptBuilder['view_footer'] = array();
-					}
-					if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
-					{
-						$this->customScriptBuilder['view_footer'][$name_single] = '';
-					}
-					$this->customScriptBuilder['view_footer'][$name_single] .= "\n".$this->setCustomContentLang(base64_decode($field->javascript_view_footer));
-					if (strpos($field->javascript_view_footer,"token") !== false && strpos($field->javascript_view_footer,"task=ajax") !== false)
-					{
-						if (!isset($this->customScriptBuilder['token'][$name_single]) || !$this->customScriptBuilder['token'][$name_single])
+						foreach ($values as $nr => $value)
 						{
-							if(!isset($this->customScriptBuilder['token']))
-							{
-								$this->customScriptBuilder['token'] = array();
-							}
-							$this->customScriptBuilder['token'][$name_single] = true;
+							$field->properties[$nr][$option] = $value;
 						}
 					}
-					unset($field->javascript_view_footer);
+				}
+				// check if we have advanced encryption
+				if (4 == $field->store &&  (!isset($this->advancedEncryption) || !$this->advancedEncryption))
+				{
+					 $this->advancedEncryption = true;
+				}
+				// check if we have basic encryption
+				elseif (3 == $field->store &&  (!isset($this->basicEncryption) || !$this->basicEncryption))
+				{
+					 $this->basicEncryption = true;
 				}

-				// add_css_view
-				if ($field->add_css_view == 1)
+				// check if we should load scripts for single view
+				if (ComponentbuilderHelper::checkString($name_single) && !isset($this->customFieldScript[$name_single][$id]))
 				{
-					if (!isset($this->customScriptBuilder['css_view'][$name_single]))
+					// add_javascript_view_footer
+					if ($field->add_javascript_view_footer == 1)
 					{
-						$this->customScriptBuilder['css_view'][$name_single] = '';
+						if (!isset($this->customScriptBuilder['view_footer'][$name_single]))
+						{
+							if(!isset($this->customScriptBuilder['view_footer']))
+							{
+								$this->customScriptBuilder['view_footer'] = array();
+							}
+							$this->customScriptBuilder['view_footer'][$name_single] = '';
+						}
+						$this->customScriptBuilder['view_footer'][$name_single] .= "\n".$this->setCustomContentLang(base64_decode($field->javascript_view_footer));
+						if (strpos($field->javascript_view_footer,"token") !== false && strpos($field->javascript_view_footer,"task=ajax") !== false)
+						{
+							if (!isset($this->customScriptBuilder['token'][$name_single]) || !$this->customScriptBuilder['token'][$name_single])
+							{
+								if(!isset($this->customScriptBuilder['token']))
+								{
+									$this->customScriptBuilder['token'] = array();
+								}
+								$this->customScriptBuilder['token'][$name_single] = true;
+							}
+						}
+						unset($field->javascript_view_footer);
 					}
-					$this->customScriptBuilder['css_view'][$name_single] .= "\n".base64_decode($field->css_view);
+
+					// add_css_view
+					if ($field->add_css_view == 1)
+					{
+						if (!isset($this->customScriptBuilder['css_view'][$name_single]))
+						{
+							$this->customScriptBuilder['css_view'][$name_single] = '';
+						}
+						$this->customScriptBuilder['css_view'][$name_single] .= "\n".base64_decode($field->css_view);
+						unset($field->css_view);
+					}
+
+					// add this only once to view.
+					$this->customFieldScript[$name_single][$id] = true;
+				}
+				else
+				{
+					// unset if not needed
+					unset($field->javascript_view_footer);
 					unset($field->css_view);
 				}
-
-				// add this only once to view.
-				$this->customFieldScript[$name_single][$id] = true;
-			}
-			else
-			{
-				// unset if not needed
-				unset($field->javascript_view_footer);
-				unset($field->css_view);
-			}
-			// check if we should load scripts for list views
-			if (ComponentbuilderHelper::checkString($name_list))
-			{
-				// add_javascript_views_footer
-				if ($field->add_javascript_views_footer == 1)
+				// check if we should load scripts for list views
+				if (ComponentbuilderHelper::checkString($name_list))
 				{
-					$this->customScriptBuilder['views_footer'][$name_list] .= $this->setCustomContentLang(base64_decode($field->javascript_views_footer));
-					if (strpos($field->javascript_views_footer,"token") !== false && strpos($field->javascript_views_footer,"task=ajax") !== false)
+					// add_javascript_views_footer
+					if ($field->add_javascript_views_footer == 1)
 					{
-						if (!$this->customScriptBuilder['token'][$name_list])
+						$this->customScriptBuilder['views_footer'][$name_list] .= $this->setCustomContentLang(base64_decode($field->javascript_views_footer));
+						if (strpos($field->javascript_views_footer,"token") !== false && strpos($field->javascript_views_footer,"task=ajax") !== false)
 						{
-							$this->customScriptBuilder['token'][$name_list] = true;
+							if (!$this->customScriptBuilder['token'][$name_list])
+							{
+								$this->customScriptBuilder['token'][$name_list] = true;
+							}
 						}
+						unset($field->javascript_views_footer);
 					}
-					unset($field->javascript_views_footer);
-				}
-				// add_css_views
-				if ($field->add_css_views == 1)
-				{
-					if (!isset($this->customScriptBuilder['css_views'][$name_list]))
+					// add_css_views
+					if ($field->add_css_views == 1)
 					{
-						$this->customScriptBuilder['css_views'][$name_list] = '';
+						if (!isset($this->customScriptBuilder['css_views'][$name_list]))
+						{
+							$this->customScriptBuilder['css_views'][$name_list] = '';
+						}
+						$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($field->css_views);
+						unset($field->css_views);
 					}
-					$this->customScriptBuilder['css_views'][$name_list] .= base64_decode($field->css_views);
-					unset($field->css_views);
 				}
+				else
+				{
+					// unset if not needed
+					unset($field->javascript_views_footer);
+					unset($field->css_views);
+
+				}
+				$this->_fieldData[$id] = $field;
 			}
 			else
 			{
-				// unset if not needed
-				unset($field->javascript_views_footer);
-				unset($field->css_views);
-
+				return false;
 			}
-			$this->_fieldData[$id] = $field;
 		}
 		// return the found field data
 		return $this->_fieldData[$id];
@ -1985,9 +1994,11 @@ class Get
 	 */
 	public function setCustomContentLang($content)
 	{
+		// insure string is not broken
+		$content = str_replace('COM_###COMPONENT###',$this->langPrefix,$content);
 		// set language data
-		$langCheck[] = ComponentbuilderHelper::getAllBetween($content, "JText::_('","')");
-		$langCheck[] = ComponentbuilderHelper::getAllBetween($content, 'JText::_("','")');
+		$langCheck[] = ComponentbuilderHelper::getAllBetween($content, "JText::_('","'");
+		$langCheck[] = ComponentbuilderHelper::getAllBetween($content, 'JText::_("','"');
 		$langCheck[] = ComponentbuilderHelper::getAllBetween($content, "JText::sprintf('","'");
 		$langCheck[] = ComponentbuilderHelper::getAllBetween($content, 'JText::sprintf("','"');
 		$langHolders = array();
@ -2003,6 +2014,7 @@ class Get
 		{
 			foreach ($lang as $string)
 			{
+				// this is there to insure we dont break already added Language strings
 				if (ComponentbuilderHelper::safeString($string,'U') == $string)
 				{
 					continue;
--- 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
@ -564,92 +655,104 @@ class Fields extends Structure
 	 */
 	public function setDynamicField(&$field, &$view, &$viewType, &$langView, &$viewName, &$listViewName, &$spacerCounter, &$placeholders, &$dbkey, $build)
 	{
-		$name = ComponentbuilderHelper::safeString($field['settings']->name);
-		$typeName = ComponentbuilderHelper::safeString($field['settings']->type_name);
-		$multiple = false;
-		$langLabel = '';
-		$taber = '';
-		$fieldSet = '';
-		// set field attributes
-		$fieldAttributes = $this->setFieldAttributes($field, $viewType, $name, $typeName, $multiple, $langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders);
-		// check if values were set
-		if (ComponentbuilderHelper::checkArray($fieldAttributes))
+		if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']))
 		{
-			if ($this->defaultField($typeName, 'option'))
+			$name = ComponentbuilderHelper::safeString($field['settings']->name);
+			$typeName = ComponentbuilderHelper::safeString($field['settings']->type_name);
+			$multiple = false;
+			$langLabel = '';
+			$taber = '';
+			$fieldSet = '';
+			// set field attributes
+			$fieldAttributes = $this->setFieldAttributes($field, $viewType, $name, $typeName, $multiple, $langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders);
+			// check if values were set
+			if (ComponentbuilderHelper::checkArray($fieldAttributes))
 			{
-				//reset options array
-				$optionArray = array();
-				// now add to the field set
-				$fieldSet .= $this->setField('option', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
-				if ($build)
+				// set the array of field names
+				$this->setFieldsNames($viewName,$fieldAttributes['name']);
+
+				if ($this->defaultField($typeName, 'option'))
 				{
-					// set builders
-					$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, false, $optionArray);
-				}
-			}
-			elseif ($this->defaultField($typeName, 'plain'))
-			{
-				if ($build)
-				{
-					// set builders
-					$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple);
-				}
-				// now add to the field set
-				$fieldSet .= $this->setField('plain', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
-			}
-			elseif ($this->defaultField($typeName, 'spacer'))
-			{
-				if ($build)
-				{
-					// make sure spacers gets loaded to layout
-					$tabName = '';
-					if (isset($view['settings']->tabs) && isset($view['settings']->tabs[(int) $field['tab']]))
+					//reset options array
+					$optionArray = array();
+					// now add to the field set
+					$fieldSet .= $this->setField('option', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
+					if ($build)
 					{
-						$tabName = $view['settings']->tabs[(int) $field['tab']];
+						// set builders
+						$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, false, $optionArray);
 					}
-					$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 				}
-				// now add to the field set
-				$fieldSet .= $this->setField('spacer', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
-				// increment spacer counter
-				if ($typeName == 'spacer')
-				{
-					$spacerCounter++;
-				}
-			}
-			elseif ($this->defaultField($typeName, 'special'))
-			{
-				// set the repeatable field
-				if ($typeName == 'repeatable')
+				elseif ($this->defaultField($typeName, 'plain'))
 				{
 					if ($build)
 					{
 						// set builders
-						$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, false);
+						$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple);
 					}
 					// now add to the field set
-					$fieldSet .= $this->setField('special', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
+					$fieldSet .= $this->setField('plain', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
 				}
-			}
-			elseif (ComponentbuilderHelper::checkArray($fieldAttributes['custom']))
-			{
-				// set the custom array
-				$custom = $fieldAttributes['custom'];
-				unset($fieldAttributes['custom']);
-				// set db key
-				$custom['db'] = $dbkey;
-				// increment the db key
-				$dbkey++;
-				if ($build)
+				elseif ($this->defaultField($typeName, 'spacer'))
 				{
-					// set builders
-					$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, $custom);
+					if ($build)
+					{
+						// make sure spacers gets loaded to layout
+						$tabName = '';
+						if (isset($view['settings']->tabs) && isset($view['settings']->tabs[(int) $field['tab']]))
+						{
+							$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
+					$fieldSet .= $this->setField('spacer', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
+					// increment spacer counter
+					if ($typeName == 'spacer')
+					{
+						$spacerCounter++;
+					}
+				}
+				elseif ($this->defaultField($typeName, 'special'))
+				{
+					// set the repeatable field
+					if ($typeName == 'repeatable')
+					{
+						if ($build)
+						{
+							// set builders
+							$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, false);
+						}
+						// now add to the field set
+						$fieldSet .= $this->setField('special', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
+					}
+				}
+				elseif (ComponentbuilderHelper::checkArray($fieldAttributes['custom']))
+				{
+					// set the custom array
+					$custom = $fieldAttributes['custom'];
+					unset($fieldAttributes['custom']);
+					// set db key
+					$custom['db'] = $dbkey;
+					// increment the db key
+					$dbkey++;
+					if ($build)
+					{
+						// set builders
+						$this->setBuilders($langLabel, $langView, $viewName, $listViewName, $name, $view, $field, $typeName, $multiple, $custom);
+					}
+					// now add to the field set
+					$fieldSet .= $this->setField('custom', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
 				}
-				// now add to the field set
-				$fieldSet .= $this->setField('custom', $taber, $fieldAttributes, $name, $typeName, $langView, $viewName, $listViewName, $placeholders, $optionArray);
 			}
+			return $fieldSet;
 		}
-		return $fieldSet;
+		return '';
 	}

 	/**
@ -908,7 +1011,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 +1023,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 +1057,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 +1470,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 +1544,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 +1568,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 +1630,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 +1724,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 +1846,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
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@ -32,7 +32,10 @@ defined('_JEXEC') or die('Restricted access');
 */
 class Infusion extends Interpretation
 {
-	
+
+	public $eximportView = array();
+	public $importCustomScripts = array();
+
 	/**
 	 * Constructor
 	 */
@ -42,7 +45,7 @@ class Infusion extends Interpretation
 		if (parent::__construct($config))
 		{
 			// infuse the data into the structure
-			return $this->buildFileContent();		
+			return $this->buildFileContent();
 		}
 		return false;
 	}
@ -192,15 +195,6 @@ class Infusion extends Interpretation
 						$site_edit_view_array[] = "\t\t\t\t'".$viewName_single."'";
 						$this->lang = 'both';
 					}
-					// set the export/import option
-					if ($view['port'])
-					{
-						$this->eximportView[$viewName_list] = true;
-					}
-					else
-					{
-						$this->eximportView[$viewName_list] = false;
-					}
 					// check if help is being loaded
 					$this->checkHelp($viewName_single);
 					// set custom admin view list links
@ -227,6 +221,8 @@ class Infusion extends Interpretation

 						// set some place holder for the views
 						$this->placeholders['###view###'] = $viewName_single;
+						$this->placeholders['###VIEW###'] = $viewName_u;
+						$this->placeholders['###View###'] = $viewName_f;
 						
 						// set license per view if needed
 						$this->setLockLicensePer($viewName_single);
@ -245,7 +241,7 @@ class Infusion extends Interpretation
 						$this->fileContentDynamic[$viewName_single]['###ADDTOOLBAR###'] = $this->setAddToolBar($view);

 						// set the script for this view
-						$this->buildTheViewScript($view, $this->fileContentStatic['###component###']);
+						$this->buildTheViewScript($view);

 						// ###VIEW_SCRIPT###
 						$this->fileContentDynamic[$viewName_single]['###VIEW_SCRIPT###'] = $this->setViewScript($viewName_single);
@ -255,7 +251,20 @@ class Infusion extends Interpretation

 						// ###AJAXTOKE### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$viewName_single]['###AJAXTOKE###'] = $this->setAjaxToke($viewName_single);
-
+						
+						if (isset($this->customScriptBuilder['php_document'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single]))
+						{
+							// ###DOCUMENT_CUSTOM_PHP### <<<DYNAMIC>>>
+							$this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] 
+								= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_document'][$viewName_single]);
+							// clear some memory
+							unset($this->customScriptBuilder['php_document'][$viewName_single]);
+						}
+						else
+						{
+							$this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] = '';
+						}
+						
 						// ###LINKEDVIEWTABLESCRIPTS### <<<DYNAMIC>>>
 						$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = '';

@ -264,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);
@ -336,6 +348,24 @@ class Infusion extends Interpretation

 						// set some place holder for the views
 						$this->placeholders['###views###'] = $viewName_list;
+						$this->placeholders['###VIEWS###'] = $viewsName_u;
+						$this->placeholders['###Views###'] = $viewsName_f;
+						
+						// set the export/import option
+						if ($view['port'])
+						{
+							$this->eximportView[$viewName_list] = true;
+							if (1 == $view['settings']->add_custom_import)
+							{
+								// this view has custom import scripting
+								$this->importCustomScripts[$viewName_list] = true;
+								$this->setImportCustomScripts($viewName_list);
+							}
+						}
+						else
+						{
+							$this->eximportView[$viewName_list] = false;
+						}

 						// set Autocheckin function
 						if ($view['checkin'] == 1)
@ -446,6 +476,9 @@ class Infusion extends Interpretation

 					// ###MODEL_BATCH_MOVE### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###MODEL_BATCH_MOVE###'] = $this->setBatchMove($viewName_single);
+					
+					// ###BATCH_ONCLICK_CANCEL_SCRIPT### <<<DYNAMIC>>>
+					$this->fileContentDynamic[$viewName_list]['###BATCH_ONCLICK_CANCEL_SCRIPT###'] = ''; // TODO <-- must still be build

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

-	@version		2.1.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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)
@ -650,9 +657,15 @@ abstract class ComponentbuilderHelper
 		$db = JFactory::getDbo();
 		// Create a new query object.
 		$query = $db->getQuery(true);
-
 		$query->select($db->quoteName(array($what)));
-		$query->from($db->quoteName('#__'.$main.'_'.$table));
+		if (empty($table))
+		{
+			$query->from($db->quoteName('#__'.$main));
+		}
+		else
+		{
+			$query->from($db->quoteName('#__'.$main.'_'.$table));
+		}
 		if (is_numeric($where))
 		{
 			$query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where);
@ -710,31 +723,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;
        }
@ -1389,7 +1404,7 @@ abstract class ComponentbuilderHelper
 					$w .= ' ';
 					if($r < 100)
 					{
-						$word .= 'and ';
+						$w .= 'and ';
 					}
 					$w .= self::numberToString($r);
 				}
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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"
@ -72,6 +73,12 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW="Add Css View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS="Add Css Views"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEWS_LABEL="Add CSS (views)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CSS_VIEW_LABEL="Add CSS (view)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_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"
@ -92,6 +99,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE="Add Php Batchmove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL="Add PHP (batchMove Method)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE="Add Php Before Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL="Add PHP (script - before delete)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEM="Add Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS="Add Php Getitems"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL="Add PHP (getItems Method)"
@ -128,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"
@ -141,6 +150,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS_LABEL="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_HINT="// CSS for the edit view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW_LABEL="CSS"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM_IMPORT="Custom Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT="Add Description Here"
@ -159,6 +169,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_FLOAT="FLOAT"
 COM_COMPONENTBUILDER_ADMIN_VIEW_FULL_WIDTH_IN_TAB="Full Width in Tab"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HIDE="Hide"
 COM_COMPONENTBUILDER_ADMIN_VIEW_HTML="HTML"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW="Html Import View"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION="Add your HTML & PHP here! [Use <?php echo $name; ?> for PHP]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT="// The HTML for the view of your custom import method."
+COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL="HTML & PHP (view)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ICON="Icon"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD="Icon Add"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION="Must be 128px x 128px and a png format.."
@ -224,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"
@ -238,6 +256,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_HINT="Single Record Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL="Name (single record)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NEW="A New Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NO="No"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION="<p>The scripts that are automatic added to the input fields below is identical to the default import scripts used. Adapt them to your own custom needs.</p>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL="Advanced notice."
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION="<p>Please do not change this area unless you would like to add special import to this view that goes beyond the default import concept that Component Builder already does automatic if this view is set to have import & export in the component area where this view is linked to the component.</p>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL="Beginners notice."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_CONDITIONS_DESCRIPTION="Here you can add conditional field settings"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_CONDITIONS_LABEL="Condition Implementation"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions."
@ -284,6 +306,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE="Php Before Delete"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_HINT="// PHP Here that should run in the delete Method before items are deleted. Array $pks  is an array of record primary keys."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL="PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT="Php Document"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="PHP script to the document method."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT="// add custom PHP script to the document method."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="Custom Script (Document)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM="Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS="Php Getitems"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
@ -296,6 +322,22 @@ 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"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL="Save Method PHP"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA="Php Import Setdata"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT="// PHP Here that should run in the setData Method, $package,$table,$target_headers"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL="setData Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK="Php Postsavehook"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_HINT="// PHP Here that should run in the postSaveHook Method (object) $model is the data model object and (array) $validData is the validated data."
@ -308,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."
@ -435,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)"
@ -544,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"
@ -588,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"
@ -700,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"
@ -961,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"
@ -1064,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"
@ -1187,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"
@ -1301,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"
@ -1542,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"
@ -1632,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"
@ -1760,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"
@ -1863,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"
@ -1881,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"
@ -1921,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]"
@ -1983,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"
@ -2034,6 +2102,7 @@ COM_COMPONENTBUILDER_FIELD_STORE_DESCRIPTION="How should the data be stored."
 COM_COMPONENTBUILDER_FIELD_STORE_LABEL="Store Method"
 COM_COMPONENTBUILDER_FIELD_TEN="10"
 COM_COMPONENTBUILDER_FIELD_TEXT="TEXT"
+COM_COMPONENTBUILDER_FIELD_TIME="TIME"
 COM_COMPONENTBUILDER_FIELD_TINYINT="TINYINT"
 COM_COMPONENTBUILDER_FIELD_TWO_HUNDRED_AND_FIFTY_FIVE="255"
 COM_COMPONENTBUILDER_FIELD_TWO_THOUSAND_AND_FORTY_EIGHT="2048"
@ -2100,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."
@ -2120,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"
@ -2253,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"
@ -2274,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"
@ -2441,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"
@ -2567,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"
@ -2779,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"
@ -2798,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"
@ -2891,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"
@ -2909,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/language/en-GB/en-GB.com_componentbuilder.sys.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
@ -1,4 +1,4 @@
-COM_COMPONENTBUILDER="Component Builder Configuration"
+COM_COMPONENTBUILDER="Component Builder"
 COM_COMPONENTBUILDER_CONFIGURATION="Component Builder Configuration"
 COM_COMPONENTBUILDER_MENU="&#187; Component Builder"
 COM_COMPONENTBUILDER_MENU_ADMIN_VIEWS="Admin Views"
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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
@ -0,0 +1,56 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.1.14
+	@build			27th June, 2016
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		custom_import_fullwidth.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'note_beginner_import',
+	'note_advanced_import',
+	'add_custom_import',
+	'php_import_display',
+	'html_import_view',
+	'php_import',
+	'php_import_setdata',
+	'php_import_save'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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->vwzfields;
+$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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
@ -53,7 +53,9 @@ $fields = $displayData->get('fields') ?: array(
 	'add_php_before_delete',
 	'php_before_delete',
 	'add_php_after_delete',
-	'php_after_delete'
+	'php_after_delete',
+	'add_php_document',
+	'php_document'
 );

 ?>
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@ -10,8 +10,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		2.1.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th 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.3
-	@build			22nd April, 2016
+	@version		2.1.14
+	@build			27th June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Llewellyn van der Merwe	5567ca6856	New Release	2016-06-27 12:12:29 +01:00
Llewellyn van der Merwe	7546e9aceb	New Release	2016-06-27 12:05:53 +01:00
Llewellyn van der Merwe	f09fd06ddc	Removed $_GET from all callback response and used JInput instead	2016-06-24 15:23:01 +01:00
Llewellyn van der Merwe	2004b8d91c	Made some improvements to the compiler and extended the email helper features.	2016-06-23 16:05:37 +01:00
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
Llewellyn van der Merwe	e7572e0557	Bug fix in the custom import option.	2016-05-04 06:11:32 +01:00
Llewellyn van der Merwe	6b70aa45e6	Added the option to customize the import of data per view.	2016-05-04 05:53:33 +01:00
Llewellyn van der Merwe	951e0c1f5d	added another data type to fields called TIME.	2016-05-02 16:20:07 +01:00
Llewellyn van der Merwe	57bf464111	Added another field to admin_view to add custom script to document method of component admin views.	2016-04-22 22:32:02 +01:00