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.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.1.10)
+# Component Builder (2.1.11)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -32,12 +32,12 @@ Would you require more help please open and issue here on [gitHub today](https:/
 + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io)
 + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 31st May, 2016
++ *Last Build*: 2nd June, 2016
-+ *Version*: 2.1.10
++ *Version*: 2.1.11
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **82957**
++ *Line count*: **83090**
-+ *File count*: **503**
++ *File count*: **504**
 + *Folder count*: **99**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css

admin/assets/css/admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.css

admin/assets/css/custom_admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css

admin/assets/css/custom_admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/dynamic_get.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css

admin/assets/css/dynamic_gets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css

admin/assets/css/field.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/fieldtype.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css

admin/assets/css/fieldtypes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css

admin/assets/css/help_document.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.css

admin/assets/css/help_documents.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/assets/css/site_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.css

admin/assets/css/site_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css

admin/assets/css/snippet.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css

admin/assets/css/snippets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css

admin/assets/css/template.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css

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.';

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php

admin/controllers/custom_admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php

admin/controllers/custom_admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php

admin/controllers/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/fieldtype.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php

admin/controllers/snippet.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php

admin/controllers/snippets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php

admin/controllers/template.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php

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_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_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was created.";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created by";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_LABEL'] = "Modified Date";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created the " . $view['settings']->name_single . ".";
+			$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. -->";
+				// metakey
-				$fieldSet .= "\n\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t" . '<fieldset name="vdmmetadata"';
+				$fieldSet[] = "\t\t<field";
-				$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				$fieldSet[] = "\t\t\t" . 'name="metakey"';
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
+				$fieldSet[] = "\t\t\t" . 'type="textarea"';
-				$fieldSet .= "\n\t\t\t" . '<field name="robots"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_META_KEYWORDS_LABEL"';
-				$fieldSet .= "\n\t\t\t\t" . 'type="list"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_META_KEYWORDS_DESC"';
-				$fieldSet .= "\n\t\t\t\t" . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'rows="3"';
-				$fieldSet .= "\n\t\t\t\t" . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
+				$fieldSet[] = "\t\t\t" . 'cols="30"';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="">JGLOBAL_USE_GLOBAL</option>';
+				$fieldSet[] = "\t\t/>";
-				$fieldSet .= "\n\t\t\t\t" . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
+				// metadesc
-				$fieldSet .= "\n\t\t\t\t" . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t\t\t" . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t<field";
-				$fieldSet .= "\n\t\t\t\t" . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t" . 'name="metadesc"';
-				$fieldSet .= "\n\t\t\t" . '</field>';
+				$fieldSet[] = "\t\t\t" . 'type="textarea"';
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_META_DESCRIPTION_LABEL"';
-				$fieldSet .= "\n\t\t\t" . '<field name="author"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_META_DESCRIPTION_DESC"';
-				$fieldSet .= "\n\t\t\t\t" . 'type="text"';
+				$fieldSet[] = "\t\t\t" . 'rows="3"';
-				$fieldSet .= "\n\t\t\t\t" . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
+				$fieldSet[] = "\t\t\t" . 'cols="30"';
-				$fieldSet .= "\n\t\t\t\t" . 'size="20"';
+				$fieldSet[] = "\t\t/>";
-				$fieldSet .= "\n\t\t\t/>";
+			}
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
+			// load the dynamic fields now
-				$fieldSet .= "\n\t\t\t" . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
+			if (ComponentbuilderHelper::checkString($dynamcfields))
-				$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[] = "\t\t<!--" . $this->setLine(__LINE__) . " Dynamic Fields. -->" . $dynamcfields;
-				$fieldSet .= "\n\t\t\t/>";
+			}
-				$fieldSet .= "\n\t\t</fieldset>";
+			// close fieldset
-				$fieldSet .= "\n\t</fields>";
+			$fieldSet[] = "\t</fieldset>";
+			// check if metadata is added to this view
+			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
+			{
+				$fieldSet[] = "\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
+				$fieldSet[] = "\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				$fieldSet[] = "\t\t" . '<fieldset name="vdmmetadata"';
+				$fieldSet[] = "\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				// robots
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="robots"';
+				$fieldSet[] = "\t\t\t\t" . 'type="list"';
+				$fieldSet[] = "\t\t\t\t" . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
+				$fieldSet[] = "\t\t\t\t" . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
+				$fieldSet[] = "\t\t\t\t" . '<option value="">JGLOBAL_USE_GLOBAL</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t" . '</field>';
+				// author
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="author"';
+				$fieldSet[] = "\t\t\t\t" . 'type="text"';
+				$fieldSet[] = "\t\t\t\t" . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
+				$fieldSet[] = "\t\t\t\t" . 'size="20"';
+				$fieldSet[] = "\t\t\t/>";
+				// rights
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
+				$fieldSet[] = "\t\t\t\t" . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
+				$fieldSet[] = "\t\t\t\t" . 'cols="30" rows="2"';
+				$fieldSet[] = "\t\t\t/>";
+				$fieldSet[] = "\t\t</fieldset>";
+				$fieldSet[] = "\t</fields>";
 			}
 			// retunr the set
-			return $fieldSet;
+			return implode("\n", $fieldSet);
 		}
 		return '';
 	}
+		
+	/**
+	 * set Field Names
+	 * 
+	 * @param   string   $view    View the field belongs to
+	 * @param   string    $name    The name of the field
+	 *
+	 * 
+	 */
+	public function setFieldsNames(&$view, &$name)
+	{
+		$this->fieldsNames[$view][$name] = $name;
+	}
 
 	/**
 	 * set Dynamic field
@@ -575,6 +666,9 @@ class Fields extends Structure
 		// check if values were set
 		if (ComponentbuilderHelper::checkArray($fieldAttributes))
 		{
+			// set the array of field names
+			$this->setFieldsNames($viewName,$fieldAttributes['name']);
+			
 			if ($this->defaultField($typeName, 'option'))
 			{
 				//reset options array
@@ -607,6 +701,11 @@ class Fields extends Structure
 					{
 						$tabName = $view['settings']->tabs[(int) $field['tab']];
 					}
+					elseif ((int) $field['tab'] == 15)
+					{
+						// set to publishing tab
+						$tabName = 'publishing';
+					}
 					$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 				}
 				// now add to the field set
@@ -908,7 +1007,7 @@ class Fields extends Structure
 	 */
 	public function setLayoutBuilder(&$viewName,&$tabName,&$name,&$field)
 	{
-		if (ComponentbuilderHelper::checkString($tabName))
+		if (ComponentbuilderHelper::checkString($tabName) && $tabName != 'publishing')
 		{
 			$this->tabCounter[$viewName][(int) $field['tab']] = $tabName;
 			if (isset($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']]))
@@ -920,6 +1019,27 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
+			// check if publishing fields were over written
+			if (in_array($name, $this->defaultFields))
+			{
+				// just to eliminate
+				$this->movedPublishingFields[$viewName][$name] = $name;
+			}
+		}
+		elseif ($tabName == 'publishing')
+		{
+			if (!in_array($name, $this->defaultFields))
+			{
+				if (isset($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]))
+				{
+					$size = count($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]) + 1;
+					$this->newPublishingFields[$viewName][(int) $field['alignment']][$size] = $name;
+				}
+				else
+				{
+					$this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
+				}
+			}
 		}
 		else
 		{
@@ -933,6 +1053,12 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
+			// check if publishing fields were over written
+			if (in_array($name, $this->defaultFields))
+			{
+				// just to eliminate
+				$this->movedPublishingFields[$viewName][$name] = $name;
+			}
 		}
 	}
 
@@ -1438,7 +1564,7 @@ class Fields extends Structure
 			$this->intFieldsBuilder[$viewName] .= ',"' . $name . '"';
 		}
 		// set all dynamic field of this view
-		if ($typeName != 'category' && $typeName != 'repeatable')
+		if ($typeName != 'category' && $typeName != 'repeatable' && !in_array($name, $this->defaultFields))
 		{
 			if (!isset($this->dynamicfieldsBuilder[$viewName]))
 			{
@@ -1594,6 +1720,11 @@ class Fields extends Structure
 		{
 			$tabName = $view['settings']->tabs[(int) $field['tab']];
 		}
+		elseif ((int) $field['tab'] == 15)
+		{
+			// set to publishing tab
+			$tabName = 'publishing';
+		}
 		$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 	}
 	

admin/helpers/compiler/e_Interpretation.php

@@ -4627,7 +4627,11 @@ class Interpretation extends Fields
 
 				// setup the tables
 				$db .= "CREATE TABLE IF NOT EXISTS `#__".$component."_".$view."` (";
-				$db .= "\n\t`id` int(11) NOT NULL AUTO_INCREMENT,";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['id']))
+				{
+					$db .= "\n\t`id` int(11) NOT NULL AUTO_INCREMENT,";
+				}
 				$db .= "\n\t`asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0',";
 				ksort($fields);
 				foreach ($fields as $field => $data)
@@ -4667,22 +4671,66 @@ class Interpretation extends Fields
 					// set the field to db
 					$db .= "\n\t`".$field."` ".$data['type'].$lenght." ".$default.",";
 				}
-				$db .= "\n\t`params` TEXT NOT NULL DEFAULT '',";
+				// check if default field was over written
-				$db .= "\n\t`published` tinyint(1) NOT NULL DEFAULT '1',";
+				if (!isset($this->fieldsNames[$view]['params']))
-				$db .= "\n\t`created_by` int(11) NOT NULL DEFAULT '0',";
+				{
-				$db .= "\n\t`modified_by` int(11) NOT NULL DEFAULT '0',";
+					$db .= "\n\t`params` TEXT NOT NULL DEFAULT '',";
-				$db .= "\n\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
-				$db .= "\n\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				// check if default field was over written
-				$db .= "\n\t`checked_out` int(11) NOT NULL,";
+				if (!isset($this->fieldsNames[$view]['published']))
-				$db .= "\n\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				{
-				$db .= "\n\t`version` int(11) NOT NULL DEFAULT '1',";
+					$db .= "\n\t`published` tinyint(1) NOT NULL DEFAULT '1',";
-				$db .= "\n\t`hits` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created_by']))
+				{
+					$db .= "\n\t`created_by` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified_by']))
+				{
+					$db .= "\n\t`modified_by` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created']))
+				{
+					$db .= "\n\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified']))
+				{
+					$db .= "\n\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out']))
+				{
+					$db .= "\n\t`checked_out` int(11) NOT NULL,";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out_time']))
+				{
+					$db .= "\n\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['version']))
+				{
+					$db .= "\n\t`version` int(11) NOT NULL DEFAULT '1',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['hits']))
+				{
+					$db .= "\n\t`hits` int(11) NOT NULL DEFAULT '0',";
+				}
 				// check if view has access
 				if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view]))
 				{
 					$db .= "\n\t`access` int(11) DEFAULT NULL,";
 				}
-				$db .= "\n\t`ordering` int(11) NOT NULL DEFAULT '0',";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['ordering']))
+				{
+					$db .= "\n\t`ordering` int(11) NOT NULL DEFAULT '0',";
+				}
 				// check if metadata is added to this view
 				if (isset($this->metadataBuilder[$view]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view]))
 				{
@@ -4703,10 +4751,26 @@ class Interpretation extends Fields
 				{
 					$db .= ",\n\tKEY `idx_access` (`access`)";
 				}
-				$db .= ",\n\tKEY `idx_checkout` (`checked_out`)";
+				// check if default field was over written
-				$db .= ",\n\tKEY `idx_createdby` (`created_by`)";
+				if (!isset($this->fieldsNames[$view]['checked_out']))
-				$db .= ",\n\tKEY `idx_modifiedby` (`modified_by`)";
+				{
-				$db .= ",\n\tKEY `idx_state` (`published`)";
+					$db .= ",\n\tKEY `idx_checkout` (`checked_out`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created_by']))
+				{
+					$db .= ",\n\tKEY `idx_createdby` (`created_by`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified_by']))
+				{
+					$db .= ",\n\tKEY `idx_modifiedby` (`modified_by`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['published']))
+				{
+					$db .= ",\n\tKEY `idx_state` (`published`)";
+				}
 				if (isset($this->dbKeys[$view]) && ComponentbuilderHelper::checkArray($this->dbKeys[$view]))
 				{
 					foreach ($this->dbKeys[$view] as $nr => $key)
@@ -5011,37 +5075,41 @@ class Interpretation extends Fields
 			$body .= "\n\t\t\$canDo = ".$Helper."::getActions('".$viewName_single."',\$item,'".$viewName_list."');";
 			$body .= "\n\t?>";
 			$body .= "\n\t".'<tr class="row<?php echo $i % 2; ?>">';
-			$body .= "\n\t\t".'<td class="order nowrap center hidden-phone">';
+			// only load if not over written
-			// check if the item has permissions.
+			if (!isset($this->fieldsNames[$viewName_single]['ordering']))
-			if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')): ?>";
+				$body .= "\n\t\t".'<td class="order nowrap center hidden-phone">';
+				// check if the item has permissions.
+				if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')): ?>";
+				}
+				else
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')): ?>";
+				}
+				$body .= "\n\t\t\t<?php";
+				$body .= "\n\t\t\t\tif (\$this->saveOrder)";
+				$body .= "\n\t\t\t\t{";
+				$body .= "\n\t\t\t\t\t\$iconClass = ' inactive';";
+				$body .= "\n\t\t\t\t}";
+				$body .= "\n\t\t\t\telse";
+				$body .= "\n\t\t\t\t{";
+				$body .= "\n\t\t\t\t\t\$iconClass = ' inactive tip-top".'" hasTooltip" title="'."' . JHtml::tooltipText('JORDERINGDISABLED');";
+				$body .= "\n\t\t\t\t}";
+				$body .= "\n\t\t\t?>";
+				$body .= "\n\t\t\t".'<span class="sortable-handler<?php echo $iconClass; ?>">';
+				$body .= "\n\t\t\t\t".'<i class="icon-menu"></i>';
+				$body .= "\n\t\t\t</span>";
+				$body .= "\n\t\t\t<?php if (\$this->saveOrder) : ?>";
+				$body .= "\n\t\t\t\t".'<input type="text" style="display:none" name="order[]" size="5"';
+				$body .= "\n\t\t\t\t".'value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />';
+				$body .= "\n\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t<?php else: ?>";
+				$body .= "\n\t\t\t&#8942;";
+				$body .= "\n\t\t<?php endif; ?>";
+				$body .= "\n\t\t</td>";
 			}
-			else
-			{
-				$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')): ?>";
-			}
-			$body .= "\n\t\t\t<?php";
-			$body .= "\n\t\t\t\tif (\$this->saveOrder)";
-			$body .= "\n\t\t\t\t{";
-			$body .= "\n\t\t\t\t\t\$iconClass = ' inactive';";
-			$body .= "\n\t\t\t\t}";
-			$body .= "\n\t\t\t\telse";
-			$body .= "\n\t\t\t\t{";
-			$body .= "\n\t\t\t\t\t\$iconClass = ' inactive tip-top".'" hasTooltip" title="'."' . JHtml::tooltipText('JORDERINGDISABLED');";
-			$body .= "\n\t\t\t\t}";
-			$body .= "\n\t\t\t?>";
-			$body .= "\n\t\t\t".'<span class="sortable-handler<?php echo $iconClass; ?>">';
-			$body .= "\n\t\t\t\t".'<i class="icon-menu"></i>';
-			$body .= "\n\t\t\t</span>";
-			$body .= "\n\t\t\t<?php if (\$this->saveOrder) : ?>";
-			$body .= "\n\t\t\t\t".'<input type="text" style="display:none" name="order[]" size="5"';
-			$body .= "\n\t\t\t\t".'value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />';
-			$body .= "\n\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t<?php else: ?>";
-			$body .= "\n\t\t\t&#8942;";
-			$body .= "\n\t\t<?php endif; ?>";
-			$body .= "\n\t\t</td>";
 			$body .= "\n\t\t".'<td class="nowrap center">';
 			// check if the item has permissions.
 			if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit']]))
@@ -5128,12 +5196,12 @@ class Interpretation extends Fields
 					elseif ($item['type'] == 'user' && !$item['title'])
 					{
 						// user and linked
-						$body .= "\n\t\t<?php \$itemUser = JFactory::getUser(\$item->user); ?>";
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
 						$body .= "\n\t\t".'<td class="nowrap">';
 						$body .= "\n\t\t\t<?php if (\$this->user->authorise('core.edit', 'com_users')): ?>";
-						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->user ?>"><?php echo $itemUser->name; ?></a>';
+						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->'.$item['code'].' ?>"><?php echo $'.$item['code'].'User->name; ?></a>';
 						$body .= "\n\t\t\t<?php else: ?>";
-						$body .= "\n\t\t\t\t<?php echo \$itemUser->name; ?>";
+						$body .= "\n\t\t\t\t<?php echo \$".$item['code']."User->name; ?>";
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
@@ -5253,6 +5321,14 @@ class Interpretation extends Fields
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
+					elseif ($item['type'] == 'user')
+					{
+						// user name only
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
+						$body .= "\n\t\t".'<td class="nowrap">';
+						$body .= "\n\t\t\t<?php echo \$".$item['code']."User->name; ?>";
+						$body .= "\n\t\t</td>";
+					}
 					else
 					{
 						// normal not linked
@@ -5263,32 +5339,38 @@ class Interpretation extends Fields
 				}
 			}
 			// add the defaults
-			$body .= "\n\t\t".'<td class="center">';
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
-			// check if the item has permissions.
-			if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')) : ?>";
+				$body .= "\n\t\t".'<td class="center">';
-			}
+				// check if the item has permissions.
-			else
+				if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')) : ?>";
+				}
+				else
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')) : ?>";
+				}
+				$body .= "\n\t\t\t\t<?php if (\$item->checked_out) : ?>";
+				$body .= "\n\t\t\t\t\t<?php if (\$canCheckin) : ?>";
+				$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
+				$body .= "\n\t\t\t\t\t<?php else: ?>";
+				$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
+				$body .= "\n\t\t\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t\t\t<?php else: ?>";
+				$body .= "\n\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
+				$body .= "\n\t\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t<?php else: ?>";
+				$body .= "\n\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
+				$body .= "\n\t\t<?php endif; ?>";
+				$body .= "\n\t\t</td>";
+			}	
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')) : ?>";
+				$body .= "\n\t\t".'<td class="nowrap center hidden-phone">';
+				$body .= "\n\t\t\t<?php echo \$item->id; ?>";
+				$body .= "\n\t\t</td>";
 			}
-			$body .= "\n\t\t\t\t<?php if (\$item->checked_out) : ?>";
-			$body .= "\n\t\t\t\t\t<?php if (\$canCheckin) : ?>";
-			$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
-			$body .= "\n\t\t\t\t\t<?php else: ?>";
-			$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
-			$body .= "\n\t\t\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t\t\t<?php else: ?>";
-			$body .= "\n\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
-			$body .= "\n\t\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t<?php else: ?>";
-			$body .= "\n\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
-			$body .= "\n\t\t<?php endif; ?>";
-			$body .= "\n\t\t</td>";
-			$body .= "\n\t\t".'<td class="nowrap center hidden-phone">';
-			$body .= "\n\t\t\t<?php echo \$item->id; ?>";
-			$body .= "\n\t\t</td>";
 			$body .= "\n\t</tr>";
 			$body .= "\n<?php endforeach; ?>";
 			// return the build
@@ -5320,9 +5402,12 @@ class Interpretation extends Fields
 			// set default
 			$head = '<tr>';
 			$head .= "\n\t<?php if (\$this->canEdit&& \$this->canState): ?>";
-			$head .= "\n\t\t".'<th width="1%" class="nowrap center hidden-phone">';
+			if (!isset($this->fieldsNames[$viewName_single]['ordering']))
-			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".'<i class="icon-menu-2"></i>'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>";
+			{
-			$head .= "\n\t\t</th>";
+				$head .= "\n\t\t".'<th width="1%" class="nowrap center hidden-phone">';
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".'<i class="icon-menu-2"></i>'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>";
+				$head .= "\n\t\t</th>";
+			}
 			$head .= "\n\t\t".'<th width="20" class="nowrap center">';
 			$head .= "\n\t\t\t<?php echo JHtml::_('grid.checkall'); ?>";
 			$head .= "\n\t\t</th>";
@@ -5359,18 +5444,24 @@ class Interpretation extends Fields
 				$this->listColnrBuilder[$viewName_list]++;
 			}
 			// set default
-			$head .= "\n\t<?php if (\$this->canState): ?>";
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
- 			$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
+			{
-   			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$statusLangName."', 'published', \$this->listDirn, \$this->listOrder); ?>";
+				$head .= "\n\t<?php if (\$this->canState): ?>";
- 			$head .= "\n\t\t</th>";
+				$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
-			$head .= "\n\t<?php else: ?>";
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$statusLangName."', 'published', \$this->listDirn, \$this->listOrder); ?>";
- 			$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
+				$head .= "\n\t\t</th>";
-   			$head .= "\n\t\t\t<?php echo JText::_('".$statusLangName."'); ?>";
+				$head .= "\n\t<?php else: ?>";
- 			$head .= "\n\t\t</th>";
+				$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
-			$head .= "\n\t<?php endif; ?>";
+				$head .= "\n\t\t\t<?php echo JText::_('".$statusLangName."'); ?>";
- 			$head .= "\n\t".'<th width="5" class="nowrap center hidden-phone" >';
+				$head .= "\n\t\t</th>";
- 			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$idLangName."', 'id', \$this->listDirn, \$this->listOrder); ?>";
+				$head .= "\n\t<?php endif; ?>";
- 			$head .= "\n\t</th>";
+			}
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
+			{
+				$head .= "\n\t".'<th width="5" class="nowrap center hidden-phone" >';
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$idLangName."', 'id', \$this->listDirn, \$this->listOrder); ?>";
+				$head .= "\n\t</th>";
+			}
  			$head .= "\n</tr>";
 
 			return $head;
@@ -5711,14 +5802,23 @@ class Interpretation extends Fields
 			{
 				$this->langContent[$this->lang][$tabLangName] = 'Publishing';
 			}
-			// check if access is added to this view
+			// TODO add new publishing fields <-- nice to have, but no time now to do this
-			if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
+			// $this->newPublishingFields[$viewName_single]
+			// the default publishing items
+			$items = array();
+			foreach ($this->defaultFields as $defaultField)
 			{
-				$addAccess = ",\n\t'access'";
+				if (!isset($this->movedPublishingFields[$viewName_single][$defaultField]))
-			}
+				{
-			else
+					if ($defaultField != 'access')
-			{
+					{
-				$addAccess = "";
+						$items[] = $defaultField;
+					}
+					elseif ($defaultField == 'access' && isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
+					{
+						$items[] = $defaultField;
+					}
+				}
 			}
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName_single]))
@@ -5727,10 +5827,21 @@ class Interpretation extends Fields
 				$tabCodeNameLeft = 'publishing';
 				$tabCodeNameRight = 'metadata';
 				// the default publishing tiems
-				$items = "'created',\n\t'created_by',\n\t'modified',\n\t'modified_by',\n\t'published',\n\t'ordering'".$addAccess.",\n\t'version',\n\t'hits',\n\t'id'";
+				if (ComponentbuilderHelper::checkArray($items))
-				// set the publishing layout
+				{
-				$this->setLayout($viewName_single, $tabCodeNameLeft, $items, 'layoutpublished');
+					// load all items
-				$this->setLayout($viewName_single, $tabCodeNameRight, false, 'layoutmetadata');
+					$items_one = "'". implode("',\n\t'", $items)."'";
+					// set the publishing layout
+					$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+					$items_one = true;
+				}
+				else
+				{
+					$items_one = false;				
+				}
+				// set the metadata layout
+				$this->setLayout($viewName_single, $tabCodeNameRight, false, 'layoutmetadata');	
+				$items_two = true;
 			}
 			else
 			{
@@ -5738,41 +5849,98 @@ class Interpretation extends Fields
 				$tabCodeNameLeft = 'publishing';
 				$tabCodeNameRight = 'publlshing';
 				// the default publishing tiems
-				$items_one = "'created',\n\t'created_by',\n\t'modified',\n\t'modified_by'";
+				if (ComponentbuilderHelper::checkArray($items))
-				$items_two = "'published',\n\t'ordering'".$addAccess.",\n\t'version',\n\t'hits',\n\t'id'";
-				// set the publishing layout
-				$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
-				$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
-			}
-			// check if the item has permissions.
-			$publishingPer = array();
-			$allToBeChekced = array('core.delete','core.edit.created_by','core.edit.state','core.edit.created');
-			foreach ($allToBeChekced as $core_permission)
-			{
-				if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($viewName_single,$this->permissionBuilder['global'][$core[$core_permission]]))
 				{
-					// set permissions.
+					
-					$publishingPer[] = "\$this->canDo->get('".$core[$core_permission]."')";
+					$items_one = array('created', 'created_by', 'modified', 'modified_by');
+					$items_two = array('published', 'ordering', 'access', 'version', 'hits', 'id');
+					// check all items
+					foreach ($items_one as $key_one => $item_one)
+					{
+						if (!in_array($item_one, $items))
+						{
+							unset($items_one[$key_one]);
+						}
+					}
+					foreach ($items_two as $key_two => $item_two)
+					{
+						if (!in_array($item_two, $items))
+						{
+							unset($items_two[$key_two]);
+						}
+					}
+					// load all items that remain
+					if (ComponentbuilderHelper::checkArray($items_one))
+					{
+						// load all items
+						$items_one = "'". implode("',\n\t'", $items_one)."'";
+						// set the publishing layout
+						$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+						$items_one = true;
+					}
+					// load all items that remain
+					if (ComponentbuilderHelper::checkArray($items_two))
+					{
+						// load all items
+						$items_two = "'". implode("',\n\t'", $items_two)."'";
+						// set the publishing layout
+						$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
+						$items_two = true;
+					}
 				}
 				else
 				{
-					// set permissions.
+					$items_one = false;
-					$publishingPer[] = "\$this->canDo->get('".$core_permission."')";
+					$items_two = false;					
 				}
 			}
-			$body .= "\n\n\t<?php if (".implode(' || ', $publishingPer).") : ?>";
+			if ($items_one && $items_two)
-			// set the default publishing tab
+			{
-			$body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>";
+				$classs = "span6";
-			$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
+			}
-			$body .= "\n\t\t\t".'<div class="span6">';
+			elseif ($items_one || $items_two)
-			$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>";
+			{
-			$body .= "\n\t\t\t</div>";
+				$classs = "span12";
-			$body .= "\n\t\t\t".'<div class="span6">';
+			}
-			$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameRight."', \$this); ?>";
+			// only load this if needed
-			$body .= "\n\t\t\t</div>";
+			if ($items_one || $items_two)
-			$body .= "\n\t\t</div>";
+			{
-			$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
+				// check if the item has permissions.
-			$body .= "\n\t<?php endif; ?>";
+				$publishingPer = array();
+				$allToBeChekced = array('core.delete','core.edit.created_by','core.edit.state','core.edit.created');
+				foreach ($allToBeChekced as $core_permission)
+				{
+					if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($viewName_single,$this->permissionBuilder['global'][$core[$core_permission]]))
+					{
+						// set permissions.
+						$publishingPer[] = "\$this->canDo->get('".$core[$core_permission]."')";
+					}
+					else
+					{
+						// set permissions.
+						$publishingPer[] = "\$this->canDo->get('".$core_permission."')";
+					}
+				}
+				$body .= "\n\n\t<?php if (".implode(' || ', $publishingPer).") : ?>";
+				// set the default publishing tab
+				$body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>";
+				$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
+				if ($items_one)
+				{
+					$body .= "\n\t\t\t".'<div class="'.$classs.'">';
+					$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>";
+					$body .= "\n\t\t\t</div>";
+				}
+				if ($items_two)
+				{
+					$body .= "\n\t\t\t".'<div class="'.$classs.'">';
+					$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameRight."', \$this); ?>";
+					$body .= "\n\t\t\t</div>";
+				}
+				$body .= "\n\t\t</div>";
+				$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
+				$body .= "\n\t<?php endif; ?>";
+			}
 			// make sure we dont load it to a view with the name component
 			if ($viewName_single != 'component')
 			{
@@ -6030,7 +6198,7 @@ class Interpretation extends Fields
 	 * @param $viewName_list
 	 * @param $refview
 	 * @return string
-     */
+	*/
 	public function setListBodyLinked($viewName_single, $viewName_list, $refview)
 	{
 		if (isset($this->listBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->listBuilder[$viewName_list]))
@@ -6121,12 +6289,12 @@ class Interpretation extends Fields
 					elseif ($item['type'] == 'user' && !$item['title'])
 					{
 						// user and linked
-						$body .= "\n\t\t<?php \$itemUser = JFactory::getUser(\$item->user); ?>";
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
 						$body .= "\n\t\t".'<td class="nowrap">';
 						$body .= "\n\t\t\t<?php if (\$user->authorise('core.edit', 'com_users')): ?>";
-						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->user ?>"><?php echo $itemUser->name; ?></a>';
+						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->'.$item['code'].' ?>"><?php echo $'.$item['code'].'User->name; ?></a>';
 						$body .= "\n\t\t\t<?php else: ?>";
-						$body .= "\n\t\t\t\t<?php echo \$itemUser->name; ?>";
+						$body .= "\n\t\t\t\t<?php echo \$".$item['code']."User->name; ?>";
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
@@ -6257,6 +6425,14 @@ class Interpretation extends Fields
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
+					elseif ($item['type'] == 'user')
+					{
+						// user name only
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
+						$body .= "\n\t\t".'<td class="nowrap">';
+						$body .= "\n\t\t\t<?php echo \$".$item['code']."User->name; ?>";
+						$body .= "\n\t\t</td>";
+					}
 					else
 					{
 						// normal not linked
@@ -8627,6 +8803,11 @@ class Interpretation extends Fields
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
 						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JText::_(\$text));";
 					}
+					elseif ($filter['type'] == 'user')
+					{
+						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
+						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JFactory::getUser(\$".$filter['code'].")->name);";
+					}
 					else
 					{
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
@@ -10106,6 +10287,8 @@ class Interpretation extends Fields
 
 	public function setSortFields($view)
 	{
+		// keep track of all fields already added
+		$donelist = array('sorting','published');
 		// set the default first
 		$fields = "return array(";
 		$fields .= "\n\t\t\t'a.sorting' => JText::_('JGRID_HEADING_ORDERING')";
@@ -10116,17 +10299,20 @@ class Interpretation extends Fields
 		{
 			foreach ($this->sortBuilder[$view] as $filter)
 			{
-				if ($filter['type'] == 'category')
+				if (!in_array($filter['code'], $donelist))
 				{
-					$fields .= ",\n\t\t\t'c.category_title' => JText::_('".$filter['lang']."')";
+					if ($filter['type'] == 'category')
-				}
+					{
-				elseif (ComponentbuilderHelper::checkArray($filter['custom']))
+						$fields .= ",\n\t\t\t'c.category_title' => JText::_('".$filter['lang']."')";
-				{
+					}
-					$fields .= ",\n\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."' => JText::_('".$filter['lang']."')";
+					elseif (ComponentbuilderHelper::checkArray($filter['custom']))
-				}
+					{
-				else
+						$fields .= ",\n\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."' => JText::_('".$filter['lang']."')";
-				{
+					}
-					$fields .= ",\n\t\t\t'a.".$filter['code']."' => JText::_('".$filter['lang']."')";
+					else
+					{
+						$fields .= ",\n\t\t\t'a.".$filter['code']."' => JText::_('".$filter['lang']."')";
+					}
 				}
 			}
 		}
@@ -12507,8 +12693,12 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 										$view['settings']->permissions = array();
 										$view['settings']->permissions[] = $fieldView;
 									}
-									// load to global field permission set
+									// insure that no default field get loaded
-									$this->permissionFields[$nameView][$fieldName] = $fieldType;
+									if (!in_array($fieldName, $this->defaultFields))
+									{
+										// load to global field permission set
+										$this->permissionFields[$nameView][$fieldName] = $fieldType;
+									}
 								}
 							}
 						}

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -137,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_DESC="The user that created this Admin View."
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created by"
+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_DESC="The date this Admin View was created."
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL="Created date"
+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"
@@ -238,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"
@@ -583,10 +587,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_DESC="The user that created this Component."
-COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL="Created by"
+COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL="Created By"
-COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC="The date Component was created."
+COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC="The date this Component was created."
-COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_LABEL="Created date"
+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"
@@ -739,6 +743,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"
@@ -1227,10 +1235,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_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_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_DESC="The date this Custom Admin View was created."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL="Created date"
+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"
@@ -1341,6 +1349,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"
@@ -1582,10 +1594,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_DESC="The user that created this Dynamic Get."
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_LABEL="Created by"
+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_DESC="The date this Dynamic Get was created."
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_LABEL="Created date"
+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"
@@ -1672,6 +1684,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"
@@ -1904,10 +1920,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_DESC="The user that created this Fieldtype."
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL="Created by"
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL="Created By"
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC="The date Fieldtype was created."
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC="The date this Fieldtype was created."
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL="Created date"
+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"
@@ -1922,6 +1938,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"
@@ -1962,10 +1982,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_DESC="The user that created this Field."
-COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL="Created by"
+COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL="Created By"
-COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date Field was created."
+COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date this Field was created."
-COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL="Created date"
+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]"
@@ -2024,6 +2044,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"
@@ -2148,10 +2172,10 @@ 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_DESC="The user that created this Help Document."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL="Created by"
+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_DESC="The date this Help Document was created."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL="Created date"
+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."
@@ -2163,6 +2187,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"
@@ -2296,10 +2324,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_DESC="The user that created this Layout."
-COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL="Created by"
+COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL="Created By"
-COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC="The date Layout was created."
+COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC="The date this Layout was created."
-COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL="Created date"
+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"
@@ -2317,6 +2345,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"
@@ -2484,10 +2516,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_DESC="The user that created this Site View."
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_LABEL="Created by"
+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_DESC="The date this Site View was created."
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL="Created date"
+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"
@@ -2610,6 +2642,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"
@@ -2822,10 +2858,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_DESC="The user that created this Snippet."
-COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL="Created by"
+COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL="Created By"
-COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC="The date Snippet was created."
+COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC="The date this Snippet was created."
-COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL="Created date"
+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"
@@ -2841,6 +2877,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"
@@ -2934,10 +2974,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_DESC="The user that created this Template."
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL="Created by"
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL="Created By"
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC="The date Template was created."
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC="The date this Template was created."
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL="Created date"
+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"
@@ -2952,6 +2992,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"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/component/admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php

admin/layouts/component/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/component/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/component/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/component/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/component/ftp_servers_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ftp_servers_fullwidth.php

admin/layouts/component/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/component/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/component/readme_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php

admin/layouts/component/readme_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php

admin/layouts/component/scripts_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_fullwidth.php

admin/layouts/component/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/component/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/component/site_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/custom_admin_view/custom_script_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/custom_admin_view/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/custom_admin_view/details_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/custom_admin_view/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/custom_admin_view/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/custom_admin_view/details_rightside.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php

admin/layouts/custom_admin_view/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
+	@version		2.1.11
-	@build			31st May, 2016
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php