Cleaned-up some more javascript one the admin_view. Changed the admin_view layout. Improved the converion of data. Added a new tabsName field to the admin_fields view.

README.md

@@ -110,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 12th October, 2017
++ *Last Build*: 13th October, 2017
 + *Version*: 2.5.8
 + *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*: **123433**
++ *Line count*: **123911**
-+ *File count*: **740**
++ *File count*: **741**
 + *Folder count*: **129**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/README.txt

@@ -110,12 +110,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 12th October, 2017
++ *Last Build*: 13th October, 2017
 + *Version*: 2.5.8
 + *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*: **123433**
++ *Line count*: **123911**
-+ *File count*: **740**
++ *File count*: **741**
 + *Folder count*: **129**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/access.xml

@@ -15,16 +15,40 @@
 		<action name="core.edit.own" title="JACTION_EDITOWN" description="JACTION_EDITOWN_COMPONENT_DESC" />
 		<action name="core.edit.created_by" title="COM_COMPONENTBUILDER_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC" />
 		<action name="core.edit.created" title="COM_COMPONENTBUILDER_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC" />
+		<action name="admin_view.access" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC" />
 		<action name="admin_view.batch" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC" />
+		<action name="admin_view.create" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC" />
 		<action name="admin_view.dashboard_add" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC" />
 		<action name="admin_view.dashboard_list" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC" />
+		<action name="admin_view.delete" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC" />
+		<action name="admin_view.edit" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC" />
+		<action name="admin_view.edit.created_by" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC" />
+		<action name="admin_view.edit.created" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC" />
+		<action name="admin_view.edit.own" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC" />
+		<action name="admin_view.edit.state" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC" />
 		<action name="admin_view.version" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC" />
 		<action name="admin_view.export" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT_DESC" />
 		<action name="admin_view.import" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC" />
 		<action name="admin_view.submenu" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC" />
+		<action name="admin_fields.access" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC" />
 		<action name="admin_fields.batch" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE_DESC" />
+		<action name="admin_fields_conditions.access" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC" />
 		<action name="admin_fields_conditions.batch" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE_DESC" />
+		<action name="admin_fields_conditions.create" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC" />
+		<action name="admin_fields_conditions.delete" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC" />
+		<action name="admin_fields_conditions.edit" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC" />
+		<action name="admin_fields_conditions.edit.created_by" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC" />
+		<action name="admin_fields_conditions.edit.created" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC" />
+		<action name="admin_fields_conditions.edit.own" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC" />
+		<action name="admin_fields_conditions.edit.state" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC" />
 		<action name="admin_fields_conditions.version" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC" />
+		<action name="admin_fields.create" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC" />
+		<action name="admin_fields.delete" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC" />
+		<action name="admin_fields.edit" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC" />
+		<action name="admin_fields.edit.created_by" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC" />
+		<action name="admin_fields.edit.created" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC" />
+		<action name="admin_fields.edit.own" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC" />
+		<action name="admin_fields.edit.state" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC" />
 		<action name="admin_fields.version" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC" />
 		<action name="compiler.access" title="COM_COMPONENTBUILDER_COMPILER_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC" />
 		<action name="compiler.clear_tmp" title="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC" />
@@ -195,6 +219,14 @@
 		<action name="joomla_component.version" title="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC" />
 	</section>
 	<section name="admin_view">
+		<action name="admin_view.edit" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC" />
+		<action name="admin_view.edit.own" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC" />
+		<action name="admin_view.edit.state" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC" />
+		<action name="admin_view.edit.created_by" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC" />
+		<action name="admin_view.edit.created" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC" />
+		<action name="admin_view.create" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC" />
+		<action name="admin_view.delete" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC" />
+		<action name="admin_view.access" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC" />
 		<action name="admin_view.version" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC" />
 	</section>
 	<section name="custom_admin_view">
@@ -325,9 +357,25 @@
 		<action name="help_document.version" title="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION" description="COM_COMPONENTBUILDER_HELP_DOCUMENTS_EDIT_VERSION_DESC" />
 	</section>
 	<section name="admin_fields">
+		<action name="admin_fields.edit" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC" />
+		<action name="admin_fields.edit.own" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC" />
+		<action name="admin_fields.edit.state" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC" />
+		<action name="admin_fields.edit.created_by" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC" />
+		<action name="admin_fields.edit.created" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC" />
+		<action name="admin_fields.create" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC" />
+		<action name="admin_fields.delete" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC" />
+		<action name="admin_fields.access" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC" />
 		<action name="admin_fields.version" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC" />
 	</section>
 	<section name="admin_fields_conditions">
+		<action name="admin_fields_conditions.edit" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC" />
+		<action name="admin_fields_conditions.edit.own" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC" />
+		<action name="admin_fields_conditions.edit.state" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC" />
+		<action name="admin_fields_conditions.edit.created_by" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC" />
+		<action name="admin_fields_conditions.edit.created" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC" />
+		<action name="admin_fields_conditions.create" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC" />
+		<action name="admin_fields_conditions.delete" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC" />
+		<action name="admin_fields_conditions.access" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC" />
 		<action name="admin_fields_conditions.version" title="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION" description="COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC" />
 	</section>
 	<section name="category.fields">

admin/assets/css/admin.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 16 of this MVC
+	@version		@update number 21 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		12th October, 2017
 	@package		Component Builder
 	@subpackage		admin_fields.css

admin/assets/css/admin_fields_conditions.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 7 of this MVC
+	@version		@update number 14 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		12th October, 2017
 	@package		Component Builder
 	@subpackage		admin_fields_conditions.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 136 of this MVC
+	@version		@update number 141 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css

admin/assets/css/admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 136 of this MVC
+	@version		@update number 141 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/admins_fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 16 of this MVC
+	@version		@update number 21 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		12th October, 2017
 	@package		Component Builder
 	@subpackage		admins_fields.css

admin/assets/css/admins_fields_conditions.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 7 of this MVC
+	@version		@update number 14 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		12th October, 2017
 	@package		Component Builder
 	@subpackage		admins_fields_conditions.css

admin/assets/css/dashboard.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/js/admin.js

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.js

admin/componentbuilder.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controller.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 16 of this MVC
+	@version		@update number 21 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		12th October, 2017
 	@package		Component Builder
 	@subpackage		admin_fields.php
@@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 	 * @since   1.6
 	 */
 	protected function allowAdd($data = array())
-	{		// In the absense of better information, revert to the component permissions.
+	{
-		return parent::allowAdd($data);
+		// Access check.
+		$access = JFactory::getUser()->authorise('admin_fields.access', 'com_componentbuilder');
+		if (!$access)
+		{
+			return false;
+		}
+		// In the absense of better information, revert to the component permissions.
+		return JFactory::getUser()->authorise('admin_fields.create', $this->option);
 	}
 
 	/**
@@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
+		// Access check.
+		$access = ($user->authorise('admin_fields.access', 'com_componentbuilder.admin_fields.' . (int) $recordId) &&  $user->authorise('admin_fields.access', 'com_componentbuilder'));
+		if (!$access)
+		{
+			return false;
+		}
+
 		if ($recordId)
 		{
 			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('core.edit', 'com_componentbuilder.admin_fields.' . (int) $recordId);
+			$permission = $user->authorise('admin_fields.edit', 'com_componentbuilder.admin_fields.' . (int) $recordId);
 			if (!$permission)
 			{
-				if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_fields.' . $recordId))
+				if ($user->authorise('admin_fields.edit.own', 'com_componentbuilder.admin_fields.' . $recordId))
 				{
 					// Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
@@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 					// If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
-						if ($user->authorise('core.edit.own', 'com_componentbuilder'))
+						if ($user->authorise('admin_fields.edit.own', 'com_componentbuilder'))
 						{
 							return true;
 						}
@@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 			}
 		}
 		// Since there is no permission, revert to the component permissions.
-		return parent::allowEdit($data, $key);
+		return $user->authorise('admin_fields.edit', $this->option);
 	}
 
 	/**

admin/controllers/admin_fields_conditions.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 7 of this MVC
+	@version		@update number 14 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		12th October, 2017
 	@package		Component Builder
 	@subpackage		admin_fields_conditions.php
@@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 	 * @since   1.6
 	 */
 	protected function allowAdd($data = array())
-	{		// In the absense of better information, revert to the component permissions.
+	{
-		return parent::allowAdd($data);
+		// Access check.
+		$access = JFactory::getUser()->authorise('admin_fields_conditions.access', 'com_componentbuilder');
+		if (!$access)
+		{
+			return false;
+		}
+		// In the absense of better information, revert to the component permissions.
+		return JFactory::getUser()->authorise('admin_fields_conditions.create', $this->option);
 	}
 
 	/**
@@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
+		// Access check.
+		$access = ($user->authorise('admin_fields_conditions.access', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId) &&  $user->authorise('admin_fields_conditions.access', 'com_componentbuilder'));
+		if (!$access)
+		{
+			return false;
+		}
+
 		if ($recordId)
 		{
 			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('core.edit', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId);
+			$permission = $user->authorise('admin_fields_conditions.edit', 'com_componentbuilder.admin_fields_conditions.' . (int) $recordId);
 			if (!$permission)
 			{
-				if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_fields_conditions.' . $recordId))
+				if ($user->authorise('admin_fields_conditions.edit.own', 'com_componentbuilder.admin_fields_conditions.' . $recordId))
 				{
 					// Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
@@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 					// If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
-						if ($user->authorise('core.edit.own', 'com_componentbuilder'))
+						if ($user->authorise('admin_fields_conditions.edit.own', 'com_componentbuilder'))
 						{
 							return true;
 						}
@@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 			}
 		}
 		// Since there is no permission, revert to the component permissions.
-		return parent::allowEdit($data, $key);
+		return $user->authorise('admin_fields_conditions.edit', $this->option);
 	}
 
 	/**

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 136 of this MVC
+	@version		@update number 141 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php
@@ -59,8 +59,15 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 	 * @since   1.6
 	 */
 	protected function allowAdd($data = array())
-	{		// In the absense of better information, revert to the component permissions.
+	{
-		return parent::allowAdd($data);
+		// Access check.
+		$access = JFactory::getUser()->authorise('admin_view.access', 'com_componentbuilder');
+		if (!$access)
+		{
+			return false;
+		}
+		// In the absense of better information, revert to the component permissions.
+		return JFactory::getUser()->authorise('admin_view.create', $this->option);
 	}
 
 	/**
@@ -81,13 +88,20 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 		$recordId	= (int) isset($data[$key]) ? $data[$key] : 0;
 
 
+		// Access check.
+		$access = ($user->authorise('admin_view.access', 'com_componentbuilder.admin_view.' . (int) $recordId) &&  $user->authorise('admin_view.access', 'com_componentbuilder'));
+		if (!$access)
+		{
+			return false;
+		}
+
 		if ($recordId)
 		{
 			// The record has been set. Check the record permissions.
-			$permission = $user->authorise('core.edit', 'com_componentbuilder.admin_view.' . (int) $recordId);
+			$permission = $user->authorise('admin_view.edit', 'com_componentbuilder.admin_view.' . (int) $recordId);
 			if (!$permission)
 			{
-				if ($user->authorise('core.edit.own', 'com_componentbuilder.admin_view.' . $recordId))
+				if ($user->authorise('admin_view.edit.own', 'com_componentbuilder.admin_view.' . $recordId))
 				{
 					// Now test the owner is the user.
 					$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
@@ -106,7 +120,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 					// If the owner matches 'me' then allow.
 					if ($ownerId == $user->id)
 					{
-						if ($user->authorise('core.edit.own', 'com_componentbuilder'))
+						if ($user->authorise('admin_view.edit.own', 'com_componentbuilder'))
 						{
 							return true;
 						}
@@ -116,7 +130,7 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 			}
 		}
 		// Since there is no permission, revert to the component permissions.
-		return parent::allowEdit($data, $key);
+		return $user->authorise('admin_view.edit', $this->option);
 	}
 
 	/**

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 136 of this MVC
+	@version		@update number 141 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/admins_fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 16 of this MVC
+	@version		@update number 21 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		12th October, 2017
 	@package		Component Builder
 	@subpackage		admins_fields.php

admin/controllers/admins_fields_conditions.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 7 of this MVC
+	@version		@update number 14 of this MVC
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		12th October, 2017
 	@package		Component Builder
 	@subpackage		admins_fields_conditions.php

admin/controllers/ajax.json.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/componentbuilder.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/help.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/import.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/import_joomla_components.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php

admin/helpers/componentbuilder.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -1393,7 +1393,10 @@ abstract class ComponentbuilderHelper
 		{
 			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS'), 'index.php?option=com_componentbuilder&view=joomla_components', $submenu === 'joomla_components');
 		}
+		if ($user->authorise('admin_view.access', 'com_componentbuilder') && $user->authorise('admin_view.submenu', 'com_componentbuilder'))
+		{
 			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_ADMIN_VIEWS'), 'index.php?option=com_componentbuilder&view=admin_views', $submenu === 'admin_views');
+		}
 		if ($user->authorise('custom_admin_view.access', 'com_componentbuilder') && $user->authorise('custom_admin_view.submenu', 'com_componentbuilder'))
 		{
 			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_CUSTOM_ADMIN_VIEWS'), 'index.php?option=com_componentbuilder&view=custom_admin_views', $submenu === 'custom_admin_views');

admin/helpers/componentbuilderemail.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilderemail.php

admin/helpers/headercheck.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php

admin/helpers/html/batch_.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -4,15 +4,33 @@ COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders"
 COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT="Add to Backup Folder & Sales Server <small>(if set)</small>"
 COM_COMPONENTBUILDER_ADD_TO_REPOSITORY_FOLDER="Add to Repository Folder"
 COM_COMPONENTBUILDER_ADMINS_FIELDS="Admins Fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS="Admins Fields Access"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC="Allows the users in this group to access access admins fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_OPTIONS="Batch process the selected Admins Fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_TIP="All changes will be applied to all selected Admins Fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE="Admins Fields Batch Use"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS="Admins Fields Conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS="Admins Fields Conditions Access"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC="Allows the users in this group to access access admins fields conditions"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_OPTIONS="Batch process the selected Admins Fields Conditions"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_TIP="All changes will be applied to all selected Admins Fields Conditions"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE="Admins Fields Conditions Batch Use"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE="Admins Fields Conditions Create"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC="Allows the users in this group to create create admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE="Admins Fields Conditions Delete"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC="Allows the users in this group to delete delete admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT="Admins Fields Conditions Edit"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY="Admins Fields Conditions Edit Created By"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE="Admins Fields Conditions Edit Created Date"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC="Allows the users in this group to edit the admin fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN="Admins Fields Conditions Edit Own"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields conditions created by them"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE="Admins Fields Conditions Edit State"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields conditions"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION="Admins Fields Conditions Edit Version"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields conditions"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_ARCHIVED="%s Admins Fields Conditions archived."
@@ -32,6 +50,20 @@ COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNFEATURED="%s Admins Fiel
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNFEATURED_1="%s Admin Fields Conditions unfeatured."
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNPUBLISHED="%s Admins Fields Conditions unpublished."
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_N_ITEMS_UNPUBLISHED_1="%s Admin Fields Conditions unpublished."
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE="Admins Fields Create"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC="Allows the users in this group to create create admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE="Admins Fields Delete"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC="Allows the users in this group to delete delete admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT="Admins Fields Edit"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY="Admins Fields Edit Created By"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE="Admins Fields Edit Created Date"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC="Allows the users in this group to edit the admin fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN="Admins Fields Edit Own"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields created by them"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE="Admins Fields Edit State"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION="Admins Fields Edit Version"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_N_ITEMS_ARCHIVED="%s Admins Fields archived."
@@ -168,6 +200,7 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_SEARCH_LABEL="Searchable"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_DESCRIPTION="Select if the field should be sortable in list view, if shown."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_SORT_LABEL="Sortable"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_STATUS="Status"
+COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB="Tab"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_DESCRIPTION="Select the tab this field belongs to."
 COM_COMPONENTBUILDER_ADMIN_FIELDS_TAB_LABEL="Tab"
 COM_COMPONENTBUILDER_ADMIN_FIELDS_TITLE_DESCRIPTION="Select if the field is the title field."
@@ -177,14 +210,30 @@ COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_DESC="A count of the number of times t
 COM_COMPONENTBUILDER_ADMIN_FIELDS_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_OPTIONS="Batch process the selected Admin Views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_TIP="All changes will be applied to all selected Admin Views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY="Admin Views Edit Created By"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE="Admin Views Edit Created Date"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export"
@@ -380,6 +429,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_HINT="Add Description Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DESCRIPTION_LABEL="Description"
+COM_COMPONENTBUILDER_ADMIN_VIEW_DETAILS="Details"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DOWNLOAD="Download"
 COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP="Dump"
 COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT="Editing the Admin View"
@@ -482,7 +532,6 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_KEY_LABEL="Child Key"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LAMP="Lamp"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LAST="Last"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LINK="Link"
-COM_COMPONENTBUILDER_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LIST="List"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LIST_TWO="List 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_LOCATION="Location"
@@ -1762,6 +1811,7 @@ COM_COMPONENTBUILDER_DASHBOARD_TEMPLATES="Templates<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_TEMPLATE_ADD="Add&nbsp;Template<br /><br />"
 COM_COMPONENTBUILDER_DATE="Date"
 COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)"
+COM_COMPONENTBUILDER_DETAILS="Details"
 COM_COMPONENTBUILDER_DOES_THIS_PACKAGE_REQUIRE_A_KEY_TO_INSTALL="Does this package require a key to install"
 COM_COMPONENTBUILDER_DOWNLOAD="download"
 COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get"

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

@@ -1,18 +1,66 @@
 COM_COMPONENTBUILDER="Component Builder"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS="Admins Fields Access"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_ACCESS_DESC="Allows the users in this group to access access admins fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE="Admins Fields Batch Use"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS="Admins Fields Conditions Access"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_ACCESS_DESC="Allows the users in this group to access access admins fields conditions"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE="Admins Fields Conditions Batch Use"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE="Admins Fields Conditions Create"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_CREATE_DESC="Allows the users in this group to create create admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE="Admins Fields Conditions Delete"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_DELETE_DESC="Allows the users in this group to delete delete admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT="Admins Fields Conditions Edit"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY="Admins Fields Conditions Edit Created By"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE="Admins Fields Conditions Edit Created Date"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_DESC="Allows the users in this group to edit the admin fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN="Admins Fields Conditions Edit Own"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields conditions created by them"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE="Admins Fields Conditions Edit State"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields conditions"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION="Admins Fields Conditions Edit Version"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields conditions"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE="Admins Fields Create"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_CREATE_DESC="Allows the users in this group to create create admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE="Admins Fields Delete"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_DELETE_DESC="Allows the users in this group to delete delete admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT="Admins Fields Edit"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY="Admins Fields Edit Created By"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE="Admins Fields Edit Created Date"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admins fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_DESC="Allows the users in this group to edit the admin fields"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN="Admins Fields Edit Own"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admins fields created by them"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE="Admins Fields Edit State"
+COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin fields"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION="Admins Fields Edit Version"
 COM_COMPONENTBUILDER_ADMINS_FIELDS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admins fields"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE="Admin Views Batch Use"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_USE_DESC="Allows users in this group to use batch copy/update method of batch admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE="Admin Views Create"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_CREATE_DESC="Allows the users in this group to create create admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD="Admin Views Dashboard Add"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_ADD_DESC="Allows the users in this group to update the dashboard add of the admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST="Admin Views Dashboard List"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE="Admin Views Delete"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_DELETE_DESC="Allows the users in this group to delete delete admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT="Admin Views Edit"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY="Admin Views Edit Created By"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_BY_DESC="Allows the users in this group to update the created by of the edit created by admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE="Admin Views Edit Created Date"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_CREATED_DATE_DESC="Allows the users in this group to update the created date of the edit created admin views"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_DESC="Allows the users in this group to edit the admin view"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN="Admin Views Edit Own"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_OWN_DESC="Allows the users in this group to edit edit own admin views created by them"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE="Admin Views Edit State"
+COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_STATE_DESC="Allows the users in this group to update the state of the admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION="Admin Views Edit Version"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EDIT_VERSION_DESC="Allows users in this group to edit versions of version admin views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT="Admin Views Export"

admin/layouts/admin_fields/fields_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_above.php

admin/layouts/admin_fields/fields_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/admin_fields/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_fields/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_fields_conditions/conditions_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		conditions_above.php

admin/layouts/admin_fields_conditions/conditions_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		conditions_fullwidth.php

admin/layouts/admin_fields_conditions/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_fields_conditions/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/css_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_buttons_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/admin_view/custom_buttons_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
@@ -27,30 +27,112 @@
 
 defined('_JEXEC') or die('Restricted access');
 
-$form = $displayData->getForm();
+// set the defaults
-
+$items	= $displayData->vxzcustom_import;
-$fields = $displayData->get('fields') ?: array(
+$user	= JFactory::getUser();
-	'note_beginner_import',
+$id	= $displayData->item->id;
-	'note_advanced_import',
+$edit	= "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
-	'add_custom_import',
-	'php_import_display',
-	'html_import_view',
-	'php_import',
-	'php_import_setdata',
-	'php_import_save',
-	'php_import_ext'
-);
 
 ?>
 <div class="form-vertical">
-<?php foreach($fields as $field): ?>
+<?php if (ComponentbuilderHelper::checkArray($items)): ?>
-    <div class="control-group">
+<table class="footable table data joomla_components" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
-        <div class="control-label">
+<thead>
-            <?php echo $form->getLabel($field); ?>
+	<tr>
-        </div>
+		<th data-type="html" data-sort-use="text">
-        <div class="controls">
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SYSTEM_NAME_LABEL'); ?>
-            <?php echo $form->getInput($field); ?>
+		</th>
-        </div>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-    </div>
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL'); ?>
+		</th>
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPONENT_VERSION_LABEL'); ?>
+		</th>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SHORT_DESCRIPTION_LABEL'); ?>
+		</th>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL'); ?>
+		</th>
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL'); ?>
+		</th>
+		<th width="10" data-breakpoints="xs sm md">
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_STATUS'); ?>
+		</th>
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
+			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ID'); ?>
+		</th>
+	</tr>
+</thead>
+<tbody>
+<?php foreach ($items as $i => $item): ?>
+	<?php
+		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
+		$userChkOut = JFactory::getUser($item->checked_out);
+		$canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components');
+	?>
+	<tr>
+		<td class="nowrap">
+			<?php if ($canDo->get('core.edit')): ?>
+				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=admin_view&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->system_name); ?></a>
+					<?php if ($item->checked_out): ?>
+						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?>
+					<?php endif; ?>
+			<?php else: ?>
+				<div class="name"><?php echo $displayData->escape($item->system_name); ?></div>
+			<?php endif; ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->name_code); ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->component_version); ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->short_description); ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->companyname); ?>
+		</td>
+		<td>
+			<?php echo $displayData->escape($item->author); ?>
+		</td>
+		<?php if ($item->published == 1):?>
+			<td class="center"  data-sort-value="1">
+				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
+					<?php echo JText::_('PUBLISHED'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == 0):?>
+			<td class="center"  data-sort-value="2">
+				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
+					<?php echo JText::_('INACTIVE'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == 2):?>
+			<td class="center"  data-sort-value="3">
+				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
+					<?php echo JText::_('ARCHIVED'); ?>
+				</span>
+			</td>
+		<?php elseif ($item->published == -2):?>
+			<td class="center"  data-sort-value="4">
+				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
+					<?php echo JText::_('ARCHIVED'); ?>
+				</span>
+			</td>
+		<?php endif; ?>
+		<td class="nowrap center hidden-phone">
+			<?php echo $item->id; ?>
+		</td>
+	</tr>
 <?php endforeach; ?>
+</tbody>
+</table>
+<?php else: ?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php endif; ?>
 </div>

admin/layouts/admin_view/details_above.php

@@ -11,10 +11,10 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		settings_above.php
+	@subpackage		details_above.php
 	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 

admin/layouts/admin_view/details_left.php

@@ -11,10 +11,10 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		settings_left.php
+	@subpackage		details_left.php
 	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
@@ -33,9 +33,6 @@ $fields = $displayData->get('fields') ?: array(
 	'name_single',
 	'name_list',
 	'type',
-	'short_description',
-	'description',
-	'add_fadein',
 	'icon',
 	'icon_add',
 	'icon_category'

admin/layouts/admin_view/details_right.php

@@ -11,10 +11,10 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		settings_right.php
+	@subpackage		details_right.php
 	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
@@ -30,11 +30,9 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
-	'note_on_permissions',
+	'short_description',
-	'addpermissions',
+	'description',
-	'note_on_tabs',
+	'add_fadein'
-	'addtabs',
-	'addlinked_views'
 );
 
 $hiddenFields = $displayData->get('hidden_fields') ?: array();

admin/layouts/admin_view/details_under.php

@@ -11,10 +11,10 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		settings_under.php
+	@subpackage		details_under.php
 	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@copyright		Copyright (C) 2015. All Rights Reserved
 	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 

admin/layouts/admin_view/fields_conditions_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_conditions_fullwidth.php

admin/layouts/admin_view/fields_conditions_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_conditions_left.php

admin/layouts/admin_view/fields_conditions_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_conditions_right.php

admin/layouts/admin_view/javascript_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/linked_components_fullwidth.php

@@ -1,138 +0,0 @@
-<?php
-/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
-    __      __       _     _____                 _                                  _     __  __      _   _               _
-    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
-     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
-      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
-       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
-        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
-                                                        |_| 				
-/-------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		2.5.8
-	@build			12th October, 2017
-	@created		30th April, 2015
-	@package		Component Builder
-	@subpackage		linked_components_fullwidth.php
-	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
-	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
-	
-	Builds Complex Joomla Components 
-                                                             
-/-----------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-
-defined('_JEXEC') or die('Restricted access');
-
-// set the defaults
-$items	= $displayData->vxzlinked_components;
-$user	= JFactory::getUser();
-$id	= $displayData->item->id;
-$edit	= "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
-
-?>
-<div class="form-vertical">
-<?php if (ComponentbuilderHelper::checkArray($items)): ?>
-<table class="footable table data joomla_components" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
-<thead>
-	<tr>
-		<th data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SYSTEM_NAME_LABEL'); ?>
-		</th>
-		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL'); ?>
-		</th>
-		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPONENT_VERSION_LABEL'); ?>
-		</th>
-		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SHORT_DESCRIPTION_LABEL'); ?>
-		</th>
-		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_LABEL'); ?>
-		</th>
-		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL'); ?>
-		</th>
-		<th width="10" data-breakpoints="xs sm md">
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_STATUS'); ?>
-		</th>
-		<th width="5" data-type="number" data-breakpoints="xs sm md">
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ID'); ?>
-		</th>
-	</tr>
-</thead>
-<tbody>
-<?php foreach ($items as $i => $item): ?>
-	<?php
-		$canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
-		$canDo = ComponentbuilderHelper::getActions('joomla_component',$item,'joomla_components');
-	?>
-	<tr>
-		<td class="nowrap">
-			<?php if ($canDo->get('core.edit')): ?>
-				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=admin_view&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->system_name); ?></a>
-					<?php if ($item->checked_out): ?>
-						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_components.', $canCheckin); ?>
-					<?php endif; ?>
-			<?php else: ?>
-				<div class="name"><?php echo $displayData->escape($item->system_name); ?></div>
-			<?php endif; ?>
-		</td>
-		<td>
-			<?php echo $displayData->escape($item->name_code); ?>
-		</td>
-		<td>
-			<?php echo $displayData->escape($item->component_version); ?>
-		</td>
-		<td>
-			<?php echo $displayData->escape($item->short_description); ?>
-		</td>
-		<td>
-			<?php echo $displayData->escape($item->companyname); ?>
-		</td>
-		<td>
-			<?php echo $displayData->escape($item->author); ?>
-		</td>
-		<?php if ($item->published == 1):?>
-			<td class="center"  data-sort-value="1">
-				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
-					<?php echo JText::_('PUBLISHED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 0):?>
-			<td class="center"  data-sort-value="2">
-				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
-					<?php echo JText::_('INACTIVE'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == 2):?>
-			<td class="center"  data-sort-value="3">
-				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
-					<?php echo JText::_('ARCHIVED'); ?>
-				</span>
-			</td>
-		<?php elseif ($item->published == -2):?>
-			<td class="center"  data-sort-value="4">
-				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
-					<?php echo JText::_('ARCHIVED'); ?>
-				</span>
-			</td>
-		<?php endif; ?>
-		<td class="nowrap center hidden-phone">
-			<?php echo $item->id; ?>
-		</td>
-	</tr>
-<?php endforeach; ?>
-</tbody>
-</table>
-<?php else: ?>
-	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-	</div>
-<?php endif; ?>
-</div>

admin/layouts/admin_view/mysql_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_fullwidth.php

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

admin/layouts/batchselection.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/custom_admin_view/custom_script_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/custom_admin_view/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/custom_admin_view/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/custom_admin_view/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/custom_admin_view/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/custom_admin_view/details_rightside.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php

admin/layouts/custom_admin_view/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/custom_admin_view/linked_components_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php

admin/layouts/custom_admin_view/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/custom_admin_view/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/custom_code/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/custom_code/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/custom_code/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/custom_code/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/custom_code/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/custom_code/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/custom_code/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/dynamic_get/abacus_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_fullwidth.php

admin/layouts/dynamic_get/abacus_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_left.php

admin/layouts/dynamic_get/custom_script_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/dynamic_get/joint_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		joint_fullwidth.php

admin/layouts/dynamic_get/main_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		main_above.php

admin/layouts/dynamic_get/main_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		main_fullwidth.php

admin/layouts/dynamic_get/main_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		main_left.php

admin/layouts/dynamic_get/main_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		main_right.php

admin/layouts/dynamic_get/main_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		main_under.php

admin/layouts/dynamic_get/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/dynamic_get/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/field/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/field/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/field/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/field/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/field/linked_admin_views_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_admin_views_fullwidth.php
@@ -68,7 +68,7 @@ $edit	= "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.
 	?>
 	<tr>
 		<td class="nowrap">
-			<?php if ($canDo->get('core.edit')): ?>
+			<?php if ($canDo->get('admin_view.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>&ref=field&refid=<?php echo $id; ?>"><?php echo $displayData->escape($item->system_name); ?></a>
 					<?php if ($item->checked_out): ?>
 						<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'admin_views.', $canCheckin); ?>

admin/layouts/field/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/field/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/field/scripts_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.5.8
-	@build			12th October, 2017
+	@build			13th October, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_left.php