README.md

@@ -104,12 +104,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*: 3rd March, 2017
++ *Last Build*: 6th March, 2017
 + *Version*: 2.3.6
 + *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*: **92696**
++ *Line count*: **92701**
-+ *File count*: **596**
++ *File count*: **599**
 + *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/README.txt

@@ -104,12 +104,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*: 3rd March, 2017
++ *Last Build*: 6th March, 2017
 + *Version*: 2.3.6
 + *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*: **92696**
++ *Line count*: **92701**
-+ *File count*: **596**
++ *File count*: **599**
 + *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/assets/css/admin.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/dashboard.css

@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/compiler/joomla_3/Helper.php

@@ -146,13 +146,18 @@ abstract class ###Component###Helper
 
 		if (self::checkArray($where))
 		{
+			// prep main <-- why? well if $main='' is empty then $table can be categories or users
+			if (self::checkString($main))
+			{
+				$main = '_'.ltrim($main, '_');
+			}
 			// Get a db connection.
 			$db = JFactory::getDbo();
 			// Create a new query object.
 			$query = $db->getQuery(true);
 
 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			$query->from($db->quoteName('#_'.$main.'_'.$table));
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();

admin/compiler/joomla_3/Helper_category.php

@@ -0,0 +1,35 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@package		Component Builder
+	@subpackage		componentbuilder.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * ###Component### Component Category Tree
+ */
+###CATEGORY_CLASS_TREES###

admin/compiler/joomla_3/Helper_category_view.php

@@ -0,0 +1,50 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@package		Component Builder
+	@subpackage		componentbuilder.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/joomla-component-builder>
+	@my wife		Roline van der Merwe <http://www.vdm.io/>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+/**
+ * ###Component### ###View### Component Category Tree
+ */
+class ###Component######Views###Categories extends JCategories
+{
+	/**
+	 * Class constructor
+	 *
+	 * @param   array  $options  Array of options
+	 *
+	 */
+	public function __construct($options = array())
+	{
+		$options['table'] = '#__###component###_###view###';
+		$options['extension'] = 'com_###component###.###views###';
+
+		parent::__construct($options);
+	}
+}

admin/compiler/joomla_3/Helper_site.php

@@ -320,13 +320,18 @@ abstract class ###Component###Helper
 
 		if (self::checkArray($where))
 		{
+			// prep main <-- why? well if $main='' is empty then $table can be categories or users
+			if (self::checkString($main))
+			{
+				$main = '_'.ltrim($main, '_');
+			}
 			// Get a db connection.
 			$db = JFactory::getDbo();
 			// Create a new query object.
 			$query = $db->getQuery(true);
 
 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			$query->from($db->quoteName('#_'.$main.'_'.$table));
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();

admin/compiler/joomla_3/settings.json

@@ -157,6 +157,13 @@
             "rename": "Helper_site",
             "type": "file"
       },
+      "Helper_category.php": {
+            "naam":"Helper_category.php",
+            "path": "c0mp0n3nt/site/helpers",
+            "rename": "new",
+            "newName": "category.php",
+            "type": "file"
+      },
       "script.php": {
             "naam":"script.php",
             "path": "c0mp0n3nt/",
@@ -677,6 +684,11 @@
           "rename": "new",
           "newName": "submitbutton.js",
           "type": "custom_form"
+        },
+        "Helper_category_view.php": {
+          "path": "c0mp0n3nt/site/helpers",
+          "rename": "Helper_category_view",
+          "type": "category"
         }
       },
       "custom_admin": {

admin/componentbuilder.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controller.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/ajax.json.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/componentbuilder.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/help.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/import.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/helpers/compiler/a_Get.php

@@ -529,6 +529,14 @@ class Get
 
 		// Load the results as a list of stdClass objects
 		$component = $this->db->loadObject();
+		
+		// set component place holders
+		$this->placeholders['###component###'] = ComponentbuilderHelper::safeString($component->name_code);
+		$this->placeholders['###Component###'] = ComponentbuilderHelper::safeString($component->name_code, 'F');
+		$this->placeholders['###COMPONENT###'] = ComponentbuilderHelper::safeString($component->name_code, 'U');
+		$this->placeholders['[[[component]]]'] = $this->placeholders['###component###'];
+		$this->placeholders['[[[Component]]]'] = $this->placeholders['###Component###'];
+		$this->placeholders['[[[COMPONENT]]]'] = $this->placeholders['###COMPONENT###'];
 		// set component sales name
 		$component->sales_name = ComponentbuilderHelper::safeString($component->system_name);
 		// ensure version naming is correct
@@ -669,7 +677,7 @@ class Get
 		}
 
 		// set the site_view data
-		$site_views	= json_decode($component->addsite_views,true);
+		$site_views = json_decode($component->addsite_views,true);
 		if (ComponentbuilderHelper::checkArray($site_views))
 		{
 			foreach ($site_views as $option => $values)
@@ -690,11 +698,14 @@ class Get
 			$this->lang = 'site';
 			$this->target = 'site';
 			// load the view and field data
-			foreach ($component->site_views as $key => &$view)
+			if (isset($component->site_views) && ComponentbuilderHelper::checkArray($component->site_views))
 			{
-				// has become a lacacy issue, can't remove this
+				foreach ($component->site_views as $key => &$view)
-				$view['view'] = $view['siteview'];
+				{
-				$view['settings'] = $this->getCustomViewData($view['view']);
+					// has become a lacacy issue, can't remove this
+					$view['view'] = $view['siteview'];
+					$view['settings'] = $this->getCustomViewData($view['view']);
+				}
 			}
 		}
 
@@ -720,11 +731,14 @@ class Get
 			$this->lang = 'admin';
 			$this->target = 'custom_admin';
 			// load the view and field data
-			foreach ($component->custom_admin_views as $key => &$view)
+			if (isset($component->custom_admin_views) && ComponentbuilderHelper::checkArray($component->custom_admin_views))
 			{
-				// has become a lacacy issue, can't remove this
+				foreach ($component->custom_admin_views as $key => &$view)
-				$view['view'] = $view['customadminview'];
+				{
-				$view['settings'] = $this->getCustomViewData($view['view'], 'custom_admin_view');
+					// has become a lacacy issue, can't remove this
+					$view['view'] = $view['customadminview'];
+					$view['settings'] = $this->getCustomViewData($view['view'], 'custom_admin_view');
+				}
 			}
 		}
 

admin/helpers/compiler/c_Fields.php

@@ -311,7 +311,14 @@ class Fields extends Structure
 	 * 
 	 * @var    array
 	 */
-	public $fieldsNames = array();
+	public $fieldsNames = array();	
+	
+	/**
+	 * Set unique Names
+	 * 
+	 * @var    array
+	 */
+	public $uniqueNames = array();
 	
 	/**
 	 * Default Fields
@@ -368,6 +375,19 @@ class Fields extends Structure
 			// setup the list view and single view name
 			$listViewName = ComponentbuilderHelper::safeString($view['settings']->name_list);
 			$viewName = ComponentbuilderHelper::safeString($view['settings']->name_single);
+			// set some place holder for this view
+			$this->placeholders['###view###'] = $viewName;
+			$this->placeholders['###VIEW###'] = strtoupper($viewName);
+			$this->placeholders['###View###'] = ucfirst($viewName);
+			$this->placeholders['[[[view]]]'] = $this->placeholders['###view###'];
+			$this->placeholders['[[[VIEW]]]'] = $this->placeholders['###VIEW###'];
+			$this->placeholders['[[[View]]]'] = $this->placeholders['###View###'];			
+			$this->placeholders['###views###'] = $listViewName;
+			$this->placeholders['###VIEWS###'] = strtoupper($listViewName);
+			$this->placeholders['###Views###'] = ucfirst($listViewName);
+			$this->placeholders['[[[views]]]'] = $this->placeholders['###views###'];
+			$this->placeholders['[[[VIEWS]]]'] = $this->placeholders['###VIEWS###'];
+			$this->placeholders['[[[Views]]]'] = $this->placeholders['###Views###'];
 			// add metadata to the view
 			if ($view['metadata'])
 			{
@@ -385,12 +405,12 @@ class Fields extends Structure
 				$readOnly = "\t\t\t" . 'readonly="true"' . PHP_EOL."\t\t\t" . 'disabled="true"';
 			}
 			// main lang prefix
-			$langView = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'U');
+			$langView = $this->langPrefix . '_' . $this->placeholders['###VIEW###'];
-			$langViews = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_list, 'U');
+			$langViews = $this->langPrefix . '_' . $this->placeholders['###VIEWS###'];
 			// set default lang
 			$this->langContent[$this->lang][$langView] = $view['settings']->name_single;
 			$this->langContent[$this->lang][$langViews] = $view['settings']->name_list;
-			// set the singel name
+			// set the single name
 			$viewSingleName = ComponentbuilderHelper::safeString($view['settings']->name_single, 'W');
 			// set global item strings
 			$this->langContent[$this->lang][$langViews . '_N_ITEMS_ARCHIVED'] = "%s " . $view['settings']->name_list . " archived.";
@@ -427,6 +447,12 @@ class Fields extends Structure
 			$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.";
 			
+			// check if the same field is added multiple times
+			foreach ($view['settings']->fields as $field)
+			{
+				$name = ComponentbuilderHelper::safeString($field['settings']->name);
+				$this->setUniqueNameKeeper($field, $view['settings']->type, $name, $viewName);
+			}
 			// start adding dynamc fields
 			$dynamcfields = '';
 			// place holders
@@ -633,6 +659,8 @@ class Fields extends Structure
 				$fieldSet[] = "\t\t</fieldset>";
 				$fieldSet[] = "\t</fields>";
 			}
+			// just to be safe, lets clear the view placeholders
+			$this->clearFromPlaceHolders('view');
 			// retunr the set
 			return implode(PHP_EOL, $fieldSet);
 		}
@@ -1135,18 +1163,18 @@ class Fields extends Structure
 	/**
 	 * set field attributes
 	 * 
-	 * @param   array    $field  The field data
+	 * @param   array    $field         The field data
-	 * @param   int      $viewType The view type
+	 * @param   int      $viewType      The view type
-	 * @param   string   $name The field name
+	 * @param   string   $name          The field name
-	 * @param   string   $typeName The field type
+	 * @param   string   $typeName      The field type
-	 * @param   boolean  $multiple The switch to set multiple selection option
+	 * @param   boolean  $multiple      The switch to set multiple selection option
-	 * @param   string   $langLabel The language string for field label
+	 * @param   string   $langLabel     The language string for field label
-	 * @param   string   $langView The language string of the view
+	 * @param   string   $langView      The language string of the view
 	 * @param   string   $spacerCounter The space counter value
-	 * @param   string   $listViewName The list view name
+	 * @param   string   $listViewName  The list view name
-	 * @param   string   $viewName The singel view name
+	 * @param   string   $viewName      The singel view name
-	 * @param   array    $placeholders The place holder and replace values
+	 * @param   array    $placeholders  The place holder and replace values
-	 * @param   boolean  $repeatable The repeatable field switch
+	 * @param   boolean  $repeatable    The repeatable field switch
 	 *
 	 * @return  array The field attributes
 	 * 
@@ -1264,12 +1292,16 @@ class Fields extends Structure
 					// use field core name only if not found in xml
 					if (!ComponentbuilderHelper::checkString($xmlValue))
 					{
+						// make sure the XML name is uniqe, so we can add one field multiple times
+						$name = $this->uniqueName($name, $viewName);
 						$xmlValue = $name;
 					}
 					// set the name if found
 					else
 					{
-						$name = $xmlValue;
+						// make sure the XML name is uniqe, so we can add one field multiple times
+						$xmlValue = $this->uniqueName($xmlValue, $viewName);
+						$name = $this->setPlaceholders($xmlValue);
 					}
 				}
 				elseif ($property['name'] === 'extension' || $property['name'] === 'directory')
@@ -1381,6 +1413,14 @@ class Fields extends Structure
 				// check if translatable
 				if (ComponentbuilderHelper::checkString($xmlValue) && $property['translatable'] == 1)
 				{
+					// update lable if field use multiple times
+					if ($property['name'] === 'label')
+					{
+						if (isset($fieldAttributes['name']) && isset($this->uniqueNames[$viewName]['names'][$fieldAttributes['name']]))
+						{
+							$xmlValue .= ' (' . ComponentbuilderHelper::safeString($this->uniqueNames[$viewName]['names'][$fieldAttributes['name']]) . ')';
+						}
+					}
 					// replace placeholders
 					$xmlValue = $this->setPlaceholders($xmlValue, $placeholders);
 					// insure custom lables dont get messed up
@@ -1432,18 +1472,17 @@ class Fields extends Structure
 							$xmlValue = $property['example'];
 						}
 					}
-
-					$fieldAttributes[$property['name']] = $xmlValue;
-
 					// load to langBuilder down the line
 					if ($property['name'] === 'label')
 					{
-						$langLabel = $xmlValue;
 						if ($setCustom)
 						{
 							$fieldAttributes['custom']['label'] = $customLabel;
 						}
+						$langLabel = $xmlValue;
 					}
+					// now set the value
+					$fieldAttributes[$property['name']] = $xmlValue;
 				}
 			}
 			// do some nice twigs beyond the default
@@ -1460,6 +1499,123 @@ class Fields extends Structure
 		return $fieldAttributes;
 	}
 
+	/**
+	 * Keep track of the field names, to see if it used multiple times
+	 * 
+	 * @param   array    $field     The field data
+	 * @param   string   $typeName  The field type
+	 * @param   string   $name      The field name
+	 * @param   string   $viewName  The singel view name
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function setUniqueNameKeeper(&$field, &$typeName, &$name, $viewName)
+	{
+		// setup a default field
+		if (ComponentbuilderHelper::checkArray($field['settings']->properties))
+		{
+			foreach ($field['settings']->properties as $property)
+			{
+				// reset
+				$xmlValue = '';
+				if ($property['name'] === 'name')
+				{
+					// if category then name must be catid (only one per view)
+					if ($typeName === 'category')
+					{
+						// only one allowed
+						return;
+					}
+					// if tag is set then enable all tag options for this view (only one per view)
+					elseif ($typeName === 'tag')
+					{
+						// only one allowed
+						return;
+					}
+					// if the field is set as alias it must be called alias
+					elseif (isset($field['alias']) && $field['alias'])
+					{
+						// only one allowed
+						return;
+					}
+					elseif ($typeName === 'spacer')
+					{
+						// not needed here
+						return;
+					}
+					else
+					{
+						$xmlValue = ComponentbuilderHelper::safeString(ComponentbuilderHelper::getBetween($field['settings']->xml, 'name="', '"'));
+					}
+
+					// use field core name only if not found in xml
+					if (!ComponentbuilderHelper::checkString($xmlValue))
+					{
+						$xmlValue = $name;
+					}
+					// make sure the XML name is uniqe, so we can add one field multiple times
+					return $this->setUniqueNameCounter($xmlValue, $viewName);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Count how many times the same field is used per view
+	 * 
+	 * @param   string   $name The name of the field
+	 * @param   string   $view The name of the view
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function setUniqueNameCounter($name, $view)
+	{
+		if (!isset($this->uniqueNames[$view]))
+		{
+			$this->uniqueNames[$view] = array();
+			$this->uniqueNames[$view]['counter'] = array();
+			$this->uniqueNames[$view]['names'] = array();
+		}
+		if (!isset($this->uniqueNames[$view]['counter'][$name]))
+		{
+			$this->uniqueNames[$view]['counter'][$name] = 1;
+			return;
+		}
+		// count how many times the field is used
+		$this->uniqueNames[$view]['counter'][$name]++;
+		return;
+	}
+	
+	/**
+	 * Naming each field with an unique name
+	 * 
+	 * @param   string   $name The name of the field
+	 * @param   string   $view The name of the view
+	 *
+	 * @return  string   the name
+	 * 
+	 */
+	protected function uniqueName($name, $view)
+	{
+		// only increment if the field name is used multiple times
+		if (isset($this->uniqueNames[$view]['counter'][$name]) && $this->uniqueNames[$view]['counter'][$name] > 1)
+		{
+			$counter = $this->uniqueNames[$view]['counter'][$name];
+			$uniqueName = ComponentbuilderHelper::safeString($name . '_' . $counter);
+			while (isset($this->uniqueNames[$view]['names'][$uniqueName]))
+			{
+				$counter--;
+				$uniqueName = ComponentbuilderHelper::safeString($name . '_' . $counter);
+			}
+			// set the new name
+			$this->uniqueNames[$view]['names'][$uniqueName] = $counter;
+			return $uniqueName;
+		}
+		return $name;
+	}
+
 
 	/**
 	 * set Builders

admin/helpers/compiler/e_Interpretation.php

@@ -9208,6 +9208,31 @@ class Interpretation extends Fields
 				$otherViews = $viewName_list;
 				$otherView = $viewName_single;
 			}
+			// load the category helper details in not already loaded
+			if (!isset($this->fileContentDynamic['category'.$otherViews]['###view###']))
+			{
+				// lets also set the category helper for this view
+				$target = array('site' => 'category'.$viewName_list);
+				$this->buildDynamique($target, 'category');
+				// insure the file gets updated
+				$this->fileContentDynamic['category'.$otherViews]['###view###'] = $otherView;
+				$this->fileContentDynamic['category'.$otherViews]['###View###'] = ucfirst($otherView);
+				$this->fileContentDynamic['category'.$otherViews]['###views###'] = $otherViews;
+				$this->fileContentDynamic['category'.$otherViews]['###Views###'] = ucfirst($otherViews);
+				// set script to global helper file
+				$includeHelper = array();
+				$includeHelper[] = "\n//".$this->setLine(__LINE__)."Insure this view category file is loaded.";
+				$includeHelper[] = "\$classname = '".$this->fileContentStatic['###component###'] . ucfirst($viewName_list) . "Categories';";
+				$includeHelper[] = "if (!class_exists(\$classname))";
+				$includeHelper[] = "{";
+				$includeHelper[] = "\t\$path = JPATH_SITE . '/components/com_".$this->fileContentStatic['###component###']."/helpers/category" . $viewName_list . ".php';";
+				$includeHelper[] = "\tif (is_file(\$path))";
+				$includeHelper[] = "\t{";
+				$includeHelper[] = "\t\tinclude_once \$path;";
+				$includeHelper[] = "\t}";
+				$includeHelper[] = "}";
+				$this->fileContentStatic['###CATEGORY_CLASS_TREES###'] .= implode("\n",$includeHelper);
+			}
 			// return category view string
 			if (isset($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###']) && ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###']))
 			{

admin/helpers/compiler/f_Infusion.php

@@ -80,13 +80,13 @@ class Infusion extends Interpretation
 		if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))
 		{
 			// ###COMPONENT###
-			$this->fileContentStatic['###COMPONENT###'] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'U');
+			$this->fileContentStatic['###COMPONENT###'] = $this->placeholders['###COMPONENT###'];
 
 			// ###Component###
-			$this->fileContentStatic['###Component###'] = ComponentbuilderHelper::safeString($this->componentData->name_code, 'F');
+			$this->fileContentStatic['###Component###'] = $this->placeholders['###Component###'];
 
 			// ###component###
-			$this->fileContentStatic['###component###'] = ComponentbuilderHelper::safeString($this->componentData->name_code);
+			$this->fileContentStatic['###component###'] = $this->placeholders['###component###'];
 
 			// ###COMPANYNAME###
 			$this->fileContentStatic['###COMPANYNAME###'] = trim(JFilterOutput::cleanText($this->componentData->companyname));
@@ -132,20 +132,13 @@ class Infusion extends Interpretation
 
 			// ###ACCESS_SECTIONS###
 			$this->fileContentStatic['###ACCESS_SECTIONS###'] = $this->setAccessSections();
-
-			// set component place holders
-			$this->placeholders = array(
-				'###Component###'		=> $this->fileContentStatic['###Component###'],
-				'###component###'		=> $this->fileContentStatic['###component###'],
-				'###COMPONENT###'		=> $this->fileContentStatic['###COMPONENT###'],
-				'[[[Component]]]'		=> $this->fileContentStatic['###Component###'],
-				'[[[component]]]'		=> $this->fileContentStatic['###component###'],
-				'[[[COMPONENT]]]'		=> $this->fileContentStatic['###COMPONENT###']
-				);
 			
 			// ###CONFIG_FIELDSETS###
 			$keepLang = $this->lang;
 			$this->lang = 'admin';
+			
+			// start loading the category tree scripts
+			 $this->fileContentStatic['###CATEGORY_CLASS_TREES###'] = '';
 			// run the field sets for first time
 			$this->setConfigFieldsets(1);
 			$this->lang = $keepLang;
@@ -216,6 +209,9 @@ class Infusion extends Interpretation
                         // start dynamic build
                         foreach ($this->componentData->admin_views as $view)
                         {
+				// just to be safe, lets clear the view placeholders
+				$this->clearFromPlaceHolders('view');
+				// set the target
                                 $this->target	= 'admin';
                                 $this->lang     = 'admin';
                                 // set main keys
@@ -253,11 +249,11 @@ class Infusion extends Interpretation
 
                                         // set some place holder for the views
                                         $this->placeholders['###view###'] = $viewName_single;
-                                        $this->placeholders['###VIEW###'] = $viewName_u;
                                         $this->placeholders['###View###'] = $viewName_f;
+                                        $this->placeholders['###VIEW###'] = $viewName_u;
                                         $this->placeholders['[[[view]]]'] = $viewName_single;
-                                        $this->placeholders['[[[VIEW]]]'] = $viewName_u;
                                         $this->placeholders['[[[View]]]'] = $viewName_f;
+                                        $this->placeholders['[[[VIEW]]]'] = $viewName_u;
 
                                         // set license per view if needed
                                         $this->setLockLicensePer($viewName_single, $this->target);
@@ -389,11 +385,11 @@ class Infusion extends Interpretation
 
                                         // set some place holder for the views
                                         $this->placeholders['###views###'] = $viewName_list;
-                                        $this->placeholders['###VIEWS###'] = $viewsName_u;
                                         $this->placeholders['###Views###'] = $viewsName_f;
+                                        $this->placeholders['###VIEWS###'] = $viewsName_u;
                                         $this->placeholders['[[[views]]]'] = $viewName_list;
-                                        $this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
                                         $this->placeholders['[[[Views]]]'] = $viewsName_f;
+                                        $this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
 
                                         // set the export/import option
                                         if ($view['port'])

admin/helpers/componentbuilder.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -798,13 +798,18 @@ abstract class ComponentbuilderHelper
 
 		if (self::checkArray($where))
 		{
+			// prep main <-- why? well if $main='' is empty then $table can be categories or users
+			if (self::checkString($main))
+			{
+				$main = '_'.ltrim($main, '_');
+			}
 			// Get a db connection.
 			$db = JFactory::getDbo();
 			// Create a new query object.
 			$query = $db->getQuery(true);
 
 			$query->select($db->quoteName(array($what)));
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			$query->from($db->quoteName('#_'.$main.'_'.$table));
 			$query->where($db->quoteName($whereString) . ' '.$operator.' (' . implode(',',$where) . ')');
 			$db->setQuery($query);
 			$db->execute();

admin/helpers/headercheck.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php

admin/helpers/html/batch_.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

admin/layouts/admin_view/css_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php

admin/layouts/admin_view/fields_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/admin_view/javascript_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/linked_components_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/custom_admin_view/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/custom_code/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/custom_code/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/custom_code/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/dynamic_get/abacus_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/dynamic_get/gettable_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_above.php

admin/layouts/dynamic_get/gettable_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_fullwidth.php

admin/layouts/dynamic_get/gettable_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_left.php

admin/layouts/dynamic_get/gettable_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_right.php

admin/layouts/dynamic_get/gettable_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_under.php

admin/layouts/dynamic_get/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/dynamic_get/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/field/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/field/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/field/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/field/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 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.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_admin_views_fullwidth.php

admin/layouts/field/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/field/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/field/scripts_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_left.php

admin/layouts/field/scripts_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_right.php

admin/layouts/fieldtype/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/fieldtype/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/fieldtype/fields_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/fieldtype/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/fieldtype/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/help_document/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/help_document/details_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/help_document/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/help_document/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/help_document/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/help_document/publishing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/help_document/publlshing.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/joomla_component/admin_views_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php

admin/layouts/joomla_component/custom_admin_views_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views_fullwidth.php

admin/layouts/joomla_component/details_above.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/joomla_component/details_left.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/joomla_component/details_right.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/joomla_component/details_under.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_build_beta_fullwidth.php

admin/layouts/joomla_component/dynamic_integration_fullwidth.php

@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.3.6
-	@build			3rd March, 2017
+	@build			6th March, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_integration_fullwidth.php