Changed alias in site-view and custom-admin-view to codename so we can have views with the same names in different components, added warning notice if custom code can't be added, Bug fixes in the demo content dates

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.2.9)
+# Component Builder (2.3.0)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.9) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.0) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -101,15 +101,15 @@ Component Builder is mapped as a component in itself on my local development env
 # Build Details
 
 + *Company*: [Vast Development Method](http://vdm.bz/component-builder)
-+ *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io)
++ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 2nd February, 2017
++ *Last Build*: 4th February, 2017
-+ *Version*: 2.2.9
++ *Version*: 2.3.0
 + *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*: **91088**
++ *Line count*: **91058**
-+ *File count*: **587**
++ *File count*: **589**
 + *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/README.txt

@@ -1,4 +1,4 @@
-# Component Builder (2.2.9)
+# Component Builder (2.3.0)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.2.9) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.3.0) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -101,15 +101,15 @@ Component Builder is mapped as a component in itself on my local development env
 # Build Details
 
 + *Company*: [Vast Development Method](http://vdm.bz/component-builder)
-+ *Author*: [Llewellyn van der Merwe](mailto:info@vdm.io)
++ *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 2nd February, 2017
++ *Last Build*: 4th February, 2017
-+ *Version*: 2.2.9
++ *Version*: 2.3.0
 + *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*: **91088**
++ *Line count*: **91058**
-+ *File count*: **587**
++ *File count*: **589**
 + *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 94 of this MVC
+	@version		@update number 95 of this MVC
-	@build			13th January, 2017
+	@build			3rd February, 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 94 of this MVC
+	@version		@update number 95 of this MVC
-	@build			13th January, 2017
+	@build			3rd February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 80 of this MVC
+	@version		@update number 81 of this MVC
-	@build			2nd February, 2017
+	@build			3rd February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 80 of this MVC
+	@version		@update number 81 of this MVC
-	@build			2nd February, 2017
+	@build			3rd February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		components.css

admin/assets/css/custom_admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 18 of this MVC
+	@version		@update number 22 of this MVC
-	@build			13th January, 2017
+	@build			3rd February, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css

admin/assets/css/custom_admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 18 of this MVC
+	@version		@update number 22 of this MVC
-	@build			13th January, 2017
+	@build			3rd February, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/field.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
+	@version		@update number 37 of this MVC
-	@build			12th January, 2017
+	@build			3rd February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
+	@version		@update number 37 of this MVC
-	@build			12th January, 2017
+	@build			3rd February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 65 of this MVC
+	@version		@update number 66 of this MVC
-	@build			18th October, 2016
+	@build			3rd February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 65 of this MVC
+	@version		@update number 66 of this MVC
-	@build			18th October, 2016
+	@build			3rd February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/assets/css/site_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 44 of this MVC
+	@version		@update number 48 of this MVC
-	@build			29th January, 2017
+	@build			3rd February, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_view.css

admin/assets/css/site_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 44 of this MVC
+	@version		@update number 48 of this MVC
-	@build			29th January, 2017
+	@build			3rd February, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_views.css

admin/assets/css/template.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 39 of this MVC
+	@version		@update number 40 of this MVC
-	@build			18th October, 2016
+	@build			3rd February, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 39 of this MVC
+	@version		@update number 40 of this MVC
-	@build			18th October, 2016
+	@build			3rd February, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		templates.css

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/config.xml

@@ -81,7 +81,7 @@
 			label="COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_LABEL"
 			description="COM_COMPONENTBUILDER_CONFIG_AUTHOR_EMAIL_DESC"
 			size="60"
-			default="info@vdm.io"
+			default="joomla@vdm.io"
 			readonly="true"
 			class="readonly"
 		/>

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 94 of this MVC
+	@version		@update number 95 of this MVC
-	@build			13th January, 2017
+	@build			3rd February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 94 of this MVC
+	@version		@update number 95 of this MVC
-	@build			13th January, 2017
+	@build			3rd February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 80 of this MVC
+	@version		@update number 81 of this MVC
-	@build			2nd February, 2017
+	@build			3rd February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 80 of this MVC
+	@version		@update number 81 of this MVC
-	@build			2nd February, 2017
+	@build			3rd February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		components.php

admin/controllers/custom_admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 18 of this MVC
+	@version		@update number 22 of this MVC
-	@build			13th January, 2017
+	@build			3rd February, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php

admin/controllers/custom_admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 18 of this MVC
+	@version		@update number 22 of this MVC
-	@build			13th January, 2017
+	@build			3rd February, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
+	@version		@update number 37 of this MVC
-	@build			12th January, 2017
+	@build			3rd February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
+	@version		@update number 37 of this MVC
-	@build			12th January, 2017
+	@build			3rd February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 65 of this MVC
+	@version		@update number 66 of this MVC
-	@build			18th October, 2016
+	@build			3rd February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 65 of this MVC
+	@version		@update number 66 of this MVC
-	@build			18th October, 2016
+	@build			3rd February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 44 of this MVC
+	@version		@update number 48 of this MVC
-	@build			29th January, 2017
+	@build			3rd February, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_view.php

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 44 of this MVC
+	@version		@update number 48 of this MVC
-	@build			29th January, 2017
+	@build			3rd February, 2017
 	@created		29th May, 2015
 	@package		Component Builder
 	@subpackage		site_views.php

admin/controllers/template.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 39 of this MVC
+	@version		@update number 40 of this MVC
-	@build			18th October, 2016
+	@build			3rd February, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 39 of this MVC
+	@version		@update number 40 of this MVC
-	@build			18th October, 2016
+	@build			3rd February, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/helpers/compiler.php

@@ -104,7 +104,9 @@ class Compiler extends Infusion
 			// now insert into the new files
 			if (ComponentbuilderHelper::checkArray($this->customCode))
 			{
-				$this->addCustomCode();
+				// load error messages incase code can not be added
+				$app = JFactory::getApplication();
+				$this->addCustomCode($app);
 			}
 			// move the update server into place
 			$this->setUpdateServer();
@@ -345,8 +347,8 @@ class Compiler extends Infusion
 	// link canges made to views into the file license
 	protected function fixLicenseValues($data)
 	{
-		// check if these files have its own config data
+		// check if these files have its own config data)
-		if (isset($data['config']) && ComponentbuilderHelper::checkArray($data['config']))
+		if (isset($data['config']) && ComponentbuilderHelper::checkArray($data['config']) && (!isset($this->componentData->mvc_versiondate) || $this->componentData->mvc_versiondate == 1))
 		{
 			foreach ($data['config'] as $key => $value)
 			{
@@ -589,7 +591,7 @@ class Compiler extends Infusion
 		return false;
 	}
 	
-	protected function addCustomCode()
+	protected function addCustomCode($app)
 	{
 		foreach($this->customCode as $nr => $target)
 		{
@@ -605,6 +607,7 @@ class Compiler extends Infusion
 				$cut		= $size - 1;
 				$found		= false;
 				$bites		= 0;
+				$lineBites	= array();
 				$replace	= array();
 				if ($target['type'] == 1 && isset($target['hashendtarget'][0]) && $target['hashendtarget'][0] > 0)
 				{
@@ -624,13 +627,15 @@ class Compiler extends Infusion
 				{
 					foreach (new SplFileObject($file) as $lineNumber => $lineContent)
 					{
+						// if not found we need to load line bites per line
+						$lineBites[$lineNumber] = (int) mb_strlen($lineContent, '8bit');
 						if (!$found)
 						{
-							$bites = (int) bcadd(mb_strlen($lineContent, '8bit'), $bites);
+							$bites = (int) bcadd($lineBites[$lineNumber], $bites);
 						}
 						if ($found && !$foundEnd)
 						{
-							$replace[] = (int) mb_strlen($lineContent, '8bit');
+							$replace[] = (int) $lineBites[$lineNumber];
 							// we musk keep last three lines to dynamic find target entry
 							$fingerPrint[$lineNumber] = trim($lineContent);
 							// check lines each time if it fits our target
@@ -649,10 +654,11 @@ class Compiler extends Infusion
 									$fingerPrint = array_slice($fingerPrint, -$cutEnd, $cutEnd, true);
 								}
 							}
+							continue;
 						}
 						if ($found && $foundEnd)
 						{
-							$replace[] = (int) mb_strlen($lineContent, '8bit');
+							$replace[] = (int) $lineBites[$lineNumber];
 						}
 						// we musk keep last three lines to dynamic find target entry
 						$fingerPrint[$lineNumber] = trim($lineContent);
@@ -681,7 +687,7 @@ class Compiler extends Infusion
 					if ($found)
 					{
 						$placeholder	= $this->getPlaceHolder($target['type'], $target['id']);
-						$data		= $placeholder['start'] . "\n" . $target['code'] . $placeholder['end'] . "\n";
+						$data		= $placeholder['start'] . "\n" . $target['code'] . $placeholder['end'];
 						if ($target['type'] == 2)
 						{
 							// found it now add code from the next line
@@ -690,26 +696,53 @@ class Compiler extends Infusion
 						elseif ($target['type'] == 1 && $foundEnd)
 						{
 							// found it now add code from the next line
-							$this->addDataToFile($file, $data, $bites, (int) array_sum($replace));
+							$this->addDataToFile($file, $data . "\n", $bites, (int) array_sum($replace));
 						}
 						else
 						{
-							// TODO give developer a notice that the code could not be added and needs his attention.
+							// Load escaped code since the target endhash has changed
+							$this->loadEscapedCode($file, $target, $lineBites);
+							$app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at line %s. This could be due to a change to lines below the custom code.', $target['path'], $target['from_line']), 'warning');
 						}
 					}
 					else
 					{
-						// TODO give developer a notice that the code could not be added and needs his attention.
+						// Load escaped code since the target hash has changed
+						$this->loadEscapedCode($file, $target, $lineBites);
+						$app->enqueueMessage(JText::sprintf('Custom code could not be added to <b>%s</b> please review the file at line %s. This could be due to a change to lines above the custom code.', $target['path'], $target['from_line']), 'warning');
 					}
 				}
 				else
 				{
-					// TODO give developer a notice that the code could not be added and needs his attention.
+					// Give developer a notice that file is not found.
+					$app->enqueueMessage(JText::sprintf('File <b>%s</b> could not be found, so the custom code for this file could not be addded.', $target['path']), 'warning');
 				}
 			}
 		}
 	}
 
+	protected function loadEscapedCode($file, $target, $lineBites)
+	{
+		// escape the code
+		$code = explode("\n", $target['code']);
+		$code = "\n// " .implode("\n// ",$code). "\n";
+		// get place holders
+		$placeholder	= $this->getPlaceHolder($target['type'], $target['id']);
+		// build the data
+		$data		= $placeholder['start'] . $code . $placeholder['end']. "\n";
+		// get the bites before insertion
+		$bitBucket	= array();
+		foreach($lineBites as $line => $value)
+		{
+			if ($line < $target['from_line'])
+			{
+				$bitBucket[] = $value;
+			}
+		}
+		// add to the file
+		$this->addDataToFile($file, $data, (int) array_sum($bitBucket));
+	}
+
 	// Thanks to http://stackoverflow.com/a/16813550/1429677
 	protected function addDataToFile($file, $data, $position, $replace = null)
 	{

admin/helpers/compiler/a_Get.php

@@ -1295,7 +1295,7 @@ class Get
 		$view->default = base64_decode($view->default);
 		$view->default = $this->setCustomContentLang($view->default);
 		// fix alias to use in code
-		$view->code = $this->uniqueCode(ComponentbuilderHelper::safeString($view->alias));
+		$view->code = $this->uniqueCode(ComponentbuilderHelper::safeString($view->codename));
 		$view->Code = ComponentbuilderHelper::safeString($view->code, 'F');
 		$view->CODE = ComponentbuilderHelper::safeString($view->code, 'U');
 		// insure the uikit components are loaded
@@ -2976,15 +2976,33 @@ class Get
 		{
 			case 1:
 				//xxx[REPLACED$$$$]xxx///1
-				return array(
+				if (!isset($this->componentData->add_placeholders) || $this->componentData->add_placeholders == 1)
-					'start' => '/***[REPLACED$$$$]***///'.$id, 
+				{
-					'end' => '/***[/REPLACED$$$$]***/');
+					return array(
+						'start' => '/***[REPLACED$$$$]***///'.$id, 
+						'end' => '/***[/REPLACED$$$$]***/');
+				}
+				else
+				{
+					return array(
+						'start' => "\t\t//////////////////////////////////////////", 
+						'end' => "\t\t//////////////////////////////////////////");
+				}
 				break;
 			case 2:
 				//xxx[INSERTED$$$$]xxx///1
-				return array(
+				if (!isset($this->componentData->add_placeholders) || $this->componentData->add_placeholders == 1)
+				{
+					return array(
 					'start' => '/***[INSERTED$$$$]***///'.$id, 
 					'end' => '/***[/INSERTED$$$$]***/');
+				}
+				else
+				{
+					return array(
+						'start' => "\t\t//////////////////////////////////////////", 
+						'end' => "\t\t//////////////////////////////////////////");
+				}
 				break;
 		}
 		return false;

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/helpers/headercheck.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -1532,10 +1532,6 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL="Add PHP (cus
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL="Add PHP (custom JViewLegacy methods)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW="Add Php View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL="Add PHP (custom view script)"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALIAS="Alias"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALIAS_DESCRIPTION="Add Name in Code Here"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALIAS_HINT="codename"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALIAS_LABEL="Name in Code"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARCHIVE="Archive"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARROW_DOWN="Arrow Down"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARROW_DOWN_FOUR="Arrow Down 4"
@@ -1584,6 +1580,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CHECKMARK_CIRCLE="Checkmark Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CHECKMARK_TWO="Checkmark 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CIRCLE="Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CLOCK="Clock"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME="Codename"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_DESCRIPTION="Add Name in Code Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_HINT="codename"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL="Name in Code"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COG="Cog"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COGS="Cogs"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMMENT="Comment"
@@ -2924,10 +2924,6 @@ COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL="Add PHP (custom view script)"
 COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT="Ajax Input"
 COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT_LABEL="Ajax Input"
 COM_COMPONENTBUILDER_SITE_VIEW_AJAX_INPUT_SELECT="Add"
-COM_COMPONENTBUILDER_SITE_VIEW_ALIAS="Alias"
-COM_COMPONENTBUILDER_SITE_VIEW_ALIAS_DESCRIPTION="Add Name in Code Here"
-COM_COMPONENTBUILDER_SITE_VIEW_ALIAS_HINT="codename"
-COM_COMPONENTBUILDER_SITE_VIEW_ALIAS_LABEL="Name in Code"
 COM_COMPONENTBUILDER_SITE_VIEW_ALNUM="ALNUM"
 COM_COMPONENTBUILDER_SITE_VIEW_ARCHIVE="Archive"
 COM_COMPONENTBUILDER_SITE_VIEW_ARRAY="ARRAY"
@@ -2986,6 +2982,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_CHECKMARK_TWO="Checkmark 2"
 COM_COMPONENTBUILDER_SITE_VIEW_CIRCLE="Circle"
 COM_COMPONENTBUILDER_SITE_VIEW_CLOCK="Clock"
 COM_COMPONENTBUILDER_SITE_VIEW_CMD="CMD"
+COM_COMPONENTBUILDER_SITE_VIEW_CODENAME="Codename"
+COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_DESCRIPTION="Add Name in Code Here"
+COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_HINT="codename"
+COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_LABEL="Name in Code"
 COM_COMPONENTBUILDER_SITE_VIEW_COG="Cog"
 COM_COMPONENTBUILDER_SITE_VIEW_COGS="Cogs"
 COM_COMPONENTBUILDER_SITE_VIEW_COMMENT="Comment"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/linked_components_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/component/admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php

admin/layouts/component/custom_admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views_fullwidth.php
@@ -52,7 +52,7 @@ $can	= ComponentbuilderHelper::getActions('custom_admin_view');
 			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME_LABEL'); ?>
 		</th>
 		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALIAS_LABEL'); ?>
+			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_LABEL'); ?>
 		</th>
 		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DESCRIPTION_LABEL'); ?>
@@ -90,7 +90,7 @@ $can	= ComponentbuilderHelper::getActions('custom_admin_view');
 			<?php echo $displayData->escape($item->name); ?>
 		</td>
 		<td>
-			<?php echo $displayData->escape($item->alias); ?>
+			<?php echo $displayData->escape($item->codename); ?>
 		</td>
 		<td>
 			<?php echo $displayData->escape($item->description); ?>

admin/layouts/component/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/component/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/component/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/component/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/component/dynamic_build_beta_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_build_beta_fullwidth.php

admin/layouts/component/dynamic_integration_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_integration_fullwidth.php

admin/layouts/component/libs_helpers_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		libs_helpers_fullwidth.php

admin/layouts/component/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/component/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/component/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/component/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/component/readme_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php

admin/layouts/component/readme_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php

admin/layouts/component/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/component/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/component/site_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php
@@ -52,7 +52,7 @@ $can	= ComponentbuilderHelper::getActions('site_view');
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_NAME_LABEL'); ?>
 		</th>
 		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
-			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ALIAS_LABEL'); ?>
+			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_CODENAME_LABEL'); ?>
 		</th>
 		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_DESCRIPTION_LABEL'); ?>
@@ -90,7 +90,7 @@ $can	= ComponentbuilderHelper::getActions('site_view');
 			<?php echo $displayData->escape($item->name); ?>
 		</td>
 		<td>
-			<?php echo $displayData->escape($item->alias); ?>
+			<?php echo $displayData->escape($item->codename); ?>
 		</td>
 		<td>
 			<?php echo $displayData->escape($item->description); ?>

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/custom_admin_view/custom_script_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/custom_admin_view/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/custom_admin_view/details_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/custom_admin_view/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
@@ -31,7 +31,7 @@ $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
 	'name',
-	'alias',
+	'codename',
 	'description',
 	'snippet',
 	'note_snippet_usage'

admin/layouts/custom_admin_view/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/custom_admin_view/details_rightside.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php

admin/layouts/custom_admin_view/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/custom_admin_view/linked_components_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php

admin/layouts/custom_admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/custom_admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/custom_code/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/custom_code/details_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php

admin/layouts/custom_code/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/custom_code/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/custom_code/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
+	@version		2.3.0
-	@build			2nd February, 2017
+	@build			4th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php