Further improved #37 to ensure language strings are set and reversed, also add extra buttons to the compiler page. Major restructure of custom code implementation to make it more stable. Resolved #40 by updating the default field sql values.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.2.9)
+# Component Builder (2.3.4)
 
 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.4) 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,16 +101,16 @@ 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*: 1st February, 2017
-+ *Version*: 2.2.9
++ *Last Build*: 13th February, 2017
++ *Version*: 2.3.4
 + *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*: **90719**
-+ *File count*: **583**
-+ *Folder count*: **104**
++ *Line count*: **91942**
++ *File count*: **594**
++ *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/README.txt

@@ -1,4 +1,4 @@
-# Component Builder (2.2.9)
+# Component Builder (2.3.4)
 
 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.4) 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,16 +101,16 @@ 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*: 1st February, 2017
-+ *Version*: 2.2.9
++ *Last Build*: 13th February, 2017
++ *Version*: 2.3.4
 + *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*: **90719**
-+ *File count*: **583**
-+ *Folder count*: **104**
++ *Line count*: **91942**
++ *File count*: **594**
++ *Folder count*: **105**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
 > Developed by [Llewellyn van der Merwe](mailto:joomla@vdm.io)

admin/access.xml

@@ -23,6 +23,10 @@
 		<action name="admin_view.export" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_EXPORT_DESC" />
 		<action name="admin_view.import" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC" />
 		<action name="admin_view.submenu" title="COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU" description="COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC" />
+		<action name="compiler.access" title="COM_COMPONENTBUILDER_COMPILER_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC" />
+		<action name="compiler.clear_tmp" title="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS" description="COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC" />
+		<action name="compiler.dashboard_list" title="COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST" description="COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC" />
+		<action name="compiler.submenu" title="COM_COMPONENTBUILDER_COMPILER_SUBMENU" description="COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC" />
 		<action name="custom_admin_view.access" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_ACCESS" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_ACCESS_DESC" />
 		<action name="custom_admin_view.batch" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_USE" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_USE_DESC" />
 		<action name="custom_admin_view.dashboard_add" title="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_ADD" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_DASHBOARD_ADD_DESC" />

admin/assets/css/admin.css

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

admin/assets/css/compiler.css

@@ -0,0 +1,27 @@
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		@update number 17 of this MVC
+	@build			13th February, 2017
+	@created		1st February, 2017
+	@package		Component Builder
+	@subpackage		compiler.css
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/* CSS Document */
+
+

admin/assets/css/component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 77 of this MVC
-	@build			26th December, 2016
+	@version		@update number 81 of this MVC
+	@build			13th February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 77 of this MVC
-	@build			26th December, 2016
+	@version		@update number 81 of this MVC
+	@build			13th 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
-	@build			13th January, 2017
+	@version		@update number 22 of this MVC
+	@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
-	@build			13th January, 2017
+	@version		@update number 22 of this MVC
+	@build			3rd February, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css

admin/assets/css/custom_code.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 14 of this MVC
-	@build			31st January, 2017
+	@version		@update number 55 of this MVC
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.css

admin/assets/css/custom_codes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 14 of this MVC
-	@build			31st January, 2017
+	@version		@update number 55 of this MVC
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			12th January, 2017
+	@version		@update number 37 of this MVC
+	@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
-	@build			12th January, 2017
+	@version		@update number 37 of this MVC
+	@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
-	@build			18th October, 2016
+	@version		@update number 67 of this MVC
+	@build			11th 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
-	@build			18th October, 2016
+	@version		@update number 67 of this MVC
+	@build			11th 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
-	@build			29th January, 2017
+	@version		@update number 48 of this MVC
+	@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
-	@build			29th January, 2017
+	@version		@update number 48 of this MVC
+	@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
-	@build			18th October, 2016
+	@version		@update number 40 of this MVC
+	@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
-	@build			18th October, 2016
+	@version		@update number 40 of this MVC
+	@build			3rd February, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		templates.css

admin/compiler/joomla_3/Helper.php

@@ -683,55 +683,67 @@ abstract class ###Component###Helper
 
 	public static function safeString($string, $type = 'L', $spacer = '_')
 	{
-		// remove all numbers and replace with english text version (works well only up to a thousand)
+		// remove all numbers and replace with english text version (works well only up to millions)
                 $string = self::replaceNumbers($string);
-
+		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
-                        // remove all other characters
-                        $string = trim($string);
-                        $string = preg_replace('/'.$spacer.'+/', ' ', $string);
-                        $string = preg_replace('/\s+/', ' ', $string);
-                        $string = preg_replace("/[^A-Za-z ]/", '', $string);
-                        // return a string with all first letter of each word uppercase(no undersocre)
-                        if ($type == 'W')
-                                    {
-                            return ucwords(strtolower($string));
-                        }
-                        elseif ($type == 'w')
-                        {
-                            return strtolower($string);
-                        }
-                        elseif ($type == 'Ww')
-                        {
-                            return ucfirst(strtolower($string));
-                        }
-                        elseif ($type == 'WW')
-                        {
-                            return strtoupper($string);
-                        }
-                        elseif ($type == 'U')
-                        {
-                                // replace white space with underscore
-                                $string = preg_replace('/\s+/', $spacer, $string);
-                                // return all upper
-                                return strtoupper($string);
-                        }
-                        elseif ($type == 'F')
-                        {
-                                // replace white space with underscore
-                                $string = preg_replace('/\s+/', $spacer, $string);
-                                // return with first caracter to upper
-                                return ucfirst(strtolower($string));
-                        }
-                        elseif ($type == 'L')
+			// remove all other characters
+			$string = trim($string);
+			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
+			$string = preg_replace('/\s+/', ' ', $string);
+			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// select final adaptations
+			if ($type === 'L' || $type === 'strtolower')
                         {
                                 // replace white space with underscore
                                 $string = preg_replace('/\s+/', $spacer, $string);
                                 // default is to return lower
                                 return strtolower($string);
                         }
-
+			elseif ($type === 'W')
+			{
+				// return a string with all first letter of each word uppercase(no undersocre)
+				return ucwords(strtolower($string));
+			}
+			elseif ($type === 'w' || $type === 'word')
+			{
+				// return a string with all lowercase(no undersocre)
+				return strtolower($string);
+			}
+			elseif ($type === 'Ww' || $type === 'Word')
+			{
+				// return a string with first letter of the first word uppercase and all the rest lowercase(no undersocre)
+				return ucfirst(strtolower($string));
+			}
+			elseif ($type === 'WW' || $type === 'WORD')
+			{
+				// return a string with all the uppercase(no undersocre)
+				return strtoupper($string);
+			}
+                        elseif ($type === 'U' || $type === 'strtoupper')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return all upper
+                                return strtoupper($string);
+                        }
+                        elseif ($type === 'F' || $type === 'ucfirst')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return with first caracter to upper
+                                return ucfirst(strtolower($string));
+                        }
+                        elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
+			{
+				// convert all words to first letter uppercase
+				$string = ucwords(strtolower($string));
+				// remove white space
+				$string = preg_replace('/\s+/', '', $string);
+				// now return first letter lowercase
+				return lcfirst($string);
+			}
                         // return string
                         return $string;
                 }

admin/compiler/joomla_3/Helper_site.php

@@ -675,60 +675,72 @@ abstract class ###Component###Helper
 
 	public static function safeString($string, $type = 'L', $spacer = '_')
 	{
-		// remove all numbers and replace with english text version (works well only up to a thousand)
-		$string = self::replaceNumbers($string);
-
-		if (self::checkString($string))
-		{
+		// remove all numbers and replace with english text version (works well only up to millions)
+                $string = self::replaceNumbers($string);
+		// 0nly continue if we have a string
+                if (self::checkString($string))
+                {
 			// remove all other characters
 			$string = trim($string);
 			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
 			$string = preg_replace('/\s+/', ' ', $string);
 			$string = preg_replace("/[^A-Za-z ]/", '', $string);
-			// return a string with all first letter of each word uppercase(no undersocre)
-			if ($type == 'W')
-				    {
-			    return ucwords(strtolower($string));
-			}
-				    elseif ($type == 'w')
-				    {
-			    return strtolower($string);
-			}
-				    elseif ($type == 'Ww')
-				    {
-			    return ucfirst(strtolower($string));
-			}
-				    elseif ($type == 'WW')
-				    {
-			    return strtoupper($string);
-			}
-			elseif ($type == 'U')
+			// select final adaptations
+			if ($type === 'L' || $type === 'strtolower')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // default is to return lower
+                                return strtolower($string);
+                        }
+			elseif ($type === 'W')
 			{
-				// replace white space with underscore
-				$string = preg_replace('/\s+/', $spacer, $string);
-				// return all upper
-				return strtoupper($string);
+				// return a string with all first letter of each word uppercase(no undersocre)
+				return ucwords(strtolower($string));
 			}
-			elseif ($type == 'F')
+			elseif ($type === 'w' || $type === 'word')
 			{
-				// replace white space with underscore
-				$string = preg_replace('/\s+/', $spacer, $string);
-				// return with first caracter to upper
+				// return a string with all lowercase(no undersocre)
+				return strtolower($string);
+			}
+			elseif ($type === 'Ww' || $type === 'Word')
+			{
+				// return a string with first letter of the first word uppercase and all the rest lowercase(no undersocre)
 				return ucfirst(strtolower($string));
 			}
-			elseif ($type == 'L')
+			elseif ($type === 'WW' || $type === 'WORD')
 			{
-				// replace white space with underscore
-				$string = preg_replace('/\s+/', $spacer, $string);
-				// default is to return lower
-				    return strtolower($string);
+				// return a string with all the uppercase(no undersocre)
+				return strtoupper($string);
 			}
-
-			// return string
-			return $string;
-		}
-		// not a string
-		return '';
+                        elseif ($type === 'U' || $type === 'strtoupper')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return all upper
+                                return strtoupper($string);
+                        }
+                        elseif ($type === 'F' || $type === 'ucfirst')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return with first caracter to upper
+                                return ucfirst(strtolower($string));
+                        }
+                        elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
+			{
+				// convert all words to first letter uppercase
+				$string = ucwords(strtolower($string));
+				// remove white space
+				$string = preg_replace('/\s+/', '', $string);
+				// now return first letter lowercase
+				return lcfirst($string);
+			}
+                        // return string
+                        return $string;
+                }
+                // not a string
+                return '';
 	}
 
 	public static function htmlEscape($var, $charset = 'UTF-8', $sorten = false, $length = 40)

admin/compiler/joomla_3/JModelAdmin_site.php

@@ -67,7 +67,7 @@ class ###Component###Model###View### extends JModelAdmin
 	public function getTable($type = '###view###', $prefix = '###Component###Table', $config = array())
 	{
 		return JTable::getInstance($type, $prefix, $config);
-	}
+	}###ADMIN_CUSTOM_BUTTONS_METHOD###
     
 	/**
 	 * Method to get a single record.
@@ -248,6 +248,45 @@ class ###Component###Model###View### extends JModelAdmin
 
 		return $data;
 	}###VALIDATIONFIX### ###UNIQUEFIELDS###
+	
+	/**
+	 * Method to delete one or more records.
+	 *
+	 * @param   array  &$pks  An array of record primary keys.
+	 *
+	 * @return  boolean  True if successful, false if an error occurs.
+	 *
+	 * @since   12.2
+	 */
+	public function delete(&$pks)
+	{###JMODELADMIN_BEFORE_DELETE###
+		if (!parent::delete($pks))
+		{
+			return false;
+		}###JMODELADMIN_AFTER_DELETE###
+		
+		return true;
+	}
+
+	/**
+	 * Method to change the published state of one or more records.
+	 *
+	 * @param   array    &$pks   A list of the primary keys to change.
+	 * @param   integer  $value  The value of the published state.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   12.2
+	 */
+	public function publish(&$pks, $value = 1)
+	{###JMODELADMIN_BEFORE_PUBLISH###
+		if (!parent::publish($pks, $value))
+		{
+			return false;
+		}###JMODELADMIN_AFTER_PUBLISH###
+		
+		return true;
+        }
     
 	/**
 	 * Method to perform batch operations on an item or a set of items.

admin/compiler/joomla_3/headercheck_admin.php

@@ -0,0 +1,88 @@
+<?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');
+
+class HeaderCheck
+{
+	function js_loaded($script_name)
+	{
+		// UIkit check point
+		if (strpos($script_name,'uikit') !== false)
+		{
+			$app            	= JFactory::getApplication();
+			$getTemplateName  	= $app->getTemplate('template')->template;
+			
+			if (strpos($getTemplateName,'yoo') !== false)
+			{
+				return true;
+			}
+		}
+		
+		$document 	= JFactory::getDocument();
+		$head_data 	= $document->getHeadData();
+		foreach (array_keys($head_data['scripts']) as $script)
+		{
+			if (stristr($script, $script_name))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	function css_loaded($script_name)
+	{
+		// UIkit check point
+		if (strpos($script_name,'uikit') !== false)
+		{
+			$app            	= JFactory::getApplication();
+			$getTemplateName  	= $app->getTemplate('template')->template;
+			
+			if (strpos($getTemplateName,'yoo') !== false)
+			{
+				return true;
+			}
+		}
+		
+		$document 	= JFactory::getDocument();
+		$head_data 	= $document->getHeadData();
+		
+		foreach (array_keys($head_data['styleSheets']) as $script)
+		{
+			if (stristr($script, $script_name))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+}

admin/compiler/joomla_3/router.php

@@ -139,11 +139,11 @@ class ###Component###Router extends JComponentRouterBase
 		return $vars;
 	} 
 
-	protected function getVar($table, $where = null, $whereString = 'user', $what = 'id', $category = false, $operator = '=', $main = '###component###')
+	protected function getVar($table, $where = null, $whereString = null, $what = null, $category = false, $operator = '=', $main = '###component###')
 	{
-		if(!$where)
+		if(!$where || !$what || !$whereString)
 		{
-			$where = JFactory::getUser()->id;
+			return false;
 		}
 		// Get a db connection.
 		$db = JFactory::getDbo();
@@ -153,19 +153,42 @@ class ###Component###Router extends JComponentRouterBase
 		$query->select($db->quoteName(array($what)));
 		if ('categories' == $table || 'category' == $table || $category)
 		{
-			$query->from($db->quoteName('#__categories'));
+			$getTable = '#__categories';
+			$query->from($db->quoteName($getTable));
 		}
 		else
 		{
-			$query->from($db->quoteName('#__'.$main.'_'.$table));
+			// we must check if the table exist (TODO not ideal)
+			$tables = $db->getTableList();
+			$app = JFactory::getApplication();
+			$prefix = $app->get('dbprefix');
+			$check = $prefix.$main.'_'.$table;
+			if (in_array($check, $tables))
+			{
+				$getTable = '#__'.$main.'_'.$table;
+				$query->from($db->quoteName($getTable));
+			}
+			else
+			{
+				return false;
+			}
 		}
 		if (is_numeric($where))
 		{
-			$query->where($db->quoteName($whereString) . ' '.$operator.' '.(int) $where);
+			return false;
 		}
-		elseif (is_string($where))
+		elseif ($this->checkString($where))
 		{
-			$query->where($db->quoteName($whereString) . ' '.$operator.' '. $db->quote((string)$where));
+			// we must first check if this table has the column
+			$columns = $db->getTableColumns($getTable);
+			if (isset($columns[$whereString]))
+			{
+				$query->where($db->quoteName($whereString) . ' '.$operator.' '. $db->quote((string)$where));
+			}
+			else
+			{
+				return false;
+			}
 		}
 		else
 		{
@@ -179,6 +202,15 @@ class ###Component###Router extends JComponentRouterBase
 		}
 		return false;
 	}
+	
+	protected function checkString($string)
+	{
+		if (isset($string) && is_string($string) && strlen($string) > 0)
+		{
+			return true;
+		}
+		return false;
+	}
 }
 
 function ###Component###BuildRoute(&$query)

admin/compiler/joomla_3/settings.json

@@ -187,6 +187,13 @@
             "rename": false,
             "type": "file"
       },
+      "headercheck_admin.php": {
+            "naam":"headercheck_admin.php",
+            "path": "c0mp0n3nt/admin/helpers",
+            "rename": "new",
+            "newName": "headercheck.php",
+            "type": "file"
+      },
       "LICENSE.txt": {
             "naam":"LICENSE.txt",
             "path": "c0mp0n3nt/",

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			13th January, 2017
+	@version		@update number 95 of this MVC
+	@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
-	@build			13th January, 2017
+	@version		@update number 95 of this MVC
+	@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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
@@ -54,6 +54,8 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('dynamicFormDetails', 'ajax');
 		$this->registerTask('dbTableColumns', 'ajax');
 		$this->registerTask('viewTableColumns', 'ajax');
+		$this->registerTask('checkFunctionName', 'ajax');
+		$this->registerTask('usedin', 'ajax');
 		$this->registerTask('fieldOptions', 'ajax');
 	}
 
@@ -530,6 +532,84 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
+				case 'checkFunctionName':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$functioNameValue = $jinput->get('functioName', NULL, 'STRING');
+						$idValue = $jinput->get('id', NULL, 'INT');
+						if($functioNameValue && $idValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->checkFunctionName($functioNameValue, $idValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
+				case 'usedin':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$functioNameValue = $jinput->get('functioName', NULL, 'WORD');
+						$idValue = $jinput->get('id', NULL, 'INT');
+						if($functioNameValue && $idValue && $user->id != 0)
+						{
+							$result = $this->getModel('ajax')->usedin($functioNameValue, $idValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
 				case 'fieldOptions':
 					try
 					{

admin/controllers/compiler.php

@@ -10,9 +10,9 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
-	@created		30th April, 2015
+	@version		@update number 17 of this MVC
+	@build			13th February, 2017
+	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.php
 	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
@@ -32,8 +32,26 @@ jimport('joomla.application.component.controlleradmin');
 /**
  * Compiler Controller
  */
-class ComponentbuilderControllerCompiler extends JControllerLegacy
+class ComponentbuilderControllerCompiler extends JControllerAdmin
 {
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPILER';
+	/**
+	 * Proxy for getModel.
+	 * @since	2.5
+	 */
+	public function getModel($name = 'Compiler', $prefix = 'ComponentbuilderModel', $config = array())
+	{
+		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+
+		return $model;
+	}
+
+        public function dashboard()
+	{
+		$this->setRedirect(JRoute::_('index.php?option=com_componentbuilder', false));
+		return;
+	}
+
 	/**
 	 * Import an spreadsheet.
 	 *
@@ -48,13 +66,17 @@ class ComponentbuilderControllerCompiler extends JControllerLegacy
 		if($user->authorise('core.admin', 'com_componentbuilder'))
 		{
 			// get the post values
-			$jinput 	= JFactory::getApplication()->input;
-			$componentId 	= $jinput->post->get('component', 0, 'INT');
-			$version	= $jinput->post->get('version', 0, 'INT');
-			$addBackup	= $jinput->post->get('backup', 0, 'INT');
-			$addGit		= $jinput->post->get('git', 0, 'INT');
+			$jinput 			= JFactory::getApplication()->input;
+			$componentId 		= $jinput->post->get('component', 0, 'INT');
+			$version			= $jinput->post->get('version', 0, 'INT');
+			$addBackup		= $jinput->post->get('backup', 0, 'INT');
+			$addGit			= $jinput->post->get('git', 0, 'INT');
+			$addPlaceholders	= $jinput->post->get('placeholders', 2, 'INT');
+			$debugLinenr		= $jinput->post->get('debuglinenr', 2, 'INT');
+			// include component compiler
+			require_once JPATH_ADMINISTRATOR.'/components/com_componentbuilder/helpers/compiler.php';
 			$model		= $this->getModel('compiler');
-			if ($model->builder($version,$componentId,$addBackup,$addGit))
+			if ($model->builder($version,$componentId,$addBackup,$addGit,$addPlaceholders,$debugLinenr))
 			{
 				$cache = JFactory::getCache('mod_menu');
 				$cache->clean();
@@ -68,7 +90,7 @@ class ComponentbuilderControllerCompiler extends JControllerLegacy
 			$app = JFactory::getApplication();
 			$redirect_url	= $app->getUserState('com_componentbuilder.redirect_url');
 			$message	= $app->getUserState('com_componentbuilder.message');
-			if (empty($redirect_url))
+			if (empty($redirect_url) && $componentId > 0)
 			{
 				$redirect_url = JRoute::_('index.php?option=com_componentbuilder&view=compiler', false);
 				// setup the unrealistic numbers
@@ -123,6 +145,7 @@ class ComponentbuilderControllerCompiler extends JControllerLegacy
 				$message .= '<b>URL:</b> <code>'.$url.'</code><br /><br />';
 				$message .= '<small>Hey! you can also download the file right now!</small><br /><a class="btn btn-success" href="'.$url.'" ><span class="icon-download icon-white"></span>Download</a></p>';
 				$message .= '<p><small><b>Remember!</b> This file is in your tmp folder and therefore publicly accessible untill you click [Clear tmp]!</small> </p>';
+				$message .= '<p><small>Compilation took <b>'.$counter['time'].'</b> seconds to complete.</small> </p>';
 				// set redirect
 				$this->setRedirect($redirect_url,$message,'message');
 				$app->setUserState('com_componentbuilder.extension_name', $counter['filename']);

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 77 of this MVC
-	@build			26th December, 2016
+	@version		@update number 81 of this MVC
+	@build			13th February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 77 of this MVC
-	@build			26th December, 2016
+	@version		@update number 81 of this MVC
+	@build			13th 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
-	@build			13th January, 2017
+	@version		@update number 22 of this MVC
+	@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
-	@build			13th January, 2017
+	@version		@update number 22 of this MVC
+	@build			3rd February, 2017
 	@created		13th August, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php

admin/controllers/custom_code.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 14 of this MVC
-	@build			31st January, 2017
+	@version		@update number 55 of this MVC
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.php

admin/controllers/custom_codes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 14 of this MVC
-	@build			31st January, 2017
+	@version		@update number 55 of this MVC
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 36 of this MVC
-	@build			12th January, 2017
+	@version		@update number 37 of this MVC
+	@build			3rd February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php
@@ -60,33 +60,14 @@ class ComponentbuilderControllerField extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// get the user object
-		$user = JFactory::getUser();
-
 		// Access check.
-		$access = $user->authorise('field.access', 'com_componentbuilder');
+		$access = JFactory::getUser()->authorise('field.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
-		$categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
-		$allow = null;
-
-		if ($categoryId)
-		{
-			// If the category has been passed in the URL check it.
-			$allow = $user->authorise('core.create', $this->option . '.fields.category.' . $categoryId);
-		}
-
-		if ($allow === null)
-		{
-			// In the absense of better information, revert to the component permissions.
-			return $user->authorise('field.create', $this->option);
-		}
-		else
-		{
-			return $allow;
-		}
+		// In the absense of better information, revert to the component permissions.
+		return JFactory::getUser()->authorise('field.create', $this->option);
 	}
 
 	/**
@@ -146,18 +127,6 @@ class ComponentbuilderControllerField extends JControllerForm
 				}
 				return false;
 			}
-
-			$categoryId = (int) isset($data['catid']) ? $data['catid']: $this->getModel()->getItem($recordId)->catid;
-
-			if ($categoryId)
-			{
-				// The category has been set. Check the category permissions.
-				$catpermission = $user->authorise('core.edit', $this->option . '.fields.category.' . $categoryId);
-				if (!$catpermission && !is_null($catpermission))
-				{
-					return false;
-				}
-			}
 		}
 		// Since there is no permission, revert to the component permissions.
 		return $user->authorise('field.edit', $this->option);

admin/controllers/fields.php

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

admin/controllers/fieldtype.php

@@ -60,33 +60,14 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
-		// get the user object
-		$user = JFactory::getUser();
-
 		// Access check.
-		$access = $user->authorise('fieldtype.access', 'com_componentbuilder');
+		$access = JFactory::getUser()->authorise('fieldtype.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
-		$categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('filter_category_id'), 'int');
-		$allow = null;
-
-		if ($categoryId)
-		{
-			// If the category has been passed in the URL check it.
-			$allow = $user->authorise('core.create', $this->option . '.fieldtypes.category.' . $categoryId);
-		}
-
-		if ($allow === null)
-		{
-			// In the absense of better information, revert to the component permissions.
-			return $user->authorise('fieldtype.create', $this->option);
-		}
-		else
-		{
-			return $allow;
-		}
+		// In the absense of better information, revert to the component permissions.
+		return JFactory::getUser()->authorise('fieldtype.create', $this->option);
 	}
 
 	/**
@@ -146,18 +127,6 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 				}
 				return false;
 			}
-
-			$categoryId = (int) isset($data['catid']) ? $data['catid']: $this->getModel()->getItem($recordId)->catid;
-
-			if ($categoryId)
-			{
-				// The category has been set. Check the category permissions.
-				$catpermission = $user->authorise('core.edit', $this->option . '.fieldtypes.category.' . $categoryId);
-				if (!$catpermission && !is_null($catpermission))
-				{
-					return false;
-				}
-			}
 		}
 		// Since there is no permission, revert to the component permissions.
 		return $user->authorise('fieldtype.edit', $this->option);

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			18th October, 2016
+	@version		@update number 67 of this MVC
+	@build			11th 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
-	@build			18th October, 2016
+	@version		@update number 67 of this MVC
+	@build			11th 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
-	@build			29th January, 2017
+	@version		@update number 48 of this MVC
+	@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
-	@build			29th January, 2017
+	@version		@update number 48 of this MVC
+	@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
-	@build			18th October, 2016
+	@version		@update number 40 of this MVC
+	@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
-	@build			18th October, 2016
+	@version		@update number 40 of this MVC
+	@build			3rd February, 2017
 	@created		26th May, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/custom/footable3/css/footable.core.bootstrap.css

@@ -1,169 +1,175 @@
-/*
-* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
-* @link http://fooplugins.com
-* @copyright Steven Usher & Brad Vincent 2015
-* @license Released under the GPLv3 license.
-*/
-table.footable,
-table.footable-details {
-	position: relative;
-	width: 100%;
-	border-spacing: 0;
-	border-collapse: collapse;
-}
-table.footable-details {
-	margin-bottom: 0;
-}
-table > tbody > tr > td > span.footable-toggle {
-	margin-right: 8px;
-	opacity: 0.3;
-}
-table > tbody > tr > td > span.footable-toggle.last-column {
-	margin-left: 8px;
-	float: right;
-}
-table.table-condensed > tbody > tr > td > span.footable-toggle {
-	margin-right: 5px;
-}
-table.footable-details > tbody > tr > th:nth-child(1) {
-	min-width: 40px;
-	width: 120px;
-}
-table.footable-details > tbody > tr > td:nth-child(2) {
-	word-break: break-all;
-}
-
-table.footable-details > thead > tr:first-child > th,
-table.footable-details > thead > tr:first-child > td,
-table.footable-details > tbody > tr:first-child > th,
-table.footable-details > tbody > tr:first-child > td,
-table.footable-details > tfoot > tr:first-child > th,
-table.footable-details > tfoot > tr:first-child > td {
-	border-top-width: 0;
-}
-table.footable-details.table-bordered > thead > tr:first-child > th,
-table.footable-details.table-bordered > thead > tr:first-child > td,
-table.footable-details.table-bordered > tbody > tr:first-child > th,
-table.footable-details.table-bordered > tbody > tr:first-child > td,
-table.footable-details.table-bordered > tfoot > tr:first-child > th,
-table.footable-details.table-bordered > tfoot > tr:first-child > td {
-	border-top-width: 1px;
-}
-
-div.footable-loader {
-	vertical-align: middle;
-	text-align: center;
-	height: 300px;
-	position: relative;
-}
-div.footable-loader > span.fooicon {
-	display: inline-block;
-	opacity: 0.3;
-	font-size: 30px;
-	line-height: 32px;
-	width: 32px;
-	height: 32px;
-	margin-top: -16px;
-	margin-left: -16px;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	-webkit-animation: fooicon-spin-r 2s infinite linear;
-	animation: fooicon-spin-r 2s infinite linear;
-}
-table.footable > tbody > tr.footable-empty > td {
-	vertical-align: middle;
-	text-align: center;
-	font-size: 30px;
-}
-table.footable > tbody > tr > td,
-table.footable > tbody > tr > th {
-	display: none;
-}
-table.footable > tbody > tr.footable-empty > td,
-table.footable > tbody > tr.footable-empty > th,
-table.footable > tbody > tr.footable-detail-row > td,
-table.footable > tbody > tr.footable-detail-row > th {
-	display: table-cell;
-}
-@-webkit-keyframes fooicon-spin-r {
-	0% {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
-	}
-
-	100% {
-		-webkit-transform: rotate(359deg);
-		transform: rotate(359deg);
-	}
-}
-
-@keyframes fooicon-spin-r {
-	0% {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
-	}
-
-	100% {
-		-webkit-transform: rotate(359deg);
-		transform: rotate(359deg);
-	}
-}
-
-.fooicon {
-	position: relative;
-	top: 1px;
-	display: inline-block;
-	font-family: 'Glyphicons Halflings' !important;
-	font-style: normal;
-	font-weight: 400;
-	line-height: 1;
-	-webkit-font-smoothing: antialiased;
-	-moz-osx-font-smoothing: grayscale;
-}
-.fooicon:before,
-.fooicon:after {
-	-webkit-box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	box-sizing: border-box;
-}
-.fooicon-loader:before {
-	content: "\e030";
-}
-.fooicon-plus:before {
-	content: "\2b";
-}
-.fooicon-minus:before {
-	content: "\2212";
-}
-.fooicon-search:before {
-	content: "\e003";
-}
-.fooicon-remove:before {
-	content: "\e014";
-}
-.fooicon-sort:before {
-	content: "\e150";
-}
-.fooicon-sort-asc:before {
-	content: "\e155";
-}
-.fooicon-sort-desc:before {
-	content: "\e156";
-}
-.fooicon-pencil:before {
-	content: "\270f";
-}
-.fooicon-trash:before {
-	content: "\e020";
-}
-.fooicon-eye-close:before {
-	content: "\e106";
-}
-.fooicon-flash:before {
-	content: "\e162";
-}
-.fooicon-cog:before {
-	content: "\e019";
-}
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+table.footable,
+table.footable-details {
+	position: relative;
+	width: 100%;
+	border-spacing: 0;
+	border-collapse: collapse;
+}
+table.footable-details {
+	margin-bottom: 0;
+}
+table.footable-hide-fouc {
+	display: none;
+}
+table > tbody > tr > td > span.footable-toggle {
+	margin-right: 8px;
+	opacity: 0.3;
+}
+table > tbody > tr > td > span.footable-toggle.last-column {
+	margin-left: 8px;
+	float: right;
+}
+table.table-condensed > tbody > tr > td > span.footable-toggle {
+	margin-right: 5px;
+}
+table.footable-details > tbody > tr > th:nth-child(1) {
+	min-width: 40px;
+	width: 120px;
+}
+table.footable-details > tbody > tr > td:nth-child(2) {
+	word-break: break-all;
+}
+
+table.footable-details > thead > tr:first-child > th,
+table.footable-details > thead > tr:first-child > td,
+table.footable-details > tbody > tr:first-child > th,
+table.footable-details > tbody > tr:first-child > td,
+table.footable-details > tfoot > tr:first-child > th,
+table.footable-details > tfoot > tr:first-child > td {
+	border-top-width: 0;
+}
+table.footable-details.table-bordered > thead > tr:first-child > th,
+table.footable-details.table-bordered > thead > tr:first-child > td,
+table.footable-details.table-bordered > tbody > tr:first-child > th,
+table.footable-details.table-bordered > tbody > tr:first-child > td,
+table.footable-details.table-bordered > tfoot > tr:first-child > th,
+table.footable-details.table-bordered > tfoot > tr:first-child > td {
+	border-top-width: 1px;
+}
+
+div.footable-loader {
+	vertical-align: middle;
+	text-align: center;
+	height: 300px;
+	position: relative;
+}
+div.footable-loader > span.fooicon {
+	display: inline-block;
+	opacity: 0.3;
+	font-size: 30px;
+	line-height: 32px;
+	width: 32px;
+	height: 32px;
+	margin-top: -16px;
+	margin-left: -16px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	-webkit-animation: fooicon-spin-r 2s infinite linear;
+	animation: fooicon-spin-r 2s infinite linear;
+}
+table.footable > tbody > tr.footable-empty > td {
+	vertical-align: middle;
+	text-align: center;
+	font-size: 30px;
+}
+table.footable > tbody > tr > td,
+table.footable > tbody > tr > th {
+	display: none;
+}
+table.footable > tbody > tr.footable-empty > td,
+table.footable > tbody > tr.footable-empty > th,
+table.footable > tbody > tr.footable-detail-row > td,
+table.footable > tbody > tr.footable-detail-row > th {
+	display: table-cell;
+}
+@-webkit-keyframes fooicon-spin-r {
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+
+	100% {
+		-webkit-transform: rotate(359deg);
+		transform: rotate(359deg);
+	}
+}
+
+@keyframes fooicon-spin-r {
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+
+	100% {
+		-webkit-transform: rotate(359deg);
+		transform: rotate(359deg);
+	}
+}
+
+.fooicon {
+	position: relative;
+	top: 1px;
+	display: inline-block;
+	font-family: 'Glyphicons Halflings' !important;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+.fooicon:before,
+.fooicon:after {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+.fooicon-loader:before {
+	content: "\e030";
+}
+.fooicon-plus:before {
+	content: "\2b";
+}
+.fooicon-minus:before {
+	content: "\2212";
+}
+.fooicon-search:before {
+	content: "\e003";
+}
+.fooicon-remove:before {
+	content: "\e014";
+}
+.fooicon-sort:before {
+	content: "\e150";
+}
+.fooicon-sort-asc:before {
+	content: "\e155";
+}
+.fooicon-sort-desc:before {
+	content: "\e156";
+}
+.fooicon-pencil:before {
+	content: "\270f";
+}
+.fooicon-trash:before {
+	content: "\e020";
+}
+.fooicon-eye-close:before {
+	content: "\e106";
+}
+.fooicon-flash:before {
+	content: "\e162";
+}
+.fooicon-cog:before {
+	content: "\e019";
+}
+.fooicon-stats:before {
+	content: "\e185";
+}

admin/custom/footable3/css/footable.core.bootstrap.min.css

@@ -0,0 +1 @@
+table.footable,table.footable-details{position:relative;width:100%;border-spacing:0;border-collapse:collapse}table.footable-details{margin-bottom:0}table.footable-hide-fouc{display:none}table>tbody>tr>td>span.footable-toggle{margin-right:8px;opacity:.3}table>tbody>tr>td>span.footable-toggle.last-column{margin-left:8px;float:right}table.table-condensed>tbody>tr>td>span.footable-toggle{margin-right:5px}table.footable-details>tbody>tr>th:nth-child(1){min-width:40px;width:120px}table.footable-details>tbody>tr>td:nth-child(2){word-break:break-all}table.footable-details>tbody>tr:first-child>td,table.footable-details>tbody>tr:first-child>th,table.footable-details>tfoot>tr:first-child>td,table.footable-details>tfoot>tr:first-child>th,table.footable-details>thead>tr:first-child>td,table.footable-details>thead>tr:first-child>th{border-top-width:0}table.footable-details.table-bordered>tbody>tr:first-child>td,table.footable-details.table-bordered>tbody>tr:first-child>th,table.footable-details.table-bordered>tfoot>tr:first-child>td,table.footable-details.table-bordered>tfoot>tr:first-child>th,table.footable-details.table-bordered>thead>tr:first-child>td,table.footable-details.table-bordered>thead>tr:first-child>th{border-top-width:1px}div.footable-loader{vertical-align:middle;text-align:center;height:300px;position:relative}div.footable-loader>span.fooicon{display:inline-block;opacity:.3;font-size:30px;line-height:32px;width:32px;height:32px;margin-top:-16px;margin-left:-16px;position:absolute;top:50%;left:50%;-webkit-animation:fooicon-spin-r 2s infinite linear;animation:fooicon-spin-r 2s infinite linear}table.footable>tbody>tr.footable-empty>td{vertical-align:middle;text-align:center;font-size:30px}table.footable>tbody>tr>td,table.footable>tbody>tr>th{display:none}table.footable>tbody>tr.footable-detail-row>td,table.footable>tbody>tr.footable-detail-row>th,table.footable>tbody>tr.footable-empty>td,table.footable>tbody>tr.footable-empty>th{display:table-cell}@-webkit-keyframes fooicon-spin-r{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fooicon-spin-r{0%{-webkit-transform:rotate(0);transform:rotate(0)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fooicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings'!important;font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fooicon:after,.fooicon:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fooicon-loader:before{content:"\e030"}.fooicon-plus:before{content:"\2b"}.fooicon-minus:before{content:"\2212"}.fooicon-search:before{content:"\e003"}.fooicon-remove:before{content:"\e014"}.fooicon-sort:before{content:"\e150"}.fooicon-sort-asc:before{content:"\e155"}.fooicon-sort-desc:before{content:"\e156"}.fooicon-pencil:before{content:"\270f"}.fooicon-trash:before{content:"\e020"}.fooicon-eye-close:before{content:"\e106"}.fooicon-flash:before{content:"\e162"}.fooicon-cog:before{content:"\e019"}.fooicon-stats:before{content:"\e185"}

admin/custom/footable3/css/footable.editing.css

@@ -0,0 +1,50 @@
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+td.footable-editing {
+	width: 90px;
+	max-width: 90px;
+}
+table.footable-editing-no-edit td.footable-editing,
+table.footable-editing-no-delete td.footable-editing,
+table.footable-editing-no-view td.footable-editing {
+	width: 70px;
+	max-width: 70px;
+}
+table.footable-editing-no-edit.footable-editing-no-delete td.footable-editing,
+table.footable-editing-no-edit.footable-editing-no-view td.footable-editing,
+table.footable-editing-no-delete.footable-editing-no-view td.footable-editing {
+	width: 50px;
+	max-width: 50px;
+}
+table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view td.footable-editing,
+table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view th.footable-editing {
+	width: 0;
+	max-width: 0;
+	display: none !important;
+}
+table.footable-editing-right td.footable-editing,
+table.footable-editing-right tr.footable-editing {
+	text-align: right;
+}
+table.footable-editing-left td.footable-editing,
+table.footable-editing-left tr.footable-editing {
+	text-align: left;
+}
+table.footable-editing button.footable-add,
+table.footable-editing button.footable-hide,
+table.footable-editing-show button.footable-show,
+table.footable-editing.footable-editing-always-show button.footable-show,
+table.footable-editing.footable-editing-always-show button.footable-hide,
+table.footable-editing.footable-editing-always-show.footable-editing-no-add tr.footable-editing {
+	display: none;
+}
+table.footable-editing.footable-editing-show button.footable-add,
+table.footable-editing.footable-editing-show button.footable-hide,
+table.footable-editing.footable-editing-always-show button.footable-add {
+	display: inline-block;
+}

admin/custom/footable3/css/footable.editing.min.css

@@ -0,0 +1 @@
+td.footable-editing{width:90px;max-width:90px}table.footable-editing-no-delete td.footable-editing,table.footable-editing-no-edit td.footable-editing,table.footable-editing-no-view td.footable-editing{width:70px;max-width:70px}table.footable-editing-no-delete.footable-editing-no-view td.footable-editing,table.footable-editing-no-edit.footable-editing-no-delete td.footable-editing,table.footable-editing-no-edit.footable-editing-no-view td.footable-editing{width:50px;max-width:50px}table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view td.footable-editing,table.footable-editing-no-edit.footable-editing-no-delete.footable-editing-no-view th.footable-editing{width:0;max-width:0;display:none!important}table.footable-editing-right td.footable-editing,table.footable-editing-right tr.footable-editing{text-align:right}table.footable-editing-left td.footable-editing,table.footable-editing-left tr.footable-editing{text-align:left}table.footable-editing button.footable-add,table.footable-editing button.footable-hide,table.footable-editing-show button.footable-show,table.footable-editing.footable-editing-always-show button.footable-hide,table.footable-editing.footable-editing-always-show button.footable-show,table.footable-editing.footable-editing-always-show.footable-editing-no-add tr.footable-editing{display:none}table.footable-editing.footable-editing-always-show button.footable-add,table.footable-editing.footable-editing-show button.footable-add,table.footable-editing.footable-editing-show button.footable-hide{display:inline-block}

admin/custom/footable3/css/footable.filtering.css

@@ -1,55 +1,55 @@
-/*
-* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
-* @link http://fooplugins.com
-* @copyright Steven Usher & Brad Vincent 2015
-* @license Released under the GPLv3 license.
-*/
-table.footable > thead > tr.footable-filtering > th {
-	border-bottom-width: 1px;
-	font-weight: normal;
-}
-table.footable > thead > tr.footable-filtering > th,
-table.footable.footable-filtering-right > thead > tr.footable-filtering > th {
-	text-align: right;
-}
-table.footable.footable-filtering-left > thead > tr.footable-filtering > th {
-	text-align: left;
-}
-table.footable.footable-filtering-center > thead > tr.footable-filtering > th {
-	text-align: center;
-}
-table.footable > thead > tr.footable-filtering > th div.form-group {
-	margin-bottom: 0;
-}
-table.footable > thead > tr.footable-filtering > th div.form-group+div.form-group {
-	margin-top: 5px;
-}
-table.footable > thead > tr.footable-filtering > th div.input-group {
-	width: 100%;
-}
-table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox {
-	margin: 0;
-	display: block;
-	position: relative;
-}
-table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox > label {
-	display: block;
-	padding-left: 20px;
-}
-table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox input[type="checkbox"] {
-	position: absolute;
-	margin-left: -20px;
-}
-@media (min-width: 768px) {
-	table.footable > thead > tr.footable-filtering > th div.input-group {
-		width: auto;
-	}
-	table.footable > thead > tr.footable-filtering > th div.form-group {
-		margin-left: 2px;
-		margin-right: 2px;
-	}
-	table.footable > thead > tr.footable-filtering > th div.form-group+div.form-group {
-		margin-top: 0;
-	}
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+table.footable > thead > tr.footable-filtering > th {
+	border-bottom-width: 1px;
+	font-weight: normal;
+}
+table.footable > thead > tr.footable-filtering > th,
+table.footable.footable-filtering-right > thead > tr.footable-filtering > th {
+	text-align: right;
+}
+table.footable.footable-filtering-left > thead > tr.footable-filtering > th {
+	text-align: left;
+}
+table.footable.footable-filtering-center > thead > tr.footable-filtering > th {
+	text-align: center;
+}
+table.footable > thead > tr.footable-filtering > th div.form-group {
+	margin-bottom: 0;
+}
+table.footable > thead > tr.footable-filtering > th div.form-group+div.form-group {
+	margin-top: 5px;
+}
+table.footable > thead > tr.footable-filtering > th div.input-group {
+	width: 100%;
+}
+table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox {
+	margin: 0;
+	display: block;
+	position: relative;
+}
+table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox > label {
+	display: block;
+	padding-left: 20px;
+}
+table.footable > thead > tr.footable-filtering > th ul.dropdown-menu > li > a.checkbox input[type="checkbox"] {
+	position: absolute;
+	margin-left: -20px;
+}
+@media (min-width: 768px) {
+	table.footable > thead > tr.footable-filtering > th div.input-group {
+		width: auto;
+	}
+	table.footable > thead > tr.footable-filtering > th div.form-group {
+		margin-left: 2px;
+		margin-right: 2px;
+	}
+	table.footable > thead > tr.footable-filtering > th div.form-group+div.form-group {
+		margin-top: 0;
+	}
 }

admin/custom/footable3/css/footable.paging.css

@@ -1,31 +1,31 @@
-/*
-* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
-* @link http://fooplugins.com
-* @copyright Steven Usher & Brad Vincent 2015
-* @license Released under the GPLv3 license.
-*/
-table.footable > tfoot > tr.footable-paging > td > ul.pagination {
-	margin: 10px 0 0 0;
-}
-table.footable > tfoot > tr.footable-paging > td > span.label {
-	display: inline-block;
-	margin: 0 0 10px 0;
-	padding: 4px 10px;
-}
-table.footable > tfoot > tr.footable-paging > td,
-table.footable-paging-center > tfoot > tr.footable-paging > td {
-	text-align: center;
-}
-table.footable-paging-left > tfoot > tr.footable-paging > td {
-	text-align: left;
-}
-table.footable-paging-right > tfoot > tr.footable-paging > td {
-	text-align: right;
-}
-ul.pagination > li.footable-page {
-	display: none;
-}
-ul.pagination > li.footable-page.visible {
-	display: inline;
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+table.footable > tfoot > tr.footable-paging > td > ul.pagination {
+	margin: 10px 0 0 0;
+}
+table.footable > tfoot > tr.footable-paging > td > span.label {
+	display: inline-block;
+	margin: 0 0 10px 0;
+	padding: 4px 10px;
+}
+table.footable > tfoot > tr.footable-paging > td,
+table.footable-paging-center > tfoot > tr.footable-paging > td {
+	text-align: center;
+}
+table.footable-paging-left > tfoot > tr.footable-paging > td {
+	text-align: left;
+}
+table.footable-paging-right > tfoot > tr.footable-paging > td {
+	text-align: right;
+}
+ul.pagination > li.footable-page {
+	display: none;
+}
+ul.pagination > li.footable-page.visible {
+	display: inline;
 }

admin/custom/footable3/css/footable.sorting.css

@@ -1,32 +1,46 @@
-/*
-* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
-* @link http://fooplugins.com
-* @copyright Steven Usher & Brad Vincent 2015
-* @license Released under the GPLv3 license.
-*/
-td.footable-sortable,
-th.footable-sortable {
-	position: relative;
-	padding-right: 30px;
-	cursor: pointer;
-}
-td.footable-sortable > span.fooicon,
-th.footable-sortable > span.fooicon {
-	position: absolute;
-	right: 6px;
-	top: 50%;
-	margin-top: -7px;
-	opacity: 0;
-	transition: opacity 0.3s ease-in;
-}
-td.footable-sortable:hover > span.fooicon,
-th.footable-sortable:hover > span.fooicon {
-	opacity: 1;
-}
-td.footable-sortable.footable-asc > span.fooicon,
-th.footable-sortable.footable-asc > span.fooicon,
-td.footable-sortable.footable-desc > span.fooicon,
-th.footable-sortable.footable-desc > span.fooicon {
-	opacity: 1;
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+table.footable > thead > tr > td.footable-sortable,
+table.footable > thead > tr > th.footable-sortable,
+table.footable > tbody > tr > td.footable-sortable,
+table.footable > tbody > tr > th.footable-sortable,
+table.footable > tfoot > tr > td.footable-sortable,
+table.footable > tfoot > tr > th.footable-sortable {
+	position: relative;
+	padding-right: 30px;
+	cursor: pointer;
+}
+td.footable-sortable > span.fooicon,
+th.footable-sortable > span.fooicon {
+	position: absolute;
+	right: 6px;
+	top: 50%;
+	margin-top: -7px;
+	opacity: 0;
+	transition: opacity 0.3s ease-in;
+}
+td.footable-sortable:hover > span.fooicon,
+th.footable-sortable:hover > span.fooicon {
+	opacity: 1;
+}
+td.footable-sortable.footable-asc > span.fooicon,
+th.footable-sortable.footable-asc > span.fooicon,
+td.footable-sortable.footable-desc > span.fooicon,
+th.footable-sortable.footable-desc > span.fooicon {
+	opacity: 1;
+}
+/* hides the sort icons when sorting is not allowed */
+table.footable-sorting-disabled td.footable-sortable.footable-asc > span.fooicon,
+table.footable-sorting-disabled td.footable-sortable.footable-desc > span.fooicon,
+table.footable-sorting-disabled td.footable-sortable:hover > span.fooicon,
+table.footable-sorting-disabled th.footable-sortable.footable-asc > span.fooicon,
+table.footable-sorting-disabled th.footable-sortable.footable-desc > span.fooicon,
+table.footable-sorting-disabled th.footable-sortable:hover > span.fooicon {
+	opacity: 0;
+	visibility: hidden;
 }

admin/custom/footable3/css/footable.sorting.min.css

@@ -1 +1 @@
-td.footable-sortable,th.footable-sortable{position:relative;padding-right:30px;cursor:pointer}td.footable-sortable>span.fooicon,th.footable-sortable>span.fooicon{position:absolute;right:6px;top:50%;margin-top:-7px;opacity:0;transition:opacity .3s ease-in}td.footable-sortable.footable-asc>span.fooicon,td.footable-sortable.footable-desc>span.fooicon,td.footable-sortable:hover>span.fooicon,th.footable-sortable.footable-asc>span.fooicon,th.footable-sortable.footable-desc>span.fooicon,th.footable-sortable:hover>span.fooicon{opacity:1}
+table.footable>tbody>tr>td.footable-sortable,table.footable>tbody>tr>th.footable-sortable,table.footable>tfoot>tr>td.footable-sortable,table.footable>tfoot>tr>th.footable-sortable,table.footable>thead>tr>td.footable-sortable,table.footable>thead>tr>th.footable-sortable{position:relative;padding-right:30px;cursor:pointer}td.footable-sortable>span.fooicon,th.footable-sortable>span.fooicon{position:absolute;right:6px;top:50%;margin-top:-7px;opacity:0;transition:opacity .3s ease-in}td.footable-sortable.footable-asc>span.fooicon,td.footable-sortable.footable-desc>span.fooicon,td.footable-sortable:hover>span.fooicon,th.footable-sortable.footable-asc>span.fooicon,th.footable-sortable.footable-desc>span.fooicon,th.footable-sortable:hover>span.fooicon{opacity:1}table.footable-sorting-disabled td.footable-sortable.footable-asc>span.fooicon,table.footable-sorting-disabled td.footable-sortable.footable-desc>span.fooicon,table.footable-sorting-disabled td.footable-sortable:hover>span.fooicon,table.footable-sorting-disabled th.footable-sortable.footable-asc>span.fooicon,table.footable-sorting-disabled th.footable-sortable.footable-desc>span.fooicon,table.footable-sorting-disabled th.footable-sortable:hover>span.fooicon{opacity:0;visibility:hidden}

admin/custom/footable3/js/footable.editing.js

@@ -0,0 +1,802 @@
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+(function($, F){
+
+	F.Editing = F.Component.extend(/** @lends FooTable.Editing */{
+		/**
+		 * The editing component adds a column with edit and delete buttons to each row as well as a single add row button in the footer.
+		 * @constructs
+		 * @extends FooTable.Component
+		 * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component.
+		 * @returns {FooTable.Editing}
+		 */
+		construct: function(table){
+			// call the base constructor
+			this._super(table, table.o.editing.enabled);
+
+			/**
+			 * Whether or not to automatically page to a new row when it is added to the table.
+			 * @type {boolean}
+			 */
+			this.pageToNew = table.o.editing.pageToNew;
+
+			/**
+			 * Whether or not the editing column and add row button are always visible.
+			 * @type {boolean}
+			 */
+			this.alwaysShow = table.o.editing.alwaysShow;
+
+			/**
+			 * The options for the editing column. @see {@link FooTable.EditingColumn} for more info.
+			 * @type {object}
+			 * @prop {string} classes="footable-editing" - A space separated string of class names to apply to all cells in the column.
+			 * @prop {string} name="editing" - The name of the column.
+			 * @prop {string} title="" - The title displayed in the header row of the table for the column.
+			 * @prop {boolean} filterable=false - Whether or not the column should be filterable when using the filtering component.
+			 * @prop {boolean} sortable=false - Whether or not the column should be sortable when using the sorting component.
+			 */
+			this.column = $.extend(true, {}, table.o.editing.column, {visible: this.alwaysShow});
+
+			/**
+			 * The position of the editing column in the table as well as the alignment of the buttons.
+			 * @type {string}
+			 */
+			this.position = table.o.editing.position;
+
+
+			/**
+			 * The text that appears in the show button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.showText = table.o.editing.showText;
+
+			/**
+			 * The text that appears in the hide button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.hideText = table.o.editing.hideText;
+
+			/**
+			 * The text that appears in the add button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.addText = table.o.editing.addText;
+
+			/**
+			 * The text that appears in the edit button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.editText = table.o.editing.editText;
+
+			/**
+			 * The text that appears in the delete button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.deleteText = table.o.editing.deleteText;
+			
+			/**
+			 * The text that appears in the view button. This can contain HTML.
+			 * @type {string}
+			 */
+			this.viewText = table.o.editing.viewText;
+
+			/**
+			 * Whether or not to show the Add Row button.
+			 * @type {boolean}
+			 */
+			this.allowAdd = table.o.editing.allowAdd;
+
+			/**
+			 * Whether or not to show the Edit Row button.
+			 * @type {boolean}
+			 */
+			this.allowEdit = table.o.editing.allowEdit;
+
+			/**
+			 * Whether or not to show the Delete Row button.
+			 * @type {boolean}
+			 */
+			this.allowDelete = table.o.editing.allowDelete;
+
+			/**
+			 * Whether or not to show the View Row button.
+			 * @type {boolean}
+			 */
+			this.allowView = table.o.editing.allowView;
+
+			/**
+			 * Caches the row button elements to help with performance.
+			 * @type {(null|jQuery)}
+			 * @private
+			 */
+			this._$buttons = null;
+
+			/**
+			 * This object is used to contain the callbacks for the add, edit and delete row buttons.
+			 * @type {object}
+			 * @prop {function} addRow
+			 * @prop {function} editRow
+			 * @prop {function} deleteRow
+			 * @prop {function} viewRow
+			 */
+			this.callbacks = {
+				addRow: F.checkFnValue(this, table.o.editing.addRow),
+				editRow: F.checkFnValue(this, table.o.editing.editRow),
+				deleteRow: F.checkFnValue(this, table.o.editing.deleteRow),
+				viewRow: F.checkFnValue(this, table.o.editing.viewRow)
+			};
+		},
+		/* PROTECTED */
+		/**
+		 * Checks the supplied data and options for the editing component.
+		 * @instance
+		 * @protected
+		 * @param {object} data - The jQuery data object from the parent table.
+		 * @fires FooTable.Editing#"preinit.ft.editing"
+		 */
+		preinit: function(data){
+			var self = this;
+			/**
+			 * The preinit.ft.editing event is raised before the UI is created and provides the tables jQuery data object for additional options parsing.
+			 * Calling preventDefault on this event will disable the component.
+			 * @event FooTable.Editing#"preinit.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 * @param {object} data - The jQuery data object of the table raising the event.
+			 */
+			this.ft.raise('preinit.ft.editing', [data]).then(function(){
+				if (self.ft.$el.hasClass('footable-editing'))
+					self.enabled = true;
+
+				self.enabled = F.is.boolean(data.editing)
+					? data.editing
+					: self.enabled;
+
+				if (!self.enabled) return;
+
+				self.pageToNew = F.is.boolean(data.editingPageToNew) ? data.editingPageToNew : self.pageToNew;
+
+				self.alwaysShow = F.is.boolean(data.editingAlwaysShow) ? data.editingAlwaysShow : self.alwaysShow;
+
+				self.position = F.is.string(data.editingPosition) ? data.editingPosition : self.position;
+
+				self.showText = F.is.string(data.editingShowText) ? data.editingShowText : self.showText;
+
+				self.hideText = F.is.string(data.editingHideText) ? data.editingHideText : self.hideText;
+
+				self.addText = F.is.string(data.editingAddText) ? data.editingAddText : self.addText;
+
+				self.editText = F.is.string(data.editingEditText) ? data.editingEditText : self.editText;
+
+				self.deleteText = F.is.string(data.editingDeleteText) ? data.editingDeleteText : self.deleteText;
+
+				self.viewText = F.is.string(data.editingViewText) ? data.editingViewText : self.viewText;
+
+				self.allowAdd = F.is.boolean(data.editingAllowAdd) ? data.editingAllowAdd : self.allowAdd;
+
+				self.allowEdit = F.is.boolean(data.editingAllowEdit) ? data.editingAllowEdit : self.allowEdit;
+
+				self.allowDelete = F.is.boolean(data.editingAllowDelete) ? data.editingAllowDelete : self.allowDelete;
+
+				self.allowView = F.is.boolean(data.editingAllowView) ? data.editingAllowView : self.allowView;
+
+				self.column = new F.EditingColumn(self.ft, self, $.extend(true, {}, self.column, data.editingColumn, {visible: self.alwaysShow}));
+
+				if (self.ft.$el.hasClass('footable-editing-left'))
+					self.position = 'left';
+
+				if (self.ft.$el.hasClass('footable-editing-right'))
+					self.position = 'right';
+
+				if (self.position === 'right'){
+					self.column.index = self.ft.columns.array.length;
+				} else {
+					self.column.index = 0;
+					for (var i = 0, len = self.ft.columns.array.length; i < len; i++){
+						self.ft.columns.array[i].index += 1;
+					}
+				}
+				self.ft.columns.array.push(self.column);
+				self.ft.columns.array.sort(function(a, b){ return a.index - b.index; });
+
+				self.callbacks.addRow = F.checkFnValue(self, data.editingAddRow, self.callbacks.addRow);
+				self.callbacks.editRow = F.checkFnValue(self, data.editingEditRow, self.callbacks.editRow);
+				self.callbacks.deleteRow = F.checkFnValue(self, data.editingDeleteRow, self.callbacks.deleteRow);
+				self.callbacks.viewRow = F.checkFnValue(self, data.editingViewRow, self.callbacks.viewRow);
+			}, function(){
+				self.enabled = false;
+			});
+		},
+		/**
+		 * Initializes the editing component for the plugin using the supplied table and options.
+		 * @instance
+		 * @protected
+		 * @fires FooTable.Editing#"init.ft.editing"
+		 */
+		init: function(){
+			/**
+			 * The init.ft.editing event is raised before its UI is generated.
+			 * Calling preventDefault on this event will disable the component.
+			 * @event FooTable.Editing#"init.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			var self = this;
+			this.ft.raise('init.ft.editing').then(function(){
+				self.$create();
+			}, function(){
+				self.enabled = false;
+			});
+		},
+		/**
+		 * Destroys the editing component removing any UI generated from the table.
+		 * @instance
+		 * @protected
+		 * @fires FooTable.Editing#"destroy.ft.editing"
+		 */
+		destroy: function () {
+			/**
+			 * The destroy.ft.editing event is raised before its UI is removed.
+			 * Calling preventDefault on this event will prevent the component from being destroyed.
+			 * @event FooTable.Editing#"destroy.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			var self = this;
+			this.ft.raise('destroy.ft.editing').then(function(){
+				self.ft.$el.removeClass('footable-editing footable-editing-always-show footable-editing-no-add footable-editing-no-edit footable-editing-no-delete footable-editing-no-view')
+					.off('click.ft.editing').find('tfoot > tr.footable-editing').remove();
+			});
+		},
+		/**
+		 * Creates the editing UI from the current options setting the various jQuery properties of this component.
+		 * @instance
+		 * @protected
+		 */
+		$create: function(){
+			var self = this, position = self.position === 'right' ? 'footable-editing-right' : 'footable-editing-left';
+			self.ft.$el.addClass('footable-editing').addClass(position)
+				.on('click.ft.editing', '.footable-show', {self: self}, self._onShowClick)
+				.on('click.ft.editing', '.footable-hide', {self: self}, self._onHideClick)
+				.on('click.ft.editing', '.footable-edit', {self: self}, self._onEditClick)
+				.on('click.ft.editing', '.footable-delete', {self: self}, self._onDeleteClick)
+				.on('click.ft.editing', '.footable-view', {self: self}, self._onViewClick)
+				.on('click.ft.editing', '.footable-add', {self: self}, self._onAddClick);
+
+			self.$cell = $('<td/>').attr('colspan', self.ft.columns.visibleColspan).append(self.$buttonShow());
+			if (self.allowAdd){
+				self.$cell.append(self.$buttonAdd());
+			}
+			self.$cell.append(self.$buttonHide());
+
+			if (self.alwaysShow){
+				self.ft.$el.addClass('footable-editing-always-show');
+			}
+
+			if (!self.allowAdd) self.ft.$el.addClass('footable-editing-no-add');
+			if (!self.allowEdit) self.ft.$el.addClass('footable-editing-no-edit');
+			if (!self.allowDelete) self.ft.$el.addClass('footable-editing-no-delete');
+			if (!self.allowView) self.ft.$el.addClass('footable-editing-no-view');
+
+			var $tfoot = self.ft.$el.children('tfoot');
+			if ($tfoot.length == 0){
+				$tfoot = $('<tfoot/>');
+				self.ft.$el.append($tfoot);
+			}
+			self.$row = $('<tr/>', { 'class': 'footable-editing' }).append(self.$cell).appendTo($tfoot);
+		},
+		/**
+		 * Creates the show button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonShow: function(){
+			return '<button type="button" class="btn btn-primary footable-show">' + this.showText + '</button>';
+		},
+		/**
+		 * Creates the hide button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonHide: function(){
+			return '<button type="button" class="btn btn-default footable-hide">' + this.hideText + '</button>';
+		},
+		/**
+		 * Creates the add button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonAdd: function(){
+			return '<button type="button" class="btn btn-primary footable-add">' + this.addText + '</button> ';
+		},
+		/**
+		 * Creates the edit button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonEdit: function(){
+			return '<button type="button" class="btn btn-default footable-edit">' + this.editText + '</button> ';
+		},
+		/**
+		 * Creates the delete button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonDelete: function(){
+			return '<button type="button" class="btn btn-default footable-delete">' + this.deleteText + '</button>';
+		},
+		/**
+		 * Creates the view button for the editing component.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$buttonView: function(){
+			return '<button type="button" class="btn btn-default footable-view">' + this.viewText + '</button> ';
+		},
+		/**
+		 * Creates the button group for the row buttons.
+		 * @instance
+		 * @protected
+		 * @returns {(string|HTMLElement|jQuery)}
+		 */
+		$rowButtons: function(){
+			if (F.is.jq(this._$buttons)) return this._$buttons.clone();
+			this._$buttons = $('<div class="btn-group btn-group-xs" role="group"></div>');
+			if (this.allowView) this._$buttons.append(this.$buttonView());
+			if (this.allowEdit) this._$buttons.append(this.$buttonEdit());
+			if (this.allowDelete) this._$buttons.append(this.$buttonDelete());
+			return this._$buttons;
+		},
+		/**
+		 * Performs the drawing of the component.
+		 */
+		draw: function(){
+			this.$cell.attr('colspan', this.ft.columns.visibleColspan);
+		},
+		/**
+		 * Handles the edit button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"edit.ft.editing"
+		 */
+		_onEditClick: function(e){
+			e.preventDefault();
+			var self = e.data.self, row = $(this).closest('tr').data('__FooTableRow__');
+			if (row instanceof F.Row){
+				/**
+				 * The edit.ft.editing event is raised before its callback is executed.
+				 * Calling preventDefault on this event will prevent the callback from being executed.
+				 * @event FooTable.Editing#"edit.ft.editing"
+				 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+				 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+				 * @param {FooTable.Row} row - The row to be edited.
+				 */
+				self.ft.raise('edit.ft.editing', [row]).then(function(){
+					self.callbacks.editRow.call(self.ft, row);
+				});
+			}
+		},
+		/**
+		 * Handles the delete button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"delete.ft.editing"
+		 */
+		_onDeleteClick: function(e){
+			e.preventDefault();
+			var self = e.data.self, row = $(this).closest('tr').data('__FooTableRow__');
+			if (row instanceof F.Row){
+				/**
+				 * The delete.ft.editing event is raised before its callback is executed.
+				 * Calling preventDefault on this event will prevent the callback from being executed.
+				 * @event FooTable.Editing#"delete.ft.editing"
+				 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+				 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+				 * @param {FooTable.Row} row - The row to be deleted.
+				 */
+				self.ft.raise('delete.ft.editing', [row]).then(function(){
+					self.callbacks.deleteRow.call(self.ft, row);
+				});
+			}
+		},
+		/**
+		 * Handles the view button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"view.ft.editing"
+		 */
+		_onViewClick: function(e){
+			e.preventDefault();
+			var self = e.data.self, row = $(this).closest('tr').data('__FooTableRow__');
+			if (row instanceof F.Row){
+				/**
+				 * The view.ft.editing event is raised before its callback is executed.
+				 * Calling preventDefault on this event will prevent the callback from being executed.
+				 * @event FooTable.Editing#"view.ft.editing"
+				 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+				 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+				 * @param {FooTable.Row} row - The row to be viewed.
+				 */
+				self.ft.raise('view.ft.editing', [row]).then(function(){
+					self.callbacks.viewRow.call(self.ft, row);
+				});
+			}
+		},
+		/**
+		 * Handles the add button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"add.ft.editing"
+		 */
+		_onAddClick: function(e){
+			e.preventDefault();
+			var self = e.data.self;
+			/**
+			 * The add.ft.editing event is raised before its callback is executed.
+			 * Calling preventDefault on this event will prevent the callback from being executed.
+			 * @event FooTable.Editing#"add.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			self.ft.raise('add.ft.editing').then(function(){
+				self.callbacks.addRow.call(self.ft);
+			});
+		},
+		/**
+		 * Handles the show button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"show.ft.editing"
+		 */
+		_onShowClick: function(e){
+			e.preventDefault();
+			var self = e.data.self;
+			/**
+			 * The show.ft.editing event is raised before its callback is executed.
+			 * Calling preventDefault on this event will prevent the callback from being executed.
+			 * @event FooTable.Editing#"show.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			self.ft.raise('show.ft.editing').then(function(){
+				self.ft.$el.addClass('footable-editing-show');
+				self.column.visible = true;
+				self.ft.draw();
+			});
+		},
+		/**
+		 * Handles the hide button click event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+		 * @fires FooTable.Editing#"show.ft.editing"
+		 */
+		_onHideClick: function(e){
+			e.preventDefault();
+			var self = e.data.self;
+			/**
+			 * The hide.ft.editing event is raised before its callback is executed.
+			 * Calling preventDefault on this event will prevent the callback from being executed.
+			 * @event FooTable.Editing#"hide.ft.editing"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			self.ft.raise('hide.ft.editing').then(function(){
+				self.ft.$el.removeClass('footable-editing-show');
+				self.column.visible = false;
+				self.ft.draw();
+			});
+		}
+	});
+
+	F.components.register('editing', F.Editing, 850);
+
+})(jQuery, FooTable);
+
+(function($, F){
+
+	F.EditingColumn = F.Column.extend(/** @lends FooTable.EditingColumn */{
+		/**
+		 * The Editing column class is used to create the column containing the editing buttons.
+		 * @constructs
+		 * @extends FooTable.Column
+		 * @param {FooTable.Table} instance -  The parent {@link FooTable.Table} this column belongs to.
+		 * @param {FooTable.Editing} editing - The parent {@link FooTable.Editing} component this column is used with.
+		 * @param {object} definition - An object containing all the properties to set for the column.
+		 * @returns {FooTable.EditingColumn}
+		 */
+		construct: function(instance, editing, definition){
+			this._super(instance, definition, 'editing');
+			this.editing = editing;
+		},
+		/**
+		 * After the column has been defined this ensures that the $el property is a jQuery object by either creating or updating the current value.
+		 * @instance
+		 * @protected
+		 * @this FooTable.Column
+		 */
+		$create: function(){
+			(this.$el = !this.virtual && F.is.jq(this.$el) ? this.$el : $('<th/>', {'class': 'footable-editing'})).html(this.title);
+		},
+		/**
+		 * This is supplied either the cell value or jQuery object to parse. Any value can be returned from this method and
+		 * will be provided to the {@link FooTable.EditingColumn#format} function
+		 * to generate the cell contents.
+		 * @instance
+		 * @protected
+		 * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object.
+		 * @returns {(jQuery)}
+		 */
+		parser: function(valueOrElement){
+			if (F.is.string(valueOrElement)) valueOrElement = $($.trim(valueOrElement));
+			if (F.is.element(valueOrElement)) valueOrElement = $(valueOrElement);
+			if (F.is.jq(valueOrElement)){
+				var tagName = valueOrElement.prop('tagName').toLowerCase();
+				if (tagName == 'td' || tagName == 'th') return valueOrElement.data('value') || valueOrElement.contents();
+				return valueOrElement;
+			}
+			return null;
+		},
+		/**
+		 * Creates a cell to be used in the supplied row for this column.
+		 * @param {FooTable.Row} row - The row to create the cell for.
+		 * @returns {FooTable.Cell}
+		 */
+		createCell: function(row){
+			var $buttons = this.editing.$rowButtons(), $cell = $('<td/>').append($buttons);
+			if (F.is.jq(row.$el)){
+				if (this.index === 0){
+					$cell.prependTo(row.$el);
+				} else {
+					$cell.insertAfter(row.$el.children().eq(this.index-1));
+				}
+			}
+			return new F.Cell(this.ft, row, this, $cell || $cell.html());
+		}
+	});
+
+	F.columns.register('editing', F.EditingColumn);
+
+})(jQuery, FooTable);
+(function($, F) {
+
+	/**
+	 * An object containing the editing options for the plugin. Added by the {@link FooTable.Editing} component.
+	 * @type {object}
+	 * @prop {boolean} enabled=false - Whether or not to allow editing on the table.
+	 * @prop {boolean} pageToNew=true - Whether or not to automatically page to a new row when it is added to the table.
+	 * @prop {string} position="right" - The position of the editing column in the table as well as the alignment of the buttons.
+	 * @prop {boolean} alwaysShow=false - Whether or not the editing column and add row button are always visible.
+	 * @prop {function} addRow - The callback function to execute when the add row button is clicked.
+	 * @prop {function} editRow - The callback function to execute when the edit row button is clicked.
+	 * @prop {function} deleteRow - The callback function to execute when the delete row button is clicked.
+	 * @prop {function} viewRow - The callback function to execute when the view row button is clicked.
+	 * @prop {string} showText - The text that appears in the show button. This can contain HTML.
+	 * @prop {string} hideText - The text that appears in the hide button. This can contain HTML.
+	 * @prop {string} addText - The text that appears in the add button. This can contain HTML.
+	 * @prop {string} editText - The text that appears in the edit button. This can contain HTML.
+	 * @prop {string} deleteText - The text that appears in the delete button. This can contain HTML.
+	 * @prop {string} viewText - The text that appears in the view button. This can contain HTML.
+	 * @prop {boolean} allowAdd - Whether or not to show the Add Row button.
+	 * @prop {boolean} allowEdit - Whether or not to show the Edit Row button.
+	 * @prop {boolean} allowDelete - Whether or not to show the Delete Row button.
+	 * @prop {boolean} allowView - Whether or not to show the View Row button.
+	 * @prop {object} column - The options for the editing column. @see {@link FooTable.EditingColumn} for more info.
+	 * @prop {string} column.classes="footable-editing" - A space separated string of class names to apply to all cells in the column.
+	 * @prop {string} column.name="editing" - The name of the column.
+	 * @prop {string} column.title="" - The title displayed in the header row of the table for the column.
+	 * @prop {boolean} column.filterable=false - Whether or not the column should be filterable when using the filtering component.
+	 * @prop {boolean} column.sortable=false - Whether or not the column should be sortable when using the sorting component.
+	 */
+	F.Defaults.prototype.editing = {
+		enabled: false,
+		pageToNew: true,
+		position: 'right',
+		alwaysShow: false,
+		addRow: function(){},
+		editRow: function(row){},
+		deleteRow: function(row){},
+		viewRow: function(row){},
+		showText: '<span class="fooicon fooicon-pencil" aria-hidden="true"></span> Edit rows',
+		hideText: 'Cancel',
+		addText: 'New row',
+		editText: '<span class="fooicon fooicon-pencil" aria-hidden="true"></span>',
+		deleteText: '<span class="fooicon fooicon-trash" aria-hidden="true"></span>',
+		viewText: '<span class="fooicon fooicon-stats" aria-hidden="true"></span>',
+		allowAdd: true,
+		allowEdit: true,
+		allowDelete: true,
+		allowView: false,
+		column: {
+			classes: 'footable-editing',
+			name: 'editing',
+			title: '',
+			filterable: false,
+			sortable: false
+		}
+	};
+
+})(jQuery, FooTable);
+
+(function($, F){
+
+	if (F.is.defined(F.Paging)){
+		/**
+		 * Holds a shallow clone of the un-paged {@link FooTable.Rows#array} value before paging occurs and superfluous rows are removed. Added by the {@link FooTable.Editing} component.
+		 * @instance
+		 * @public
+		 * @type {Array<FooTable.Row>}
+		 */
+		F.Paging.prototype.unpaged = [];
+
+		// override the default predraw method with one that sets the unpaged property.
+		F.Paging.extend('predraw', function(){
+			this.unpaged = this.ft.rows.array.slice(0); // create a shallow clone for later use
+			this._super(); // call the original method
+		});
+	}
+
+})(jQuery, FooTable);
+(function($, F){
+
+	/**
+	 * Adds the row to the table.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 * @returns {jQuery.Deferred}
+	 */
+	F.Row.prototype.add = function(redraw){
+		redraw = F.is.boolean(redraw) ? redraw : true;
+		var self = this;
+		return $.Deferred(function(d){
+			var index = self.ft.rows.all.push(self) - 1;
+			if (redraw){
+				return self.ft.draw().then(function(){
+					d.resolve(index);
+				});
+			} else {
+				d.resolve(index);
+			}
+		});
+	};
+
+	/**
+	 * Removes the row from the table.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 * @returns {jQuery.Deferred}
+	 */
+	F.Row.prototype.delete = function(redraw){
+		redraw = F.is.boolean(redraw) ? redraw : true;
+		var self = this;
+		return $.Deferred(function(d){
+			var index = self.ft.rows.all.indexOf(self);
+			if (F.is.number(index) && index >= 0 && index < self.ft.rows.all.length){
+				self.ft.rows.all.splice(index, 1);
+				if (redraw){
+					return self.ft.draw().then(function(){
+						d.resolve(self);
+					});
+				}
+			}
+			d.resolve(self);
+		});
+	};
+
+	if (F.is.defined(F.Paging)){
+		// override the default add method with one that supports paging
+		F.Row.extend('add', function(redraw){
+			redraw = F.is.boolean(redraw) ? redraw : true;
+			var self = this,
+				added = this._super(redraw),
+				editing = self.ft.use(F.Editing),
+				paging;
+			if (editing && editing.pageToNew && (paging = self.ft.use(F.Paging)) && redraw){
+				return added.then(function(){
+					var index = paging.unpaged.indexOf(self); // find this row in the unpaged array (this array will be sorted and filtered)
+					var page = Math.ceil((index + 1) / paging.size); // calculate the page the new row is on
+					if (paging.current !== page){ // goto the page if we need to
+						return paging.goto(page);
+					}
+				});
+			}
+			return added;
+		});
+	}
+
+	if (F.is.defined(F.Sorting)){
+		// override the default val method with one that supports sorting and paging
+		F.Row.extend('val', function(data, redraw){
+			redraw = F.is.boolean(redraw) ? redraw : true;
+			var result = this._super(data);
+			if (!F.is.hash(data)){
+				return result;
+			}
+			var self = this;
+			if (redraw){
+				self.ft.draw().then(function(){
+					var editing = self.ft.use(F.Editing), paging;
+					if (F.is.defined(F.Paging) && editing && editing.pageToNew && (paging = self.ft.use(F.Paging))){
+						var index = paging.unpaged.indexOf(self); // find this row in the unpaged array (this array will be sorted and filtered)
+						var page = Math.ceil((index + 1) / paging.size); // calculate the page the new row is on
+						if (paging.current !== page){ // goto the page if we need to
+							return paging.goto(page);
+						}
+					}
+				});
+			}
+			return result;
+		});
+	}
+
+})(jQuery, FooTable);
+(function(F){
+
+	/**
+	 * Adds a row to the underlying {@link FooTable.Rows#all} array.
+	 * @param {(object|FooTable.Row)} dataOrRow - A hash containing the row values or an actual {@link FooTable.Row} object.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 */
+	F.Rows.prototype.add = function(dataOrRow, redraw){
+		var row = dataOrRow;
+		if (F.is.hash(dataOrRow)){
+			row = new FooTable.Row(this.ft, this.ft.columns.array, dataOrRow);
+		}
+		if (row instanceof FooTable.Row){
+			row.add(redraw);
+		}
+	};
+
+	/**
+	 * Updates a row in the underlying {@link FooTable.Rows#all} array.
+	 * @param {(number|FooTable.Row)} indexOrRow - The index to update or the actual {@link FooTable.Row} object.
+	 * @param {object} data - A hash containing the new row values.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 */
+	F.Rows.prototype.update = function(indexOrRow, data, redraw){
+		var len = this.ft.rows.all.length, 
+			row = indexOrRow;
+		if (F.is.number(indexOrRow) && indexOrRow >= 0 && indexOrRow < len){
+			row = this.ft.rows.all[indexOrRow];
+		}
+		if (row instanceof FooTable.Row && F.is.hash(data)){
+			row.val(data, redraw);
+		}
+	};
+
+	/**
+	 * Deletes a row from the underlying {@link FooTable.Rows#all} array.
+	 * @param {(number|FooTable.Row)} indexOrRow - The index to delete or the actual {@link FooTable.Row} object.
+	 * @param {boolean} [redraw=true] - Whether or not to redraw the table, defaults to true but for bulk operations this
+	 * can be set to false and then followed by a call to the {@link FooTable.Table#draw} method.
+	 */
+	F.Rows.prototype.delete = function(indexOrRow, redraw){
+		var len = this.ft.rows.all.length, 
+			row = indexOrRow;
+		if (F.is.number(indexOrRow) && indexOrRow >= 0 && indexOrRow < len){
+			row = this.ft.rows.all[indexOrRow];
+		}
+		if (row instanceof FooTable.Row){
+			row.delete(redraw);
+		}
+	};
+
+})(FooTable);

admin/custom/footable3/js/footable.sorting.js

@@ -1,435 +1,490 @@
-/*
-* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
-* @version 3.0.6
-* @link http://fooplugins.com
-* @copyright Steven Usher & Brad Vincent 2015
-* @license Released under the GPLv3 license.
-*/
-(function($, F){
-
-	F.Sorter = F.Class.extend(/** @lends FooTable.Sorter */{
-		/**
-		 * The sorter object contains the column and direction to sort by.
-		 * @constructs
-		 * @extends FooTable.Class
-		 * @param {FooTable.Column} column - The column to sort.
-		 * @param {string} direction - The direction to sort by.
-		 * @returns {FooTable.Sorter}
-		 */
-		construct: function(column, direction){
-			/**
-			 * The column to sort.
-			 * @type {FooTable.Column}
-			 */
-			this.column = column;
-			/**
-			 * The direction to sort by.
-			 * @type {string}
-			 */
-			this.direction = direction;
-		}
-	});
-
-})(jQuery, FooTable);
-(function ($, F) {
-	F.Sorting = F.Component.extend(/** @lends FooTable.Sorting */{
-		/**
-		 * The sorting component adds a small sort button to specified column headers allowing users to sort those columns in the table.
-		 * @constructs
-		 * @extends FooTable.Component
-		 * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component.
-		 * @returns {FooTable.Sorting}
-		 */
-		construct: function (table) {
-			// call the constructor of the base class
-			this._super(table, table.o.sorting.enabled);
-
-			/* PROTECTED */
-			/**
-			 * This provides a shortcut to the {@link FooTable.Table#options}.[sorting]{@link FooTable.Defaults#sorting} object.
-			 * @instance
-			 * @protected
-			 * @type {object}
-			 */
-			this.o = table.o.sorting;
-			/**
-			 * The current sorted column.
-			 * @instance
-			 * @type {FooTable.Column}
-			 */
-			this.column = null;
-
-			/* PRIVATE */
-			/**
-			 * Sets a flag indicating whether or not the sorting has changed. When set to true the {@link FooTable.Sorting#sorting_changing} and {@link FooTable.Sorting#sorting_changed} events
-			 * will be raised during the drawing operation.
-			 * @private
-			 * @type {boolean}
-			 */
-			this._changed = false;
-		},
-
-		/* PROTECTED */
-		/**
-		 * Checks the supplied data and options for the sorting component.
-		 * @instance
-		 * @protected
-		 * @param {object} data - The jQuery data object from the parent table.
-		 * @fires FooTable.Sorting#"preinit.ft.sorting"
-		 * @this FooTable.Sorting
-		 */
-		preinit: function(data){
-			var self = this;
-			/**
-			 * The preinit.ft.sorting event is raised before the UI is created and provides the tables jQuery data object for additional options parsing.
-			 * Calling preventDefault on this event will disable the component.
-			 * @event FooTable.Sorting#"preinit.ft.sorting"
-			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
-			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
-			 * @param {object} data - The jQuery data object of the table raising the event.
-			 */
-			this.ft.raise('preinit.ft.sorting', [data]).then(function(){
-				if (self.ft.$el.hasClass('footable-sorting'))
-					self.enabled = true;
-				self.enabled = F.is.boolean(data.sorting)
-					? data.sorting
-					: self.enabled;
-				if (!self.enabled) return;
-				self.column = F.arr.first(self.ft.columns.array, function(col){ return col.sorted; });
-			}, function(){
-				self.enabled = false;
-			});
-		},
-		/**
-		 * Initializes the sorting component for the plugin using the supplied table and options.
-		 * @instance
-		 * @protected
-		 * @fires FooTable.Sorting#"init.ft.sorting"
-		 * @this FooTable.Sorting
-		 */
-		init: function () {
-			/**
-			 * The init.ft.sorting event is raised before its UI is generated.
-			 * Calling preventDefault on this event will disable the component.
-			 * @event FooTable.Sorting#"init.ft.sorting"
-			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
-			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
-			 */
-			var self = this;
-			this.ft.raise('init.ft.sorting').then(function(){
-				F.arr.each(self.ft.columns.array, function(col){
-					if (col.sortable){
-						col.$el.addClass('footable-sortable').append($('<span/>', {'class': 'fooicon fooicon-sort'}));
-					}
-				});
-				self.ft.$el.on('click.footable', '.footable-sortable', { self: self }, self._onSortClicked);
-			}, function(){
-				self.enabled = false;
-			});
-		},
-		/**
-		 * Destroys the sorting component removing any UI generated from the table.
-		 * @instance
-		 * @protected
-		 * @fires FooTable.Sorting#"destroy.ft.sorting"
-		 */
-		destroy: function () {
-			/**
-			 * The destroy.ft.sorting event is raised before its UI is removed.
-			 * Calling preventDefault on this event will prevent the component from being destroyed.
-			 * @event FooTable.Sorting#"destroy.ft.sorting"
-			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
-			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
-			 */
-			var self = this;
-			this.ft.raise('destroy.ft.paging').then(function(){
-				self.ft.$el.off('click.footable', '.footable-sortable', self._onSortClicked);
-				self.ft.$el.children('thead').children('tr.footable-header')
-					.children('.footable-sortable').removeClass('footable-sortable')
-					.find('span.fooicon').remove();
-			});
-		},
-		/**
-		 * Performs the actual sorting against the {@link FooTable.Rows#current} array.
-		 * @instance
-		 * @protected
-		 */
-		predraw: function () {
-			if (!this.column) return;
-			var self = this, col = self.column;
-			//self.ft.rows.array.sort(function (a, b) {
-			//	return col.direction == 'ASC'
-			//			? col.sorter(a.cells[col.index].value, b.cells[col.index].value)
-			//			: col.sorter(b.cells[col.index].value, a.cells[col.index].value);
-			//});
-			self.ft.rows.array.sort(function (a, b) {
-				return col.direction == 'ASC'
-						? col.sorter(a.cells[col.index].sortValue, b.cells[col.index].sortValue)
-						: col.sorter(b.cells[col.index].sortValue, a.cells[col.index].sortValue);
-			});
-		},
-		/**
-		 * Updates the sorting UI setting the state of the sort buttons.
-		 * @instance
-		 * @protected
-		 */
-		draw: function () {
-			if (!this.column) return;
-			var self = this,
-				$sortable = self.ft.$el.find('thead > tr > .footable-sortable'),
-				$active = self.column.$el;
-
-			$sortable.removeClass('footable-asc footable-desc').children('.fooicon').removeClass('fooicon-sort fooicon-sort-asc fooicon-sort-desc');
-			$sortable.not($active).children('.fooicon').addClass('fooicon-sort');
-			$active.addClass(self.column.direction == 'ASC' ? 'footable-asc' : 'footable-desc')
-				.children('.fooicon').addClass(self.column.direction == 'ASC' ? 'fooicon-sort-asc' : 'fooicon-sort-desc');
-		},
-
-		/* PUBLIC */
-		/**
-		 * Sets the sorting options and calls the {@link FooTable.Table#draw} method to perform the actual sorting.
-		 * @instance
-		 * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by.
-		 * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC.
-		 * @returns {jQuery.Promise}
-		 * @fires FooTable.Sorting#"before.ft.sorting"
-		 * @fires FooTable.Sorting#"after.ft.sorting"
-		 */
-		sort: function(column, direction){
-			return this._sort(column, direction);
-		},
-
-		/* PRIVATE */
-		/**
-		 * Performs the required steps to handle sorting including the raising of the {@link FooTable.Sorting#"before.ft.sorting"} and {@link FooTable.Sorting#"after.ft.sorting"} events.
-		 * @instance
-		 * @private
-		 * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by.
-		 * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC.
-		 * @returns {jQuery.Promise}
-		 * @fires FooTable.Sorting#"before.ft.sorting"
-		 * @fires FooTable.Sorting#"after.ft.sorting"
-		 */
-		_sort: function(column, direction){
-			var self = this;
-			var sorter = new F.Sorter(self.ft.columns.get(column), F.Sorting.dir(direction));
-			/**
-			 * The before.ft.sorting event is raised before a sort is applied and allows listeners to modify the sorter or cancel it completely by calling preventDefault on the jQuery.Event object.
-			 * @event FooTable.Sorting#"before.ft.sorting"
-			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
-			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
-			 * @param {FooTable.Sorter} sorter - The sorter that is about to be applied.
-			 */
-			return self.ft.raise('before.ft.sorting', [sorter]).then(function(){
-				F.arr.each(self.ft.columns.array, function(col){
-					if (col != self.column) col.direction = null;
-				});
-				self.column = self.ft.columns.get(sorter.column);
-				if (self.column) self.column.direction = F.Sorting.dir(sorter.direction);
-				return self.ft.draw().then(function(){
-					/**
-					 * The after.ft.sorting event is raised after a sorter has been applied.
-					 * @event FooTable.Sorting#"after.ft.sorting"
-					 * @param {jQuery.Event} e - The jQuery.Event object for the event.
-					 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
-					 * @param {FooTable.Sorter} sorter - The sorter that has been applied.
-					 */
-					self.ft.raise('after.ft.sorting', [sorter]);
-				});
-			});
-		},
-		/**
-		 * Handles the sort button clicked event.
-		 * @instance
-		 * @private
-		 * @param {jQuery.Event} e - The event object for the event.
-		 */
-		_onSortClicked: function (e) {
-			e.preventDefault();
-			var self = e.data.self, $header = $(this).closest('th,td'),
-				direction = $header.is('.footable-asc, .footable-desc')
-					? ($header.hasClass('footable-desc') ? 'ASC' : 'DESC')
-					: 'ASC';
-			self._sort($header.index(), direction);
-		}
-	});
-
-	/**
-	 * Checks the supplied string is a valid direction and if not returns ASC as default.
-	 * @static
-	 * @protected
-	 * @param {string} str - The string to check.
-	 */
-	F.Sorting.dir = function(str){
-		return F.is.string(str) && (str == 'ASC' || str == 'DESC') ? str : 'ASC';
-	};
-
-	F.components.core.register('sorting', F.Sorting, 5);
-
-})(jQuery, FooTable);
-(function(F){
-
-	/**
-	 * The value used by the sorting component during sort operations. Can be set using the data-sort-value attribute on the cell itself.
-	 * If this is not supplied it is set to the result of the toString method called on the value for the cell. Added by the {@link FooTable.Sorting} component.
-	 * @type {string}
-	 * @default null
-	 */
-	F.Cell.prototype.sortValue = null;
-
-	// this is used to define the sorting specific properties on cell creation
-	F.Cell.prototype.__sorting_define__ = function(valueOrElement){
-		this.sortValue = this.column.sortValue.call(this.column, valueOrElement);
-	};
-
-	// this is used to update the sortValue property whenever the cell value is changed
-	F.Cell.prototype.__sorting_val__ = function(value){
-		if (F.is.defined(value)){
-			// set only
-			this.sortValue = this.column.sortValue.call(this.column, value);
-		}
-	};
-
-	// overrides the public define method and replaces it with our own
-	F.Cell.extend('define', function(valueOrElement){
-		this._super(valueOrElement);
-		this.__sorting_define__(valueOrElement);
-	});
-	// overrides the public val method and replaces it with our own
-	F.Cell.extend('val', function(value){
-		var val = this._super(value);
-		this.__sorting_val__(value);
-		return val;
-	});
-})(FooTable);
-(function($, F){
-	/**
-	 * The direction to sort if the {@link FooTable.Column#sorted} property is set to true. Can be "ASC", "DESC" or NULL. Added by the {@link FooTable.Sorting} component.
-	 * @type {string}
-	 * @default null
-	 */
-	F.Column.prototype.direction = null;
-	/**
-	 * Whether or not the column can be sorted. Added by the {@link FooTable.Sorting} component.
-	 * @type {boolean}
-	 * @default true
-	 */
-	F.Column.prototype.sortable = true;
-	/**
-	 * Whether or not the column is sorted. Added by the {@link FooTable.Sorting} component.
-	 * @type {boolean}
-	 * @default false
-	 */
-	F.Column.prototype.sorted = false;
-
-	/**
-	 * This is supplied two values from the column for a comparison to be made and the result returned. Added by the {@link FooTable.Sorting} component.
-	 * @param {*} a - The first value to be compared.
-	 * @param {*} b - The second value to compare to the first.
-	 * @returns {number}
-	 * @example <caption>This example shows using pseudo code what a sort function would look like.</caption>
-	 * "sorter": function(a, b){
-	 * 	if (a is less than b by some ordering criterion) {
-	 * 		return -1;
-	 * 	}
-	 * 	if (a is greater than b by the ordering criterion) {
-	 * 		return 1;
-	 * 	}
-	 * 	// a must be equal to b
-	 * 	return 0;
-	 * }
-	 */
-	F.Column.prototype.sorter = function(a, b){
-		if (typeof a === 'string') a = a.toLowerCase();
-		if (typeof b === 'string') b = b.toLowerCase();
-		if (a === b) return 0;
-		if (a < b) return -1;
-		return 1;
-	};
-
-	/**
-	 * This is supplied either the cell value or jQuery object to parse. A value must be returned from this method and will be used during sorting operations.
-	 * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object.
-	 * @returns {*}
-	 * @this FooTable.Column
-	 */
-	F.Column.prototype.sortValue = function(valueOrElement){
-		// if we have an element or a jQuery object use jQuery to get the value
-		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)) return $(valueOrElement).data('sortValue') || this.parser(valueOrElement);
-		// if options are supplied with the value
-		if (F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options)){
-			if (F.is.string(valueOrElement.options.sortValue)) return valueOrElement.options.sortValue;
-			if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value;
-		}
-		if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement;
-		return null;
-	};
-
-	// this is used to define the sorting specific properties on column creation
-	F.Column.prototype.__sorting_define__ = function(definition){
-		this.sorter = F.checkFnValue(this, definition.sorter, this.sorter);
-		this.direction = F.is.type(definition.direction, 'string') ? F.Sorting.dir(definition.direction) : null;
-		this.sortable = F.is.boolean(definition.sortable) ? definition.sortable : true;
-		this.sorted = F.is.boolean(definition.sorted) ? definition.sorted : false;
-	};
-
-	// overrides the public define method and replaces it with our own
-	F.Column.extend('define', function(definition){
-		this._super(definition);
-		this.__sorting_define__(definition);
-	});
-
-})(jQuery, FooTable);
-(function(F){
-	/**
-	 * An object containing the sorting options for the plugin. Added by the {@link FooTable.Sorting} component.
-	 * @type {object}
-	 * @prop {boolean} enabled=false - Whether or not to allow sorting on the table.
-	 */
-	F.Defaults.prototype.sorting = {
-		enabled: false
-	};
-})(FooTable);
-(function($, F){
-
-	F.HTMLColumn.extend('__sorting_define__', function(definition){
-		this._super(definition);
-		this.sortUse = F.is.string(definition.sortUse) && $.inArray(definition.sortUse, ['html','text']) !== -1 ? definition.sortUse : 'html';
-	});
-
-	/**
-	 * This is supplied either the cell value or jQuery object to parse. A value must be returned from this method and will be used during sorting operations.
-	 * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object.
-	 * @returns {*}
-	 * @this FooTable.HTMLColumn
-	 */
-	F.HTMLColumn.prototype.sortValue = function(valueOrElement){
-		// if we have an element or a jQuery object use jQuery to get the data value or pass it off to the parser
-		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){
-			return $(valueOrElement).data('sortValue') || $.trim($(valueOrElement)[this.sortUse]());
-		}
-		// if options are supplied with the value
-		if (F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options)){
-			if (F.is.string(valueOrElement.options.sortValue)) return valueOrElement.options.sortValue;
-			if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value;
-		}
-		if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement;
-		return null;
-	};
-
-})(jQuery, FooTable);
-(function(F){
-	/**
-	 * Sort the table using the specified column and direction. Added by the {@link FooTable.Sorting} component.
-	 * @instance
-	 * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by.
-	 * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC.
-	 * @returns {jQuery.Promise}
-	 * @fires FooTable.Sorting#"change.ft.sorting"
-	 * @fires FooTable.Sorting#"changed.ft.sorting"
-	 * @see FooTable.Sorting#sort
-	 */
-	F.Table.prototype.sort = function(column, direction){
-		return this.use(F.Sorting).sort(column, direction);
-	};
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+(function($, F){
+
+	F.Sorter = F.Class.extend(/** @lends FooTable.Sorter */{
+		/**
+		 * The sorter object contains the column and direction to sort by.
+		 * @constructs
+		 * @extends FooTable.Class
+		 * @param {FooTable.Column} column - The column to sort.
+		 * @param {string} direction - The direction to sort by.
+		 * @returns {FooTable.Sorter}
+		 */
+		construct: function(column, direction){
+			/**
+			 * The column to sort.
+			 * @type {FooTable.Column}
+			 */
+			this.column = column;
+			/**
+			 * The direction to sort by.
+			 * @type {string}
+			 */
+			this.direction = direction;
+		}
+	});
+
+})(jQuery, FooTable);
+(function ($, F) {
+	F.Sorting = F.Component.extend(/** @lends FooTable.Sorting */{
+		/**
+		 * The sorting component adds a small sort button to specified column headers allowing users to sort those columns in the table.
+		 * @constructs
+		 * @extends FooTable.Component
+		 * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component.
+		 * @returns {FooTable.Sorting}
+		 */
+		construct: function (table) {
+			// call the constructor of the base class
+			this._super(table, table.o.sorting.enabled);
+
+			/* PROTECTED */
+			/**
+			 * This provides a shortcut to the {@link FooTable.Table#options}.[sorting]{@link FooTable.Defaults#sorting} object.
+			 * @instance
+			 * @protected
+			 * @type {object}
+			 */
+			this.o = table.o.sorting;
+			/**
+			 * The current sorted column.
+			 * @instance
+			 * @type {FooTable.Column}
+			 */
+			this.column = null;
+			/**
+			 * Whether or not to allow sorting to occur, should be set using the {@link FooTable.Sorting#toggleAllowed} method.
+			 * @instance
+			 * @type {boolean}
+			 */
+			this.allowed = true;
+			/**
+			 * The initial sort state of the table, this value is used for determining if the sorting has occurred or to reset the state to default.
+			 * @instance
+			 * @type {{isset: boolean, rows: Array.<FooTable.Row>, column: string, direction: ?string}}
+			 */
+			this.initial = null;
+		},
+
+		/* PROTECTED */
+		/**
+		 * Checks the supplied data and options for the sorting component.
+		 * @instance
+		 * @protected
+		 * @param {object} data - The jQuery data object from the parent table.
+		 * @fires FooTable.Sorting#"preinit.ft.sorting"
+		 * @this FooTable.Sorting
+		 */
+		preinit: function(data){
+			var self = this;
+			/**
+			 * The preinit.ft.sorting event is raised before the UI is created and provides the tables jQuery data object for additional options parsing.
+			 * Calling preventDefault on this event will disable the component.
+			 * @event FooTable.Sorting#"preinit.ft.sorting"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 * @param {object} data - The jQuery data object of the table raising the event.
+			 */
+			this.ft.raise('preinit.ft.sorting', [data]).then(function(){
+				if (self.ft.$el.hasClass('footable-sorting'))
+					self.enabled = true;
+				self.enabled = F.is.boolean(data.sorting)
+					? data.sorting
+					: self.enabled;
+				if (!self.enabled) return;
+				self.column = F.arr.first(self.ft.columns.array, function(col){ return col.sorted; });
+			}, function(){
+				self.enabled = false;
+			});
+		},
+		/**
+		 * Initializes the sorting component for the plugin using the supplied table and options.
+		 * @instance
+		 * @protected
+		 * @fires FooTable.Sorting#"init.ft.sorting"
+		 * @this FooTable.Sorting
+		 */
+		init: function () {
+			/**
+			 * The init.ft.sorting event is raised before its UI is generated.
+			 * Calling preventDefault on this event will disable the component.
+			 * @event FooTable.Sorting#"init.ft.sorting"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			var self = this;
+			this.ft.raise('init.ft.sorting').then(function(){
+				if (!self.initial){
+					var isset = !!self.column;
+					self.initial = {
+						isset: isset,
+						// grab a shallow copy of the rows array prior to sorting - allows us to reset without an initial sort
+						rows: self.ft.rows.all.slice(0),
+						// if there is a sorted column store its name and direction
+						column: isset ? self.column.name : null,
+						direction: isset ? self.column.direction : null
+					}
+				}
+				F.arr.each(self.ft.columns.array, function(col){
+					if (col.sortable){
+						col.$el.addClass('footable-sortable').append($('<span/>', {'class': 'fooicon fooicon-sort'}));
+					}
+				});
+				self.ft.$el.on('click.footable', '.footable-sortable', { self: self }, self._onSortClicked);
+			}, function(){
+				self.enabled = false;
+			});
+		},
+		/**
+		 * Destroys the sorting component removing any UI generated from the table.
+		 * @instance
+		 * @protected
+		 * @fires FooTable.Sorting#"destroy.ft.sorting"
+		 */
+		destroy: function () {
+			/**
+			 * The destroy.ft.sorting event is raised before its UI is removed.
+			 * Calling preventDefault on this event will prevent the component from being destroyed.
+			 * @event FooTable.Sorting#"destroy.ft.sorting"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 */
+			var self = this;
+			this.ft.raise('destroy.ft.paging').then(function(){
+				self.ft.$el.off('click.footable', '.footable-sortable', self._onSortClicked);
+				self.ft.$el.children('thead').children('tr.footable-header')
+					.children('.footable-sortable').removeClass('footable-sortable footable-asc footable-desc')
+					.find('span.fooicon').remove();
+			});
+		},
+		/**
+		 * Performs the actual sorting against the {@link FooTable.Rows#current} array.
+		 * @instance
+		 * @protected
+		 */
+		predraw: function () {
+			if (!this.column) return;
+			var self = this, col = self.column;
+			self.ft.rows.array.sort(function (a, b) {
+				return col.direction == 'DESC'
+						? col.sorter(b.cells[col.index].sortValue, a.cells[col.index].sortValue)
+						: col.sorter(a.cells[col.index].sortValue, b.cells[col.index].sortValue);
+			});
+		},
+		/**
+		 * Updates the sorting UI setting the state of the sort buttons.
+		 * @instance
+		 * @protected
+		 */
+		draw: function () {
+			if (!this.column) return;
+			var self = this,
+				$sortable = self.ft.$el.find('thead > tr > .footable-sortable'),
+				$active = self.column.$el;
+
+			$sortable.removeClass('footable-asc footable-desc').children('.fooicon').removeClass('fooicon-sort fooicon-sort-asc fooicon-sort-desc');
+			$sortable.not($active).children('.fooicon').addClass('fooicon-sort');
+			$active.addClass(self.column.direction == 'DESC' ? 'footable-desc' : 'footable-asc')
+				.children('.fooicon').addClass(self.column.direction == 'DESC' ? 'fooicon-sort-desc' : 'fooicon-sort-asc');
+		},
+
+		/* PUBLIC */
+		/**
+		 * Sets the sorting options and calls the {@link FooTable.Table#draw} method to perform the actual sorting.
+		 * @instance
+		 * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by.
+		 * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC.
+		 * @returns {jQuery.Promise}
+		 * @fires FooTable.Sorting#"before.ft.sorting"
+		 * @fires FooTable.Sorting#"after.ft.sorting"
+		 */
+		sort: function(column, direction){
+			return this._sort(column, direction);
+		},
+		/**
+		 * Toggles whether or not sorting is currently allowed.
+		 * @param {boolean} [state] - You can optionally specify the state you want it to be, if not supplied the current value is flipped.
+		 */
+		toggleAllowed: function(state){
+			state = F.is.boolean(state) ? state : !this.allowed;
+			this.allowed = state;
+			this.ft.$el.toggleClass('footable-sorting-disabled', !this.allowed);
+		},
+		/**
+		 * Checks whether any sorting has occurred for the table.
+		 * @returns {boolean}
+		 */
+		hasChanged: function(){
+			return !(!this.initial || !this.column ||
+				(this.column.name === this.initial.column &&
+					(this.column.direction === this.initial.direction || (this.initial.direction === null && this.column.direction === 'ASC')))
+			);
+		},
+		/**
+		 * Resets the table sorting to the initial state recorded in the components init method.
+		 */
+		reset: function(){
+			if (!!this.initial){
+				if (this.initial.isset){
+					// if the initial value specified a column, sort by it
+					this.sort(this.initial.column, this.initial.direction);
+				} else {
+					// if there was no initial column then we need to reset the rows to there original order
+					if (!!this.column){
+						// if there is a currently sorted column remove the asc/desc classes and set it to null.
+						this.column.$el.removeClass('footable-asc footable-desc');
+						this.column = null;
+					}
+					// replace the current all rows array with the one stored in the initial value
+					this.ft.rows.all = this.initial.rows;
+					// force the table to redraw itself using the updated rows array
+					this.ft.draw();
+				}
+			}
+		},
+
+		/* PRIVATE */
+		/**
+		 * Performs the required steps to handle sorting including the raising of the {@link FooTable.Sorting#"before.ft.sorting"} and {@link FooTable.Sorting#"after.ft.sorting"} events.
+		 * @instance
+		 * @private
+		 * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by.
+		 * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC.
+		 * @returns {jQuery.Promise}
+		 * @fires FooTable.Sorting#"before.ft.sorting"
+		 * @fires FooTable.Sorting#"after.ft.sorting"
+		 */
+		_sort: function(column, direction){
+			if (!this.allowed) return $.Deferred().reject('sorting disabled');
+			var self = this;
+			var sorter = new F.Sorter(self.ft.columns.get(column), F.Sorting.dir(direction));
+			/**
+			 * The before.ft.sorting event is raised before a sort is applied and allows listeners to modify the sorter or cancel it completely by calling preventDefault on the jQuery.Event object.
+			 * @event FooTable.Sorting#"before.ft.sorting"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 * @param {FooTable.Sorter} sorter - The sorter that is about to be applied.
+			 */
+			return self.ft.raise('before.ft.sorting', [sorter]).then(function(){
+				F.arr.each(self.ft.columns.array, function(col){
+					if (col != self.column) col.direction = null;
+				});
+				self.column = self.ft.columns.get(sorter.column);
+				if (self.column) self.column.direction = F.Sorting.dir(sorter.direction);
+				return self.ft.draw().then(function(){
+					/**
+					 * The after.ft.sorting event is raised after a sorter has been applied.
+					 * @event FooTable.Sorting#"after.ft.sorting"
+					 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+					 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+					 * @param {FooTable.Sorter} sorter - The sorter that has been applied.
+					 */
+					self.ft.raise('after.ft.sorting', [sorter]);
+				});
+			});
+		},
+		/**
+		 * Handles the sort button clicked event.
+		 * @instance
+		 * @private
+		 * @param {jQuery.Event} e - The event object for the event.
+		 */
+		_onSortClicked: function (e) {
+			var self = e.data.self, $header = $(this).closest('th,td'),
+				direction = $header.is('.footable-asc, .footable-desc')
+					? ($header.hasClass('footable-desc') ? 'ASC' : 'DESC')
+					: 'ASC';
+			self._sort($header.index(), direction);
+		}
+	});
+
+	/**
+	 * Checks the supplied string is a valid direction and if not returns ASC as default.
+	 * @static
+	 * @protected
+	 * @param {string} str - The string to check.
+	 */
+	F.Sorting.dir = function(str){
+		return F.is.string(str) && (str == 'ASC' || str == 'DESC') ? str : 'ASC';
+	};
+
+	F.components.register('sorting', F.Sorting, 600);
+
+})(jQuery, FooTable);
+(function(F){
+
+	/**
+	 * The value used by the sorting component during sort operations. Can be set using the data-sort-value attribute on the cell itself.
+	 * If this is not supplied it is set to the result of the toString method called on the value for the cell. Added by the {@link FooTable.Sorting} component.
+	 * @type {string}
+	 * @default null
+	 */
+	F.Cell.prototype.sortValue = null;
+
+	// this is used to define the sorting specific properties on cell creation
+	F.Cell.prototype.__sorting_define__ = function(valueOrElement){
+		this.sortValue = this.column.sortValue.call(this.column, valueOrElement);
+	};
+
+	// this is used to update the sortValue property whenever the cell value is changed
+	F.Cell.prototype.__sorting_val__ = function(value){
+		if (F.is.defined(value)){
+			// set only
+			this.sortValue = this.column.sortValue.call(this.column, value);
+		}
+	};
+
+	// overrides the public define method and replaces it with our own
+	F.Cell.extend('define', function(valueOrElement){
+		this._super(valueOrElement);
+		this.__sorting_define__(valueOrElement);
+	});
+	// overrides the public val method and replaces it with our own
+	F.Cell.extend('val', function(value){
+		var val = this._super(value);
+		this.__sorting_val__(value);
+		return val;
+	});
+})(FooTable);
+(function($, F){
+	/**
+	 * The direction to sort if the {@link FooTable.Column#sorted} property is set to true. Can be "ASC", "DESC" or NULL. Added by the {@link FooTable.Sorting} component.
+	 * @type {string}
+	 * @default null
+	 */
+	F.Column.prototype.direction = null;
+	/**
+	 * Whether or not the column can be sorted. Added by the {@link FooTable.Sorting} component.
+	 * @type {boolean}
+	 * @default true
+	 */
+	F.Column.prototype.sortable = true;
+	/**
+	 * Whether or not the column is sorted. Added by the {@link FooTable.Sorting} component.
+	 * @type {boolean}
+	 * @default false
+	 */
+	F.Column.prototype.sorted = false;
+
+	/**
+	 * This is supplied two values from the column for a comparison to be made and the result returned. Added by the {@link FooTable.Sorting} component.
+	 * @param {*} a - The first value to be compared.
+	 * @param {*} b - The second value to compare to the first.
+	 * @returns {number}
+	 * @example <caption>This example shows using pseudo code what a sort function would look like.</caption>
+	 * "sorter": function(a, b){
+	 * 	if (a is less than b by some ordering criterion) {
+	 * 		return -1;
+	 * 	}
+	 * 	if (a is greater than b by the ordering criterion) {
+	 * 		return 1;
+	 * 	}
+	 * 	// a must be equal to b
+	 * 	return 0;
+	 * }
+	 */
+	F.Column.prototype.sorter = function(a, b){
+		if (typeof a === 'string') a = a.toLowerCase();
+		if (typeof b === 'string') b = b.toLowerCase();
+		if (a === b) return 0;
+		if (a < b) return -1;
+		return 1;
+	};
+
+	/**
+	 * This is supplied either the cell value or jQuery object to parse. A value must be returned from this method and will be used during sorting operations.
+	 * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object.
+	 * @returns {*}
+	 * @this FooTable.Column
+	 */
+	F.Column.prototype.sortValue = function(valueOrElement){
+		// if we have an element or a jQuery object use jQuery to get the value
+		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){
+			var data = $(valueOrElement).data('sortValue');
+			return F.is.defined(data) ? data : this.parser(valueOrElement);
+		}
+		// if options are supplied with the value
+		if (F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options)){
+			if (F.is.string(valueOrElement.options.sortValue)) return valueOrElement.options.sortValue;
+			if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value;
+		}
+		if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement;
+		return null;
+	};
+
+	// this is used to define the sorting specific properties on column creation
+	F.Column.prototype.__sorting_define__ = function(definition){
+		this.sorter = F.checkFnValue(this, definition.sorter, this.sorter);
+		this.direction = F.is.type(definition.direction, 'string') ? F.Sorting.dir(definition.direction) : null;
+		this.sortable = F.is.boolean(definition.sortable) ? definition.sortable : true;
+		this.sorted = F.is.boolean(definition.sorted) ? definition.sorted : false;
+		this.sortValue = F.checkFnValue(this, definition.sortValue, this.sortValue);
+	};
+
+	// overrides the public define method and replaces it with our own
+	F.Column.extend('define', function(definition){
+		this._super(definition);
+		this.__sorting_define__(definition);
+	});
+
+})(jQuery, FooTable);
+(function(F){
+	/**
+	 * An object containing the sorting options for the plugin. Added by the {@link FooTable.Sorting} component.
+	 * @type {object}
+	 * @prop {boolean} enabled=false - Whether or not to allow sorting on the table.
+	 */
+	F.Defaults.prototype.sorting = {
+		enabled: false
+	};
+})(FooTable);
+(function($, F){
+
+	F.HTMLColumn.extend('__sorting_define__', function(definition){
+		this._super(definition);
+		this.sortUse = F.is.string(definition.sortUse) && $.inArray(definition.sortUse, ['html','text']) !== -1 ? definition.sortUse : 'html';
+	});
+
+	/**
+	 * This is supplied either the cell value or jQuery object to parse. A value must be returned from this method and will be used during sorting operations.
+	 * @param {(*|jQuery)} valueOrElement - The value or jQuery cell object.
+	 * @returns {*}
+	 * @this FooTable.HTMLColumn
+	 */
+	F.HTMLColumn.prototype.sortValue = function(valueOrElement){
+		// if we have an element or a jQuery object use jQuery to get the data value or pass it off to the parser
+		if (F.is.element(valueOrElement) || F.is.jq(valueOrElement)){
+			var data = $(valueOrElement).data('sortValue');
+			return F.is.defined(data) ? data : $.trim($(valueOrElement)[this.sortUse]());
+		}
+		// if options are supplied with the value
+		if (F.is.hash(valueOrElement) && F.is.hash(valueOrElement.options)){
+			if (F.is.string(valueOrElement.options.sortValue)) return valueOrElement.options.sortValue;
+			if (F.is.defined(valueOrElement.value)) valueOrElement = valueOrElement.value;
+		}
+		if (F.is.defined(valueOrElement) && valueOrElement != null) return valueOrElement;
+		return null;
+	};
+
+})(jQuery, FooTable);
+(function(F){
+	/**
+	 * Sort the table using the specified column and direction. Added by the {@link FooTable.Sorting} component.
+	 * @instance
+	 * @param {(string|number|FooTable.Column)} column - The column name, index or the actual {@link FooTable.Column} object to sort by.
+	 * @param {string} [direction="ASC"] - The direction to sort by, either ASC or DESC.
+	 * @returns {jQuery.Promise}
+	 * @fires FooTable.Sorting#"change.ft.sorting"
+	 * @fires FooTable.Sorting#"changed.ft.sorting"
+	 * @see FooTable.Sorting#sort
+	 */
+	F.Table.prototype.sort = function(column, direction){
+		return this.use(F.Sorting).sort(column, direction);
+	};
 })(FooTable);

admin/custom/footable3/js/footable.state.js

@@ -0,0 +1,362 @@
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+(function($, F){
+
+	// global int to use if the table has no ID
+	var _uid = 0,
+	// a hash value for the current url
+		_url_hash = (function(str){
+			var i, l, hval = 0x811c9dc5;
+			for (i = 0, l = str.length; i < l; i++) {
+				hval ^= str.charCodeAt(i);
+				hval += (hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) + (hval << 24);
+			}
+			return hval >>> 0;
+		})(location.origin + location.pathname);
+
+	F.State = F.Component.extend(/** @lends FooTable.State */{
+		/**
+		 * The state component adds the ability for the table to remember its basic state for filtering, paging and sorting.
+		 * @constructs
+		 * @extends FooTable.Component
+		 * @param {FooTable.Table} table - The parent {@link FooTable.Table} object for the component.
+		 * @returns {FooTable.State}
+		 */
+		construct: function(table){
+			// call the constructor of the base class
+			this._super(table, table.o.state.enabled);
+			// Change this value if an update to this component requires any stored data to be reset
+			this._key = '1';
+			/**
+			 * The key to use to store the state for this table.
+			 * @type {(null|string)}
+			 */
+			this.key = this._key + (F.is.string(table.o.state.key) ? table.o.state.key : this._uid());
+			/**
+			 * Whether or not to allow the filtering component to store it's state.
+			 * @type {boolean}
+			 */
+			this.filtering = F.is.boolean(table.o.state.filtering) ? table.o.state.filtering : true;
+			/**
+			 * Whether or not to allow the paging component to store it's state.
+			 * @type {boolean}
+			 */
+			this.paging = F.is.boolean(table.o.state.paging) ? table.o.state.paging : true;
+			/**
+			 * Whether or not to allow the sorting component to store it's state.
+			 * @type {boolean}
+			 */
+			this.sorting = F.is.boolean(table.o.state.sorting) ? table.o.state.sorting : true;
+		},
+		/* PROTECTED */
+		/**
+		 * Checks the supplied data and options for the state component.
+		 * @instance
+		 * @protected
+		 * @param {object} data - The jQuery data object from the parent table.
+		 * @fires FooTable.State#"preinit.ft.state"
+		 * @this FooTable.State
+		 */
+		preinit: function(data){
+			var self = this;
+			/**
+			 * The preinit.ft.state event is raised before the UI is created and provides the tables jQuery data object for additional options parsing.
+			 * Calling preventDefault on this event will disable the component.
+			 * @event FooTable.State#"preinit.ft.state"
+			 * @param {jQuery.Event} e - The jQuery.Event object for the event.
+			 * @param {FooTable.Table} ft - The instance of the plugin raising the event.
+			 * @param {object} data - The jQuery data object of the table raising the event.
+			 */
+			this.ft.raise('preinit.ft.state', [data]).then(function(){
+
+				self.enabled = F.is.boolean(data.state)
+					? data.state
+					: self.enabled;
+
+				if (!self.enabled) return;
+
+				self.key = self._key + (F.is.string(data.stateKey) ? data.stateKey : self.key);
+
+				self.filtering = F.is.boolean(data.stateFiltering) ? data.stateFiltering : self.filtering;
+
+				self.paging = F.is.boolean(data.statePaging) ? data.statePaging : self.paging;
+
+				self.sorting = F.is.boolean(data.stateSorting) ? data.stateSorting : self.sorting;
+
+			}, function(){
+				self.enabled = false;
+			});
+		},
+		/**
+		 * Gets the state value for the specified key for this table.
+		 * @instance
+		 * @param {string} key - The key to get the value for.
+		 * @returns {(*|null)}
+		 */
+		get: function(key){
+			return JSON.parse(localStorage.getItem(this.key + ':' + key));
+		},
+		/**
+		 * Sets the state value for the specified key for this table.
+		 * @instance
+		 * @param {string} key - The key to set the value for.
+		 * @param {*} data - The value to store for the key. This value must be JSON.stringify friendly.
+		 */
+		set: function(key, data){
+			localStorage.setItem(this.key + ':' + key, JSON.stringify(data));
+		},
+		/**
+		 * Clears the state value for the specified key for this table.
+		 * @instance
+		 * @param {string} key - The key to clear the value for.
+		 */
+		remove: function(key){
+			localStorage.removeItem(this.key + ':' + key);
+		},
+		/**
+		 * Executes the {@link FooTable.Component#readState} function on all components.
+		 * @instance
+		 */
+		read: function(){
+			this.ft.execute(false, true, 'readState');
+		},
+		/**
+		 * Executes the {@link FooTable.Component#writeState} function on all components.
+		 * @instance
+		 */
+		write: function(){
+			this.ft.execute(false, true, 'writeState');
+		},
+		/**
+		 * Executes the {@link FooTable.Component#clearState} function on all components.
+		 * @instance
+		 */
+		clear: function(){
+			this.ft.execute(false, true, 'clearState');
+		},
+		/**
+		 * Generates a unique identifier for the current {@link FooTable.Table} if one is not supplied through the options.
+		 * This value is a combination of the url hash and either the element ID or an incremented global int value.
+		 * @instance
+		 * @returns {*}
+		 * @private
+		 */
+		_uid: function(){
+			var id = this.ft.$el.attr('id');
+			return _url_hash + '_' + (F.is.string(id) ? id : ++_uid);
+		}
+	});
+
+	F.components.register('state', F.State, 700);
+
+})(jQuery, FooTable);
+(function(F){
+
+	/**
+	 * This method is called from the {@link FooTable.State#read} method and allows a component to retrieve its' stored state.
+	 * @instance
+	 * @protected
+	 * @function
+	 */
+	F.Component.prototype.readState = function(){};
+
+	/**
+	 * This method is called from the {@link FooTable.State#write} method and allows a component to write its' current state to the store.
+	 * @instance
+	 * @protected
+	 * @function
+	 */
+	F.Component.prototype.writeState = function(){};
+
+	/**
+	 * This method is called from the {@link FooTable.State#clear} method and allows a component to clear any stored state.
+	 * @instance
+	 * @protected
+	 * @function
+	 */
+	F.Component.prototype.clearState = function(){};
+
+})(FooTable);
+(function(F){
+
+	/**
+	 * An object containing the state options for the plugin. Added by the {@link FooTable.State} component.
+	 * @type {object}
+	 * @prop {boolean} enabled=false - Whether or not to allow state to be stored for the table. This overrides the individual component enable options.
+	 * @prop {boolean} filtering=true - Whether or not to allow the filtering state to be stored.
+	 * @prop {boolean} paging=true - Whether or not to allow the filtering state to be stored.
+	 * @prop {boolean} sorting=true - Whether or not to allow the filtering state to be stored.
+	 * @prop {string} key=null - The unique key to use to store the table's data.
+	 */
+	F.Defaults.prototype.state = {
+		enabled: false,
+		filtering: true,
+		paging: true,
+		sorting: true,
+		key: null
+	};
+
+})(FooTable);
+(function(F){
+
+	if (!F.Filtering) return;
+
+	/**
+	 * Allows the filtering component to retrieve its' stored state.
+	 */
+	F.Filtering.prototype.readState = function(){
+		if (this.ft.state.filtering){
+			var state = this.ft.state.get('filtering');
+			if (F.is.hash(state) && !F.is.emptyArray(state.filters)){
+				this.filters = this.ensure(state.filters);
+			}
+		}
+	};
+
+	/**
+	 * Allows the filtering component to write its' current state to the store.
+	 */
+	F.Filtering.prototype.writeState = function(){
+		if (this.ft.state.filtering) {
+			var filters = F.arr.map(this.filters, function (f) {
+				return {
+					name: f.name,
+					query: f.query instanceof F.Query ? f.query.val() : f.query,
+					columns: F.arr.map(f.columns, function (c) {
+						return c.name;
+					}),
+					hidden: f.hidden,
+					space: f.space,
+					connectors: f.connectors,
+					ignoreCase: f.ignoreCase
+				};
+			});
+			this.ft.state.set('filtering', {filters: filters});
+		}
+	};
+
+	/**
+	 * Allows the filtering component to clear any stored state.
+	 */
+	F.Filtering.prototype.clearState = function(){
+		if (this.ft.state.filtering) {
+			this.ft.state.remove('filtering');
+		}
+	};
+
+})(FooTable);
+(function(F){
+
+	if (!F.Paging) return;
+
+	/**
+	 * Allows the paging component to retrieve its' stored state.
+	 */
+	F.Paging.prototype.readState = function(){
+		if (this.ft.state.paging) {
+			var state = this.ft.state.get('paging');
+			if (F.is.hash(state)) {
+				this.current = state.current;
+				this.size = state.size;
+			}
+		}
+	};
+
+	/**
+	 * Allows the paging component to write its' current state to the store.
+	 */
+	F.Paging.prototype.writeState = function(){
+		if (this.ft.state.paging) {
+			this.ft.state.set('paging', {
+				current: this.current,
+				size: this.size
+			});
+		}
+	};
+
+	/**
+	 * Allows the paging component to clear any stored state.
+	 */
+	F.Paging.prototype.clearState = function(){
+		if (this.ft.state.paging) {
+			this.ft.state.remove('paging');
+		}
+	};
+
+})(FooTable);
+(function(F){
+
+	if (!F.Sorting) return;
+
+	/**
+	 * Allows the sorting component to retrieve its' stored state.
+	 */
+	F.Sorting.prototype.readState = function(){
+		if (this.ft.state.sorting) {
+			var state = this.ft.state.get('sorting');
+			if (F.is.hash(state)) {
+				var column = this.ft.columns.get(state.column);
+				if (column instanceof F.Column) {
+					this.column = column;
+					this.column.direction = state.direction;
+				}
+			}
+		}
+	};
+
+	/**
+	 * Allows the sorting component to write its' current state to the store.
+	 */
+	F.Sorting.prototype.writeState = function(){
+		if (this.ft.state.sorting && this.column instanceof F.Column){
+			this.ft.state.set('sorting', {
+				column: this.column.name,
+				direction: this.column.direction
+			});
+		}
+	};
+
+	/**
+	 * Allows the sorting component to clear any stored state.
+	 */
+	F.Sorting.prototype.clearState = function(){
+		if (this.ft.state.sorting) {
+			this.ft.state.remove('sorting');
+		}
+	};
+
+})(FooTable);
+(function(F){
+
+	// hook into the _construct method so we can add the state property to the table.
+	F.Table.extend('_construct', function(ready){
+		this.state = this.use(FooTable.State);
+		this._super(ready);
+	});
+
+	// hook into the _preinit method so we can trigger a plugin wide read state operation.
+	F.Table.extend('_preinit', function(){
+		var self = this;
+		return self._super().then(function(){
+			if (self.state.enabled){
+				self.state.read();
+			}
+		});
+	});
+
+	// hook into the draw method so we can trigger a plugin wide write state operation.
+	F.Table.extend('draw', function(){
+		var self = this;
+		return self._super().then(function(){
+			if (self.state.enabled){
+				self.state.write();
+			}
+		});
+	});
+
+})(FooTable);

admin/custom/footable3/js/footable.state.min.js

@@ -0,0 +1,8 @@
+/*
+* FooTable v3 - FooTable is a jQuery plugin that aims to make HTML tables on smaller devices look awesome.
+* @version 3.1.4
+* @link http://fooplugins.com
+* @copyright Steven Usher & Brad Vincent 2015
+* @license Released under the GPLv3 license.
+*/
+!function(a,b){var c=0,d=function(a){var b,c,d=2166136261;for(b=0,c=a.length;c>b;b++)d^=a.charCodeAt(b),d+=(d<<1)+(d<<4)+(d<<7)+(d<<8)+(d<<24);return d>>>0}(location.origin+location.pathname);b.State=b.Component.extend({construct:function(a){this._super(a,a.o.state.enabled),this._key="1",this.key=this._key+(b.is.string(a.o.state.key)?a.o.state.key:this._uid()),this.filtering=b.is["boolean"](a.o.state.filtering)?a.o.state.filtering:!0,this.paging=b.is["boolean"](a.o.state.paging)?a.o.state.paging:!0,this.sorting=b.is["boolean"](a.o.state.sorting)?a.o.state.sorting:!0},preinit:function(a){var c=this;this.ft.raise("preinit.ft.state",[a]).then(function(){c.enabled=b.is["boolean"](a.state)?a.state:c.enabled,c.enabled&&(c.key=c._key+(b.is.string(a.stateKey)?a.stateKey:c.key),c.filtering=b.is["boolean"](a.stateFiltering)?a.stateFiltering:c.filtering,c.paging=b.is["boolean"](a.statePaging)?a.statePaging:c.paging,c.sorting=b.is["boolean"](a.stateSorting)?a.stateSorting:c.sorting)},function(){c.enabled=!1})},get:function(a){return JSON.parse(localStorage.getItem(this.key+":"+a))},set:function(a,b){localStorage.setItem(this.key+":"+a,JSON.stringify(b))},remove:function(a){localStorage.removeItem(this.key+":"+a)},read:function(){this.ft.execute(!1,!0,"readState")},write:function(){this.ft.execute(!1,!0,"writeState")},clear:function(){this.ft.execute(!1,!0,"clearState")},_uid:function(){var a=this.ft.$el.attr("id");return d+"_"+(b.is.string(a)?a:++c)}}),b.components.register("state",b.State,700)}(jQuery,FooTable),function(a){a.Component.prototype.readState=function(){},a.Component.prototype.writeState=function(){},a.Component.prototype.clearState=function(){}}(FooTable),function(a){a.Defaults.prototype.state={enabled:!1,filtering:!0,paging:!0,sorting:!0,key:null}}(FooTable),function(a){a.Filtering&&(a.Filtering.prototype.readState=function(){if(this.ft.state.filtering){var b=this.ft.state.get("filtering");a.is.hash(b)&&!a.is.emptyArray(b.filters)&&(this.filters=this.ensure(b.filters))}},a.Filtering.prototype.writeState=function(){if(this.ft.state.filtering){var b=a.arr.map(this.filters,function(b){return{name:b.name,query:b.query instanceof a.Query?b.query.val():b.query,columns:a.arr.map(b.columns,function(a){return a.name}),hidden:b.hidden,space:b.space,connectors:b.connectors,ignoreCase:b.ignoreCase}});this.ft.state.set("filtering",{filters:b})}},a.Filtering.prototype.clearState=function(){this.ft.state.filtering&&this.ft.state.remove("filtering")})}(FooTable),function(a){a.Paging&&(a.Paging.prototype.readState=function(){if(this.ft.state.paging){var b=this.ft.state.get("paging");a.is.hash(b)&&(this.current=b.current,this.size=b.size)}},a.Paging.prototype.writeState=function(){this.ft.state.paging&&this.ft.state.set("paging",{current:this.current,size:this.size})},a.Paging.prototype.clearState=function(){this.ft.state.paging&&this.ft.state.remove("paging")})}(FooTable),function(a){a.Sorting&&(a.Sorting.prototype.readState=function(){if(this.ft.state.sorting){var b=this.ft.state.get("sorting");if(a.is.hash(b)){var c=this.ft.columns.get(b.column);c instanceof a.Column&&(this.column=c,this.column.direction=b.direction)}}},a.Sorting.prototype.writeState=function(){this.ft.state.sorting&&this.column instanceof a.Column&&this.ft.state.set("sorting",{column:this.column.name,direction:this.column.direction})},a.Sorting.prototype.clearState=function(){this.ft.state.sorting&&this.ft.state.remove("sorting")})}(FooTable),function(a){a.Table.extend("_construct",function(a){this.state=this.use(FooTable.State),this._super(a)}),a.Table.extend("_preinit",function(){var a=this;return a._super().then(function(){a.state.enabled&&a.state.read()})}),a.Table.extend("draw",function(){var a=this;return a._super().then(function(){a.state.enabled&&a.state.write()})})}(FooTable);

admin/helpers/compiler.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -41,17 +41,29 @@ class Compiler extends Infusion
 	 */
 	private $tempPath;
 	
+	/*
+	 * The timer
+	 * 
+	 * @var      string
+	 */
+	private $time_start;
+	private $time_end;
+	public  $secondsCompiled;
+	
 	public $filepath		= '';
 	// fixed pathes
 	protected $dynamicIntegration	= false;
 	protected $backupPath		= false;
 	protected $gitPath		= false;
+	protected $addCustomCodeAt	= array();
 
 	/**
 	 * Constructor
 	 */
 	public function __construct($config = array ())
 	{
+		// to check the compiler speed
+		$this->time_start = microtime(true);
 		// first we run the perent constructor
 		if (parent::__construct($config))
 		{
@@ -86,34 +98,27 @@ class Compiler extends Infusion
 			{
 				return false;
 			}
-			// we can remove all undeeded data
-			$this->freeMemory();
-			// check if this component is install on the current website
-			if ($paths = $this->getLocalInstallPaths())
-			{
-				// start Automatic import of custom code
-				$userId = JFactory::getUser()->id;
-				$today = JFactory::getDate()->toSql();
-				// Get a db connection.
-				$db = JFactory::getDbo();
-				// get the custom code from installed files
-				$this->customCodeFactory($paths, $db, $userId, $today);
-			}
-			// check if we have custom code to add
-			$this->getCustomCode();
 			// now insert into the new files
-			if (ComponentbuilderHelper::checkArray($this->customCode))
-			{
+			if ($this->getCustomCode())
+			{				
 				$this->addCustomCode();
 			}
+			// set the lang data now
+			$this->setLangFileData();
 			// move the update server into place
 			$this->setUpdateServer();
+			// build read me
+			$this->buildReadMe();
 			// zip the component
 			if (!$this->zipComponent())
 			{
-				// done
+				// done with error
 				return false;
 			}
+			// end the timer here
+			$this->time_end = microtime(true);
+			$this->secondsCompiled = $this->time_end - $this->time_start;
+			// completed the compilation
 			return true;
 		}
 		return false;
@@ -145,7 +150,9 @@ class Compiler extends Infusion
 	protected function updateFiles()
 	{
 		if (isset($this->newFiles['static']) && ComponentbuilderHelper::checkArray($this->newFiles['static']) && isset($this->newFiles['dynamic']) && ComponentbuilderHelper::checkArray($this->newFiles['dynamic']))
-		{
+		{			
+			// we don't update lang now since we will still posible add custom code
+			$langCheck = 'en-GB.com_'.$this->fileContentStatic['###component###'].'.';
 			// get the bom file
 			$bom = JFile::read($this->bomPath);
 			// first we do the static files
@@ -153,6 +160,12 @@ class Compiler extends Infusion
 			{
 				if (JFile::exists($static['path']))
 				{
+					// skip lang files and store for later
+					if (strpos($static['path'], $langCheck))
+					{
+						$this->langFiles[] = $static;
+						continue;
+					}
 					$this->fileContentStatic['###FILENAME###'] = $static['name'];
 					$php = '';
 					if (ComponentbuilderHelper::checkFileType($static['name'],'php'))
@@ -163,13 +176,14 @@ class Compiler extends Infusion
 					if (strpos($string,'###BOM###') !== false)
 					{
 						list($wast,$code) = explode('###BOM###',$string);
-						$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$php.$bom.$code);
+						$string = $php.$bom.$code;
+						$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
 						// add to zip array
 						$this->writeFile($static['path'],$answer);
 					}
 					else
 					{
-						$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$string);
+						$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
 						// add to zip array
 						$this->writeFile($static['path'],$answer);
 					}
@@ -199,15 +213,16 @@ class Compiler extends Infusion
 								if (strpos($string,'###BOM###') !== false)
 								{
 									list($bin,$code) = explode('###BOM###',$string);
-									$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$php.$bom.$code);
-									$answer = str_replace(array_keys($this->fileContentDynamic[$view]),array_values($this->fileContentDynamic[$view]),$answer);
+									$string = $php.$bom.$code;
+									$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
+									$answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3);
 									// add to zip array
 									$this->writeFile($file['path'],$answer);
 								}
 								else
 								{
-									$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$string);
-									$answer = str_replace(array_keys($this->fileContentDynamic[$view]),array_values($this->fileContentDynamic[$view]),$answer);
+									$answer = $this->setPlaceholders($string, $this->fileContentStatic, 3);
+									$answer = $this->setPlaceholders($answer, $this->fileContentDynamic[$view], 3);
 									// add to zip array
 									$this->writeFile($file['path'],$answer);
 								}
@@ -221,97 +236,11 @@ class Compiler extends Infusion
 			}
 			// free up some memory
 			unset($this->newFiles['dynamic']);
-			// do a final run to update the readme file
-			$two = 0;
-			foreach ($this->newFiles['static'] as $static)
-			{
-				if (('README.md' == $static['name'] || 'README.txt' == $static['name']) && $this->componentData->addreadme && JFile::exists($static['path']))
-				{
-					$this->buildReadMe($static['path']);
-					$two++;
-				}
-				if ($two == 2)
-				{
-					break;
-				}
-			}
 			return true;
 		}
 		return false;
 	}
 	
-	protected function freeMemory()
-	{		
-		// free up some memory
-		unset($this->newFiles['static']);
-		unset($this->customScriptBuilder);
-		unset($this->permissionCore);
-		unset($this->permissionDashboard);
-		unset($this->componentData->admin_views);
-		unset($this->componentData->site_views);
-		unset($this->componentData->custom_admin_views);
-		unset($this->componentData->config);
-		unset($this->joomlaVersionData);
-		unset($this->langContent);
-		unset($this->dbKeys);
-		unset($this->permissionBuilder);
-		unset($this->layoutBuilder);
-		unset($this->historyBuilder);
-		unset($this->aliasBuilder);
-		unset($this->titleBuilder);
-		unset($this->customBuilderList);
-		unset($this->hiddenFieldsBuilder);
-		unset($this->intFieldsBuilder);
-		unset($this->dynamicfieldsBuilder);
-		unset($this->maintextBuilder);
-		unset($this->customFieldLinksBuilder);
-		unset($this->setScriptUserSwitch);
-		unset($this->categoryBuilder);
-		unset($this->catCodeBuilder);
-		unset($this->checkboxBuilder);
-		unset($this->jsonItemBuilder);
-		unset($this->base64Builder);
-		unset($this->basicEncryptionBuilder);
-		unset($this->advancedEncryptionBuilder);
-		unset($this->getItemsMethodListStringFixBuilder);
-		unset($this->getItemsMethodEximportStringFixBuilder);
-		unset($this->selectionTranslationFixBuilder);
-		unset($this->listBuilder);
-		unset($this->customBuilder);
-		unset($this->editBodyViewScriptBuilder);
-		unset($this->queryBuilder);
-		unset($this->sortBuilder);
-		unset($this->searchBuilder);
-		unset($this->filterBuilder);
-		unset($this->fieldsNames);
-		unset($this->siteFields);
-		unset($this->siteFieldData);
-		unset($this->customFieldScript);
-		unset($this->configFieldSets);
-		unset($this->jsonStringBuilder);
-		unset($this->importCustomScripts);
-		unset($this->eximportView);
-		unset($this->uninstallBuilder);
-		unset($this->listColnrBuilder);
-		unset($this->customFieldBuilder);
-		unset($this->permissionFields);
-		unset($this->getAsLookup);
-		unset($this->secondRunAdmin);
-		unset($this->uninstallScriptBuilder);
-		unset($this->buildCategories);
-		unset($this->iconBuilder);
-		unset($this->validationFixBuilder);
-		unset($this->targetRelationControl);
-		unset($this->targetControlsScriptChecker);
-		unset($this->accessBuilder);
-		unset($this->tabCounter);
-		unset($this->linkedAdminViews);
-		unset($this->uniquekeys);
-		unset($this->uniquecodes);
-		$this->unsetNow('_adminViewData');
-		$this->unsetNow('_fieldData');
-	}
-	
 	/**
 	 * move the local update server xml file to a remote ftp server
 	 * 
@@ -345,12 +274,12 @@ 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
-		if (isset($data['config']) && ComponentbuilderHelper::checkArray($data['config']))
+		// check if these files have its own config data)
+		if (isset($data['config']) && ComponentbuilderHelper::checkArray($data['config']) && (!isset($this->componentData->mvc_versiondate) || $this->componentData->mvc_versiondate == 1))
 		{
 			foreach ($data['config'] as $key => $value)
 			{
-				if ('###VERSION###' == $key)
+				if ('###VERSION###' === $key)
 				{
 					// hmm we sould in some way make it known that this version number
 					// is not in relation the the project but to the file only... any ideas?
@@ -374,7 +303,26 @@ class Compiler extends Infusion
 		$this->fileContentStatic['###VERSION###'] = $this->fileContentStatic['###VERSION###GLOBAL'];
 	}
 	
-	private function buildReadMe($path)
+	private function buildReadMe()
+	{
+		// do a final run to update the readme file
+		$two = 0;
+		foreach ($this->newFiles['static'] as $static)
+		{
+			if (('README.md' === $static['name'] || 'README.txt' === $static['name']) && $this->componentData->addreadme && JFile::exists($static['path']))
+			{
+				$this->setReadMe($static['path']);
+				$two++;
+			}
+			if ($two == 2)
+			{
+				break;
+			}
+		}
+		unset($this->newFiles['static']);
+	}
+	
+	private function setReadMe($path)
 	{
 		// set readme data if not set already
 		if (!isset($this->fileContentStatic['###LINE_COUNT###']) || $this->fileContentStatic['###LINE_COUNT###'] != $this->lineCount)
@@ -384,7 +332,7 @@ class Compiler extends Infusion
 		// get the file
 		$string = JFile::read($path);
 		// update the file
-		$answer = str_replace(array_keys($this->fileContentStatic),array_values($this->fileContentStatic),$string);
+		$answer = $this->setPlaceholders($string, $this->fileContentStatic);
 		// add to zip array
 		$this->writeFile($path,$answer);
 	}	
@@ -563,11 +511,11 @@ class Compiler extends Infusion
 				{
 					foreach ($options as $option => $value)
 					{
-						if ('timeout' == $option)
+						if ('timeout' === $option)
 						{
 							$options[$option] = (int) $value;
 						}
-						if ('type' == $option)
+						if ('type' === $option)
 						{
 							$options[$option] = (string) $value;
 						}
@@ -591,6 +539,11 @@ class Compiler extends Infusion
 	
 	protected function addCustomCode()
 	{
+		// load error messages incase code can not be added
+		$app = JFactory::getApplication();
+		// reset all these
+		$this->clearFromPlaceHolders('view');
+		$this->clearFromPlaceHolders('arg');
 		foreach($this->customCode as $nr => $target)
 		{
 			// reset each time per custom code
@@ -605,6 +558,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)
 				{
@@ -619,18 +573,20 @@ class Compiler extends Infusion
 					$foundEnd	= true;
 				}
 				$counter	= 0;
-				// check if file is new structure			
+				// check if file exist			
 				if (JFile::exists($file))
 				{
 					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 +605,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);
@@ -680,8 +637,8 @@ class Compiler extends Infusion
 					}
 					if ($found)
 					{
-						$placeholder	= $this->getPlaceHolder($target['type'], $target['id']);
-						$data		= $placeholder['start'] . "\n" . $target['code'] . $placeholder['end'] . "\n";
+						$placeholder	= $this->getPlaceHolder((int) $target['comment_type'].$target['type'], $target['id']);
+						$data		= $placeholder['start'] . PHP_EOL . $this->setPlaceholders($target['code'], $this->placeholders). $placeholder['end'] . PHP_EOL;
 						if ($target['type'] == 2)
 						{
 							// found it now add code from the next line
@@ -694,42 +651,77 @@ class Compiler extends Infusion
 						}
 						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 <b>line %s</b>. 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 <b>line %s</b>. 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(PHP_EOL, $target['code']);
+		$code = PHP_EOL."// " .implode(PHP_EOL."// ",$code). PHP_EOL;
+		// get place holders
+		$placeholder	= $this->getPlaceHolder((int) $target['comment_type'].$target['type'], $target['id']);
+		// build the data
+		$data		= $placeholder['start'] . $code . $placeholder['end']. PHP_EOL;
+		// 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)
 	{
+		// start the process
 		$fpFile = fopen($file, "rw+");
 		$fpTemp = fopen('php://temp', "rw+");
-
-		$len = stream_copy_to_stream($fpFile, $fpTemp); // make a copy
-
-		fseek($fpFile, $position); // move to the position
+		// make a copy of the file
+		stream_copy_to_stream($fpFile, $fpTemp);
+		// move to the position where we should add the data
+		fseek($fpFile, $position);
+		// Add the data
+		fwrite($fpFile, $data);
+		// truncate file at the end of the data that was added
+		$remove = bcadd($position, mb_strlen($data, '8bit'));
+		ftruncate($fpFile, $remove);
+		// check if this was a replacement of data
 		if ($replace)
 		{
 			$position = bcadd($position, $replace);
 		}
-		fseek($fpTemp, $position); // move to the position
-
-		fwrite($fpFile, $data); // Add the data
-
+		// move to the position of the data that should remain below the new data
+		fseek($fpTemp, $position);
+		// copy that remaining data to the file
 		stream_copy_to_stream($fpTemp, $fpFile); // @Jack
-
-		fclose($fpFile); // close file
-		fclose($fpTemp); // close tmp
+		// done close both files
+		fclose($fpFile);
+		fclose($fpTemp);
+		
+		// any help to improve this is welcome...
 	}
 }

admin/helpers/compiler/b_Structure.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -448,24 +448,25 @@ class Structure extends Get
 			{
 				if (ComponentbuilderHelper::checkObject($view['settings']))
 				{
+					$created = $this->getCreatedDate($view);
 					$modified = $this->getLastModifiedDate($view);
 					if ($view['settings']->name_list != 'null')
 					{
 						$target = array('admin' => $view['settings']->name_list);
-						$config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 						$this->buildDynamique($target,'list', false, $config);
 					}
 					if ($view['settings']->name_single != 'null')
 					{
 						$target = array('admin' => $view['settings']->name_single);
-						$config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 						$this->buildDynamique($target,'single', false, $config);
 					}
 					if($view['edit_create_site_view'])
 					{
 						// setup the front site edit-view files
 						$target = array('site' => $view['settings']->name_single);
-						$config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+						$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 						$this->buildDynamique($target,'edit', false, $config);
 					}
 				}
@@ -483,19 +484,20 @@ class Structure extends Get
 
 			foreach ($this->componentData->site_views as $nr => $view)
 			{
+				$created = $this->getCreatedDate($view);
 				$modified = $this->getLastModifiedDate($view);
 				if ($view['settings']->main_get->gettype == 2)
 				{
 					// set list view
 					$target = array('site' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 					$this->buildDynamique($target,'list', false, $config);
 				}
 				elseif ($view['settings']->main_get->gettype == 1)
 				{
 					// set single view
 					$target = array('site' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 					$this->buildDynamique($target,'single', false, $config);
 				}
 			}
@@ -505,19 +507,20 @@ class Structure extends Get
 		{
 			foreach ($this->componentData->custom_admin_views as $nr => $view)
 			{
+				$created = $this->getCreatedDate($view);
 				$modified = $this->getLastModifiedDate($view);
 				if ($view['settings']->main_get->gettype == 2)
 				{
-					// set list view
+					// set list view$view
 					$target = array('custom_admin' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => JFactory::getDate($view['settings']->modified)->format('jS F, Y'),'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 					$this->buildDynamique($target,'list', false, $config);
 				}
 				elseif ($view['settings']->main_get->gettype == 1)
 				{
 					// set single view
 					$target = array('custom_admin' => $view['settings']->code);
-					$config = array('###CREATIONDATE###' => JFactory::getDate($view['settings']->created)->format('jS F, Y'), '###BUILDDATE###' => JFactory::getDate($view['settings']->modified)->format('jS F, Y'),'###VERSION###' => $view['settings']->version);
+					$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified,'###VERSION###' => $view['settings']->version);
 					$this->buildDynamique($target, 'single', false, $config);
 				}
 			}
@@ -531,6 +534,29 @@ class Structure extends Get
 		return false;
 	}
 	
+	/**
+	 * get the created date of the (view)
+	 *  
+	 * @param   array   $view  The view values
+	 * 
+	 * @return  string Last Modified Date
+	 * 
+	 */
+	public function getCreatedDate($view)
+	{		
+		if (isset($view['settings']->created) && ComponentbuilderHelper::checkString($view['settings']->created))
+		{
+			// first set the main date
+			$date = strtotime($view['settings']->created);
+		}
+		else
+		{
+			// first set the main date
+			$date = strtotime("now");
+		}
+		return JFactory::getDate($date)->format('jS F, Y');
+	}
+	
 	/**
 	 * get the last modified date of a MVC (view)
 	 *  
@@ -541,8 +567,16 @@ class Structure extends Get
 	 */
 	public function getLastModifiedDate($view)
 	{
-		// first set the main date
-		$date = strtotime($view['settings']->modified);
+		if (isset($view['settings']->modified) && ComponentbuilderHelper::checkString($view['settings']->modified))
+		{
+			// first set the main date
+			$date = strtotime($view['settings']->modified);
+		}
+		else
+		{
+			// first set the main date
+			$date = strtotime("now");
+		}
 		if (isset($view['adminview']))
 		{
 			$id = $view['adminview'].'admin';
@@ -777,7 +811,7 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'media')
 				{
-					$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= "\n\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_MEDIA_FOLDERS###'] .= PHP_EOL."\t\t<folder>".$lastFolder."</folder>";
 				}
 				// check if we sould add it to the site xml list
 				if (!isset($this->fileContentStatic['###EXSTRA_SITE_FOLDERS###']))
@@ -786,7 +820,7 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'site')
 				{
-					$this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= "\n\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_SITE_FOLDERS###'] .= PHP_EOL."\t\t<folder>".$lastFolder."</folder>";
 				}
 				// check if we sould add it to the admin xml list
 				if (!isset($this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###']))
@@ -795,7 +829,7 @@ class Structure extends Get
 				}
 				if (count($pathArray) == 1 && $firstFolder === 'admin')
 				{
-					$this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= "\n\t\t\t<folder>".$lastFolder."</folder>";
+					$this->fileContentStatic['###EXSTRA_ADMIN_FOLDERS###'] .= PHP_EOL."\t\t\t<folder>".$lastFolder."</folder>";
 				}
 				// make we have not duplicates
 				$key_pointer = ComponentbuilderHelper::safeString($custom['folder']).'_f'.$pointer_tracker;
@@ -935,38 +969,4 @@ class Structure extends Get
 		}
 		return false;
 	}
-	
-	/**
-	 * get the local installed path of this component
-	 *
-	 * @return  array   of paths on success
-	 * 
-	 */
-	public function getLocalInstallPaths()
-	{
-		// set the local paths to search
-		$localPaths = array();
-		// the admin path
-		$localPaths['admin'] = JPATH_ADMINISTRATOR . '/components/com_'. $this->componentCodeName;
-		// only check for site path if the component has a site area!
-		if (!$this->removeSiteFolder)
-		{
-			$localPaths['site'] = JPATH_ROOT . '/components/com_'. $this->componentCodeName;
-		}
-		// TODO later to include the JS and CSS
-		// $localPaths['media'] = JPATH_ROOT . '/media/com_'. $this->fileContentStatic['###component###'];
-		// check if the local install is found
-		foreach ($localPaths as $key => $localPath)
-		{
-			if (!JFolder::exists($localPath))
-			{
-				unset($localPaths[$key]);
-			}
-		}
-		if (ComponentbuilderHelper::checkArray($localPaths))
-		{
-			return $localPaths;
-		}
-		return false;
-	}
 }

admin/helpers/compiler/c_Fields.php

@@ -11,7 +11,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -382,7 +382,7 @@ class Fields extends Structure
 			$readOnly = "";
 			if ($view['settings']->type == 2)
 			{
-				$readOnly = "\t\t\t" . 'readonly="true"' . "\n\t\t\t" . 'disabled="true"';
+				$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');
@@ -601,7 +601,7 @@ class Fields extends Structure
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
 			{
-				$fieldSet[] = "\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
+				$fieldSet[] = PHP_EOL."\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
 				$fieldSet[] = "\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
 				$fieldSet[] = "\t\t" . '<fieldset name="vdmmetadata"';
 				$fieldSet[] = "\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
@@ -634,7 +634,7 @@ class Fields extends Structure
 				$fieldSet[] = "\t</fields>";
 			}
 			// retunr the set
-			return implode("\n", $fieldSet);
+			return implode(PHP_EOL, $fieldSet);
 		}
 		return '';
 	}
@@ -797,14 +797,14 @@ class Fields extends Structure
 		if ($setType === 'option')
 		{
 			// now add to the field set
-			$fieldSet .= "\n\t" . $taber . "\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
-			$fieldSet .= "\n\t" . $taber . "\t<field";
+			$fieldSet .= PHP_EOL."\t" . $taber . "\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+			$fieldSet .= PHP_EOL."\t" . $taber . "\t<field";
 			$optionSet = '';
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
 				{
-					$fieldSet .= "\n\t\t" . $taber . "\t" . $property . '="' . $value . '"';
+					$fieldSet .= PHP_EOL."\t\t" . $taber . "\t" . $property . '="' . $value . '"';
 				}
 				elseif ($property === 'option')
 				{
@@ -823,7 +823,7 @@ class Fields extends Structure
 								// add to lang array
 								$this->langContent[$this->lang][$langValue] = $t;
 								// no add to option set
-								$optionSet .= "\n\t" . $taber . "\t\t" . '<option value="' . $v . '">' . "\n\t" . $taber . "\t\t\t" . $langValue . '</option>';
+								$optionSet .= PHP_EOL."\t" . $taber . "\t\t" . '<option value="' . $v . '">' . PHP_EOL."\t" . $taber . "\t\t\t" . $langValue . '</option>';
 								$optionArray[$v] = $langValue;
 							}
 							else
@@ -833,7 +833,7 @@ class Fields extends Structure
 								// add to lang array
 								$this->langContent[$this->lang][$langValue] = $option;
 								// no add to option set
-								$optionSet .= "\n\t\t" . $taber . "\t" . '<option value="' . $option . '">' . "\n\t\t" . $taber . "\t\t" . $langValue . '</option>';
+								$optionSet .= PHP_EOL."\t\t" . $taber . "\t" . '<option value="' . $option . '">' . PHP_EOL."\t\t" . $taber . "\t\t" . $langValue . '</option>';
 								$optionArray[$option] = $langValue;
 							}
 						}
@@ -849,7 +849,7 @@ class Fields extends Structure
 							// add to lang array
 							$this->langContent[$this->lang][$langValue] = $t;
 							// no add to option set
-							$optionSet .= "\n\t\t" . $taber . "\t" . '<option value="' . $v . '">' . "\n\t\t" . $taber . "\t\t" . $langValue . '</option>';
+							$optionSet .= PHP_EOL."\t\t" . $taber . "\t" . '<option value="' . $v . '">' . PHP_EOL."\t\t" . $taber . "\t\t" . $langValue . '</option>';
 							$optionArray[$v] = $langValue;
 						}
 						else
@@ -859,7 +859,7 @@ class Fields extends Structure
 							// add to lang array
 							$this->langContent[$this->lang][$langValue] = $value;
 							// no add to option set
-							$optionSet .= "\n\t\t" . $taber . "\t" . '<option value="' . $value . '">' . "\n\t\t" . $taber . "\t\t" . $langValue . '</option>';
+							$optionSet .= PHP_EOL."\t\t" . $taber . "\t" . '<option value="' . $value . '">' . PHP_EOL."\t\t" . $taber . "\t\t" . $langValue . '</option>';
 							$optionArray[$value] = $langValue;
 						}
 					}
@@ -868,41 +868,41 @@ class Fields extends Structure
 			if (ComponentbuilderHelper::checkString($optionSet))
 			{
 				$fieldSet .= '>';
-				$fieldSet .= "\n\t\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " Option Set. -->";
+				$fieldSet .= PHP_EOL."\t\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " Option Set. -->";
 				$fieldSet .= $optionSet;
-				$fieldSet .= "\n\t\t" . $taber . "</field>";
+				$fieldSet .= PHP_EOL."\t\t" . $taber . "</field>";
 			}
 			elseif ($typeName === 'sql')
 			{
 				$optionArray = false;
-				$fieldSet .= "\n\t\t" . $taber . "/>";
+				$fieldSet .= PHP_EOL."\t\t" . $taber . "/>";
 			}
 			else
 			{
 				$optionArray = false;
-				$fieldSet .= "\n\t\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->";
-				$fieldSet .= "\n\t\t" . $taber . "/>";
+				$fieldSet .= PHP_EOL."\t\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " No Manual Options Were Added In Field Settings. -->";
+				$fieldSet .= PHP_EOL."\t\t" . $taber . "/>";
 			}
 		}
 		elseif ($setType === 'plain')
 		{
 			// now add to the field set
-			$fieldSet .= "\n\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
-			$fieldSet .= "\n\t\t" . $taber . "<field";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
 				{
-					$fieldSet .= "\n\t\t" . $taber . "\t" . $property . '="' . $value . '"';
+					$fieldSet .= PHP_EOL."\t\t" . $taber . "\t" . $property . '="' . $value . '"';
 				}
 			}
-			$fieldSet .= "\n\t\t" . $taber . "/>";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "/>";
 		}
 		elseif ($setType === 'spacer')
 		{
 			// now add to the field set
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
+			$fieldSet .= PHP_EOL."\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->";
+			$fieldSet .= PHP_EOL."\t\t<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
@@ -918,19 +918,19 @@ class Fields extends Structure
 			if ($typeName === 'repeatable')
 			{
 				// now add to the field set
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
-				$fieldSet .= "\n\t\t<field";
+				$fieldSet .= PHP_EOL."\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+				$fieldSet .= PHP_EOL."\t\t<field";
 				$fieldsSet = array();
 				foreach ($fieldAttributes as $property => $value)
 				{
 					if ($property != 'fields')
 					{
-						$fieldSet .= "\n\t\t\t" . $property . '="' . $value . '"';
+						$fieldSet .= PHP_EOL."\t\t\t" . $property . '="' . $value . '"';
 					}
 				}
 				$fieldSet .= ">";
-				$fieldSet .= "\n\t\t\t" . '<fields name="' . $fieldAttributes['name'] . '_fields" label="">';
-				$fieldSet .= "\n\t\t\t\t" . '<fieldset hidden="true" name="' . $fieldAttributes['name'] . '_modal" repeat="true">';
+				$fieldSet .= PHP_EOL."\t\t\t" . '<fields name="' . $fieldAttributes['name'] . '_fields" label="">';
+				$fieldSet .= PHP_EOL."\t\t\t\t" . '<fieldset hidden="true" name="' . $fieldAttributes['name'] . '_modal" repeat="true">';
 				if (strpos($fieldAttributes['fields'], ',') !== false)
 				{
 					// mulitpal fields
@@ -999,26 +999,26 @@ class Fields extends Structure
 						}
 					}
 				}
-				$fieldSet .= "\n\t\t\t\t</fieldset>";
-				$fieldSet .= "\n\t\t\t</fields>";
-				$fieldSet .= "\n\t\t</field>";
+				$fieldSet .= PHP_EOL."\t\t\t\t</fieldset>";
+				$fieldSet .= PHP_EOL."\t\t\t</fields>";
+				$fieldSet .= PHP_EOL."\t\t</field>";
 			}
 		}
 		elseif ($setType === 'custom')
 		{
 			// now add to the field set
-			$fieldSet .= "\n\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->";
-			$fieldSet .= "\n\t\t" . $taber . "<field";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
 				{
-					$fieldSet .= "\n\t\t" . $taber . "\t" . $property . '="' . $value . '"';
+					$fieldSet .= PHP_EOL."\t\t" . $taber . "\t" . $property . '="' . $value . '"';
 				}
 			}
-			$fieldSet .= "\n\t\t" . $taber . "/>";
+			$fieldSet .= PHP_EOL."\t\t" . $taber . "/>";
 			// incase the field is in the config and has not been set
-			if ('config' == $viewName && 'configs' == $listViewName)
+			if ('config' === $viewName && 'configs' === $listViewName)
 			{
 				// set lang (just incase)
 				$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
@@ -1276,7 +1276,7 @@ class Fields extends Structure
 				{
 					$xmlValue = ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
 					// replace the placeholders
-					$xmlValue = str_replace(array_keys($placeholders), array_values($placeholders), $xmlValue);
+					$xmlValue = $this->setPlaceholders($xmlValue, $placeholders);
 				}
 				elseif (strpos($property['name'], 'type_php_') !== false && $setCustom)
 				{
@@ -1312,14 +1312,14 @@ class Fields extends Structure
 					// load the component name
 					$fieldAttributes['custom']['component'] = ComponentbuilderHelper::getBetween($field['settings']->xml, 'component="', '"');
 					// replace the placeholders
-					$fieldAttributes['custom']['component'] = str_replace(array_keys($placeholders), array_values($placeholders), $fieldAttributes['custom']['component']);
+					$fieldAttributes['custom']['component'] = $this->setPlaceholders($fieldAttributes['custom']['component'], $placeholders);
 				}
 				elseif ($property['name'] === 'table' && $setCustom)
 				{
 					// load the main table that is queried
 					$fieldAttributes['custom']['table'] = ComponentbuilderHelper::getBetween($field['settings']->xml, 'table="', '"');
 					// replace the placeholders
-					$fieldAttributes['custom']['table'] = str_replace(array_keys($placeholders), array_values($placeholders), $fieldAttributes['custom']['table']);
+					$fieldAttributes['custom']['table'] = $this->setPlaceholders($fieldAttributes['custom']['table'], $placeholders);
 				}
 				elseif ($property['name'] === 'value_field' && $setCustom)
 				{
@@ -1350,7 +1350,7 @@ class Fields extends Structure
 				{
 					$xmlValue = (string) ComponentbuilderHelper::getBetween($field['settings']->xml, $property['name'] . '="', '"');
 					// add the multipal
-					if ('true' == $xmlValue)
+					if ('true' === $xmlValue)
 					{
 						$multiple = true;
 					}
@@ -1382,7 +1382,7 @@ class Fields extends Structure
 				if (ComponentbuilderHelper::checkString($xmlValue) && $property['translatable'] == 1)
 				{
 					// replace placeholders
-					$xmlValue = str_replace(array_keys($placeholders), array_values($placeholders), $xmlValue);
+					$xmlValue = $this->setPlaceholders($xmlValue, $placeholders);
 					// insure custom lables dont get messed up
 					if ($setCustom)
 					{
@@ -1791,7 +1791,7 @@ class Fields extends Structure
 			// set tab and break replacements
 			$tabBreak = array(
 				'\t' => "\t",
-				'\n' => "\n"
+				'\n' => PHP_EOL
 			);
 			// make field dynamic
 			$replace = array(
@@ -1818,16 +1818,16 @@ class Fields extends Structure
 					{
 						if ($line == 1)
 						{
-							$phpCode .= str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+							$phpCode .= $this->setPlaceholders($code, $tabBreak);
 						}
 						else
 						{
-							$phpCode .= "\n\t\t".str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+							$phpCode .= PHP_EOL."\t\t".$this->setPlaceholders($code, $tabBreak);
 						}
 					}
 				}
 				// replace the placholders
-				$phpCode = str_replace(array_keys($replace),array_values($replace),$phpCode);
+				$phpCode = $this->setPlaceholders($phpCode, $replace);
 			}
 			else
 			{
@@ -1851,16 +1851,16 @@ class Fields extends Structure
 						{
 							if ($line == 1)
 							{
-								$phpxCode .= str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+								$phpxCode .= $this->setPlaceholders($code, $tabBreak);
 							}
 							else
 							{
-								$phpxCode .= "\n\t\t".str_replace(array_keys($tabBreak),array_values($tabBreak),$code);
+								$phpxCode .= PHP_EOL."\t\t".$this->setPlaceholders($code, $tabBreak);
 							}
 						}
 					}
 					// replace the placholders
-					$phpxCode = str_replace(array_keys($replace),array_values($replace),$phpxCode);
+					$phpxCode = $this->setPlaceholders($phpxCode, $replace);
 				}
 				else
 				{

admin/helpers/compiler/f_Infusion.php

@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version			2.2.0
+	@version			2.3.0
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -34,6 +34,7 @@ class Infusion extends Interpretation
 
 	public $eximportView = array();
 	public $importCustomScripts = array();
+	public $langFiles = array();
 	public $removeSiteFolder = false;
 
 	/**
@@ -150,15 +151,15 @@ class Infusion extends Interpretation
 			$this->lang = $keepLang;
 			
 			// ###ADMINCSS###
-			$this->fileContentStatic['###ADMINCSS###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_css']);
+			$this->fileContentStatic['###ADMINCSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
 			// ###SITECSS###
-			$this->fileContentStatic['###SITECSS###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_css']);
+			$this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
 
 			// ###CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_admin']);
+			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
 			
 			// ###BOTH_CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_both']);
+			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_both'], $this->placeholders);
 			
 			// ###ADMIN_GLOBAL_EVENT_HELPER###
 			$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = '';
@@ -173,22 +174,22 @@ class Infusion extends Interpretation
 			if ($this->componentData->add_admin_event == 1)
 			{
 				// ###ADMIN_GLOBAL_EVENT###
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = "\n\n".'// Triger the Global Admin Event';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] .= "\n".$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Admin Event';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] .= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 				// ###ADMIN_GLOBAL_EVENT_HELPER###
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = "\n\n\t".'/**';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'*	The Global Admin Event Method.';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'**/';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'public static function globalEvent($document)';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'{';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_admin_event']);
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= "\n\t".'}';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'*	The Global Admin Event Method.';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_admin_event'], $this->placeholders);
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 			}
 			
 			// now load the readme file if needed
 			if ($this->componentData->addreadme == 1)
 			{
-				$this->fileContentStatic['###EXSTRA_ADMIN_FILES###'] .= "\n\t\t\t<filename>README.txt</filename>";
+				$this->fileContentStatic['###EXSTRA_ADMIN_FILES###'] .= PHP_EOL."\t\t\t<filename>README.txt</filename>";
 			}
 			
 			// ###HELPER_CREATEUSER###
@@ -254,6 +255,9 @@ class Infusion extends Interpretation
                                         $this->placeholders['###view###'] = $viewName_single;
                                         $this->placeholders['###VIEW###'] = $viewName_u;
                                         $this->placeholders['###View###'] = $viewName_f;
+                                        $this->placeholders['[[[view]]]'] = $viewName_single;
+                                        $this->placeholders['[[[VIEW]]]'] = $viewName_u;
+                                        $this->placeholders['[[[View]]]'] = $viewName_f;
 
                                         // set license per view if needed
                                         $this->setLockLicensePer($viewName_single, $this->target);
@@ -287,7 +291,7 @@ class Infusion extends Interpretation
                                         {
                                                 // ###DOCUMENT_CUSTOM_PHP### <<<DYNAMIC>>>
                                                 $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] 
-                                                        = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_document'][$viewName_single]);
+                                                        = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['php_document'][$viewName_single], $this->placeholders);
                                                 // clear some memory
                                                 unset($this->customScriptBuilder['php_document'][$viewName_single]);
                                         }
@@ -324,16 +328,16 @@ class Infusion extends Interpretation
                                         $this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = '';
 
                                         // ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, "\n");
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, PHP_EOL);
 
                                         // ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, "\n\n");
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, PHP_EOL.PHP_EOL);
 
                                         // ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, "\n");
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, PHP_EOL);
 
                                         // ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, "\n\n");
+                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, PHP_EOL.PHP_EOL);
 
                                         // ###CHECKBOX_SAVE### <<<DYNAMIC>>>
                                         $this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single);
@@ -342,13 +346,13 @@ class Infusion extends Interpretation
                                         $this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single);
 
                                         // ###POSTSAVEHOOK### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, "\n", null, true, "\n\t\treturn;", "\n\n\t\treturn;");
+                                        $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] = $this->getCustomScriptBuilder('php_postsavehook', $viewName_single, PHP_EOL, null, true, PHP_EOL."\t\treturn;", PHP_EOL.PHP_EOL."\t\treturn;");
 
                                         if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
                                         {
                                                 // ###VIEWCSS### <<<DYNAMIC>>>
                                                 $this->fileContentDynamic[$viewName_single]['###VIEWCSS###']
-                                                        = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_view'][$viewName_single]);
+                                                        = $this->setPlaceholders($this->customScriptBuilder['css_view'][$viewName_single], $this->placeholders);
                                                 // clear some memory
                                                 unset($this->customScriptBuilder['css_view'][$viewName_single]);
                                         }
@@ -387,6 +391,9 @@ class Infusion extends Interpretation
                                         $this->placeholders['###views###'] = $viewName_list;
                                         $this->placeholders['###VIEWS###'] = $viewsName_u;
                                         $this->placeholders['###Views###'] = $viewsName_f;
+                                        $this->placeholders['[[[views]]]'] = $viewName_list;
+                                        $this->placeholders['[[[VIEWS]]]'] = $viewsName_u;
+                                        $this->placeholders['[[[Views]]]'] = $viewsName_f;
 
                                         // set the export/import option
                                         if ($view['port'])
@@ -424,7 +431,7 @@ class Infusion extends Interpretation
                                         $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']);
 
                                         // ###GET_ITEMS_METHOD_AFTER_ALL### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, "\n");
+                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL);
 
                                         // ###SELECTIONTRANSLATIONFIX### <<<DYNAMIC>>>
                                         $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']);
@@ -491,7 +498,7 @@ class Infusion extends Interpretation
                                         {
                                                 // ###VIEWCSS### <<<DYNAMIC>>>
                                                 $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###']
-                                                        = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['css_views'][$viewName_list]);
+                                                        = $this->setPlaceholders($this->customScriptBuilder['css_views'][$viewName_list], $this->placeholders);
                                                 // clear some memory
                                                 unset($this->customScriptBuilder['css_views'][$viewName_list]);
                                         }
@@ -554,7 +561,7 @@ class Infusion extends Interpretation
                                 if ($view['edit_create_site_view'])
                                 {
                                         // add needed router stuff for front edit views
-                                        $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($viewName_single);
+                                        $this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($viewName_single, null, false);
                                         $this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($viewName_single);
                                 }
 
@@ -623,7 +630,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###']
-                                                                = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+                                                                = $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
                                                 }
@@ -641,7 +648,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###']
-                                                                = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+                                                                = $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
                                                 }
@@ -661,7 +668,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###']
-                                                                = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
+                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]);
                                                 }
@@ -676,7 +683,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###']
-                                                                = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
                                                 }
@@ -694,7 +701,7 @@ class Infusion extends Interpretation
                                                 {
                                                         // ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<<DYNAMIC>>>
                                                         $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###']
-                                                                = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+                                                                = PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code], $this->placeholders);
                                                         // clear some memory
                                                         unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
                                                 }
@@ -730,10 +737,10 @@ class Infusion extends Interpretation
                         }
 
                         // ###VIEWARRAY###
-                        $this->fileContentStatic['###VIEWARRAY###'] = "\n".implode(",\n",$viewarray);
+                        $this->fileContentStatic['###VIEWARRAY###'] = PHP_EOL.implode(",".PHP_EOL,$viewarray);
 
                         // ###CUSTOM_ADMIN_EDIT_VIEW_ARRAY###
-                        $this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = "\n".implode(",\n",$site_edit_view_array);
+                        $this->fileContentStatic['###SITE_EDIT_VIEW_ARRAY###'] = PHP_EOL.implode(",".PHP_EOL,$site_edit_view_array);
 
                         // ###MAINMENUS###
                         $this->fileContentStatic['###MAINMENUS###'] = $this->setMainMenus();
@@ -890,7 +897,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_BEFORE_GET_ITEM### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###']
-								= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
+								= $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code], $this->placeholders);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]);
 						}
@@ -908,7 +915,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_AFTER_GET_ITEM### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###']
-								= str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
+								= $this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code], $this->placeholders);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]);
 						}
@@ -930,7 +937,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###']
-								= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
+								= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code], $this->placeholders);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]);
 						}
@@ -948,7 +955,7 @@ class Infusion extends Interpretation
 						{
 							// ###SITE_AFTER_GET_ITEMS### <<<DYNAMIC>>>
 							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###']
-								= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
+								= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code], $this->placeholders);
 							// clear some memory
 							unset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]);
 						}
@@ -986,7 +993,7 @@ class Infusion extends Interpretation
 				}
 				// set site custom script to helper class
 				// ###SITE_CUSTOM_HELPER_SCRIPT###
-				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] = str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_helper_site']);
+				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_site'], $this->placeholders);
 				// ###SITE_GLOBAL_EVENT_HELPER###
 				$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = '';
 				// ###SITE_GLOBAL_EVENT###
@@ -994,16 +1001,16 @@ class Infusion extends Interpretation
 				// now load the data for the global event if needed
 				if ($this->componentData->add_site_event == 1)
 				{
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = "\n\n".'// Triger the Global Site Event';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] .= "\n".$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = PHP_EOL.PHP_EOL.'// Triger the Global Site Event';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] .= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 					// ###SITE_GLOBAL_EVENT_HELPER###
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = "\n\n\t".'/**';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'*	The Global Site Event Method.';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'**/';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'public static function globalEvent($document)';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'{';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['component_php_site_event']);
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= "\n\t".'}';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = PHP_EOL.PHP_EOL."\t".'/**';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'*	The Global Site Event Method.';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'**/';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'public static function globalEvent($document)';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'{';
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL."\t".'}';
 				}
 				// setup the layouts
 				$this->setCustomViewLayouts();
@@ -1013,24 +1020,12 @@ class Infusion extends Interpretation
 				// clear all site folder since none is needed
 				$this->removeSiteFolder = true;
 			}
-			
-			// ###LANG_ADMIN###
-			$this->fileContentStatic['###LANG_ADMIN###'] = $this->setLangAdmin();
-
-			// ###LANG_ADMIN_SYS###
-			$this->fileContentStatic['###LANG_ADMIN_SYS###'] = $this->setLangAdminSys();
-			
-			// ###LANG_SITE###
-			$this->fileContentStatic['###LANG_SITE###'] = $this->setLangSite();
-			
-			// ###LANG_SITE_SYS###
-			$this->fileContentStatic['###LANG_SITE_SYS###'] = $this->setLangSiteSys();
 
 			// ###PREINSTALLSCRIPT###
-			$this->fileContentStatic['###PREINSTALLSCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'install', "\n", null, true);
+			$this->fileContentStatic['###PREINSTALLSCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'install', PHP_EOL, null, true);
 
 			// ###PREUPDATESCRIPT###
-			$this->fileContentStatic['###PREUPDATESCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'update', "\n", null, true);
+			$this->fileContentStatic['###PREUPDATESCRIPT###'] = $this->getCustomScriptBuilder('php_preflight', 'update', PHP_EOL, null, true);
 
 			// ###POSTINSTALLSCRIPT###
 			$this->fileContentStatic['###POSTINSTALLSCRIPT###'] = $this->setPostInstallScript();
@@ -1045,7 +1040,7 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###HELPER_UIKIT###'] = $this->setUikitHelperMethods();
 			
 			// ###CONFIG_FIELDSETS###
-			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode("\n",$this->configFieldSets);
+			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode(PHP_EOL,$this->configFieldSets);
 			
 			// check if this has been set
 			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) || !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))
@@ -1066,5 +1061,41 @@ class Infusion extends Interpretation
 		}
 		return false;
 	}
+	
+	/**
+	 * Build the lang values and insert to fiel
+	 * 
+	 *
+	 * @return  boolean  on success
+	 * 
+	 */
+	
+	public function setLangFileData()
+	{
+		// First we build the strings
+		$lang = array();
+		// ###LANG_ADMIN###
+		$lang['###LANG_ADMIN###'] = $this->setLangAdmin();
+		// ###LANG_ADMIN_SYS###
+		$lang['###LANG_ADMIN_SYS###'] = $this->setLangAdminSys();
+		// ###LANG_SITE###
+		$lang['###LANG_SITE###'] = $this->setLangSite();
+		// ###LANG_SITE_SYS###
+		$lang['###LANG_SITE_SYS###'] = $this->setLangSiteSys();
+		// now we insert the values into the files
+		if (ComponentbuilderHelper::checkArray($this->langFiles))
+		{
+			foreach ($this->langFiles as $file)
+			{
+				$string = JFile::read($file['path']);
+				// load the data
+				$answer = $this->setPlaceholders($string, $lang, 3);
+				// add to zip array
+				$this->writeFile($file['path'],$answer);
+				// set the line counter
+				$this->lineCount = $this->lineCount + substr_count($answer, PHP_EOL);
+			}
+		}
+	}
 
 }

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -1332,55 +1332,67 @@ abstract class ComponentbuilderHelper
 
 	public static function safeString($string, $type = 'L', $spacer = '_')
 	{
-		// remove all numbers and replace with english text version (works well only up to a thousand)
+		// remove all numbers and replace with english text version (works well only up to millions)
                 $string = self::replaceNumbers($string);
-
+		// 0nly continue if we have a string
                 if (self::checkString($string))
                 {
-                        // remove all other characters
-                        $string = trim($string);
-                        $string = preg_replace('/'.$spacer.'+/', ' ', $string);
-                        $string = preg_replace('/\s+/', ' ', $string);
-                        $string = preg_replace("/[^A-Za-z ]/", '', $string);
-                        // return a string with all first letter of each word uppercase(no undersocre)
-                        if ($type == 'W')
-                                    {
-                            return ucwords(strtolower($string));
-                        }
-                        elseif ($type == 'w')
-                        {
-                            return strtolower($string);
-                        }
-                        elseif ($type == 'Ww')
-                        {
-                            return ucfirst(strtolower($string));
-                        }
-                        elseif ($type == 'WW')
-                        {
-                            return strtoupper($string);
-                        }
-                        elseif ($type == 'U')
-                        {
-                                // replace white space with underscore
-                                $string = preg_replace('/\s+/', $spacer, $string);
-                                // return all upper
-                                return strtoupper($string);
-                        }
-                        elseif ($type == 'F')
-                        {
-                                // replace white space with underscore
-                                $string = preg_replace('/\s+/', $spacer, $string);
-                                // return with first caracter to upper
-                                return ucfirst(strtolower($string));
-                        }
-                        elseif ($type == 'L')
+			// remove all other characters
+			$string = trim($string);
+			$string = preg_replace('/'.$spacer.'+/', ' ', $string);
+			$string = preg_replace('/\s+/', ' ', $string);
+			$string = preg_replace("/[^A-Za-z ]/", '', $string);
+			// select final adaptations
+			if ($type === 'L' || $type === 'strtolower')
                         {
                                 // replace white space with underscore
                                 $string = preg_replace('/\s+/', $spacer, $string);
                                 // default is to return lower
                                 return strtolower($string);
                         }
-
+			elseif ($type === 'W')
+			{
+				// return a string with all first letter of each word uppercase(no undersocre)
+				return ucwords(strtolower($string));
+			}
+			elseif ($type === 'w' || $type === 'word')
+			{
+				// return a string with all lowercase(no undersocre)
+				return strtolower($string);
+			}
+			elseif ($type === 'Ww' || $type === 'Word')
+			{
+				// return a string with first letter of the first word uppercase and all the rest lowercase(no undersocre)
+				return ucfirst(strtolower($string));
+			}
+			elseif ($type === 'WW' || $type === 'WORD')
+			{
+				// return a string with all the uppercase(no undersocre)
+				return strtoupper($string);
+			}
+                        elseif ($type === 'U' || $type === 'strtoupper')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return all upper
+                                return strtoupper($string);
+                        }
+                        elseif ($type === 'F' || $type === 'ucfirst')
+                        {
+                                // replace white space with underscore
+                                $string = preg_replace('/\s+/', $spacer, $string);
+                                // return with first caracter to upper
+                                return ucfirst(strtolower($string));
+                        }
+                        elseif ($type === 'cA' || $type === 'cAmel' || $type === 'camelcase')
+			{
+				// convert all words to first letter uppercase
+				$string = ucwords(strtolower($string));
+				// remove white space
+				$string = preg_replace('/\s+/', '', $string);
+				// now return first letter lowercase
+				return lcfirst($string);
+			}
                         // return string
                         return $string;
                 }
@@ -1539,7 +1551,7 @@ abstract class ComponentbuilderHelper
 
 	public static function getCryptKey($type, $default = null)
 	{
-		if ('basic' == $type)
+		if ('basic' === $type)
 		{
 			// Get the global params
 			$params = JComponentHelper::getParams('com_componentbuilder', true);

admin/helpers/headercheck.php

@@ -0,0 +1,85 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.3.4
+	@build			13th February, 2017
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		headercheck.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+class HeaderCheck
+{
+	function js_loaded($script_name)
+	{
+		// UIkit check point
+		if (strpos($script_name,'uikit') !== false)
+		{
+			$app            	= JFactory::getApplication();
+			$getTemplateName  	= $app->getTemplate('template')->template;
+			
+			if (strpos($getTemplateName,'yoo') !== false)
+			{
+				return true;
+			}
+		}
+		
+		$document 	= JFactory::getDocument();
+		$head_data 	= $document->getHeadData();
+		foreach (array_keys($head_data['scripts']) as $script)
+		{
+			if (stristr($script, $script_name))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	function css_loaded($script_name)
+	{
+		// UIkit check point
+		if (strpos($script_name,'uikit') !== false)
+		{
+			$app            	= JFactory::getApplication();
+			$getTemplateName  	= $app->getTemplate('template')->template;
+			
+			if (strpos($getTemplateName,'yoo') !== false)
+			{
+				return true;
+			}
+		}
+		
+		$document 	= JFactory::getDocument();
+		$head_data 	= $document->getHeadData();
+		
+		foreach (array_keys($head_data['styleSheets']) as $script)
+		{
+			if (stristr($script, $script_name))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+}

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -1,4 +1,8 @@
 COM_COMPONENTBUILDER="Component Builder"
+COM_COMPONENTBUILDER_ADD_CORRESPONDING_LINE_NUMBERS_TO_THE_DYNAMIC_COMMENTS_SO_TO_SEE_WHERE_IN_THE_COMPILER_THE_LINES_OF_CODE_WAS_BUILD_THIS_WILL_HELP_IF_YOU_NEED_TO_GET_MORE_TECHNICAL_WITH_AN_ISSUE_ON_GITHUB="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github."
+COM_COMPONENTBUILDER_ADD_CUSTOM_CODE_PLACEHOLDERS="Add Custom Code Placeholders"
+COM_COMPONENTBUILDER_ADD_TO_BACKUP_FOLDER_AMP_SALES_SERVER_LTSMALLGTIF_SETLTSMALLGT="Add to Backup Folder & Sales Server <small>(if set)</small>"
+COM_COMPONENTBUILDER_ADD_TO_GIT_FOLDER="Add to Git Folder"
 COM_COMPONENTBUILDER_ADMIN_VIEW="Admin View"
 COM_COMPONENTBUILDER_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_ACCESS="Admin Views Access"
@@ -683,6 +687,17 @@ COM_COMPONENTBUILDER_AUTHOR="Author"
 COM_COMPONENTBUILDER_A_FEW_CLOSED_ISSUES_FROM_GITHUB_IS_LOADING="A few closed issues from Github is loading"
 COM_COMPONENTBUILDER_A_FEW_OPEN_ISSUES_FROM_GITHUB_IS_LOADING="A few open issues from Github is loading"
 COM_COMPONENTBUILDER_BACK="Back"
+COM_COMPONENTBUILDER_CLEAR_TMP="Clear tmp"
+COM_COMPONENTBUILDER_COMPILER="Compiler"
+COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
+COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler."
+COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
+COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
+COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to update the dashboard list of the Compiler"
+COM_COMPONENTBUILDER_COMPILER_DESC="The compiler"
+COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
+COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to update the submenu of the Compiler"
 COM_COMPONENTBUILDER_COMPONENT="Component"
 COM_COMPONENTBUILDER_COMPONENTS="Components"
 COM_COMPONENTBUILDER_COMPONENTS_BATCH_OPTIONS="Batch process the selected Components"
@@ -771,6 +786,9 @@ COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL="Add Php Preflight Inst
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL="Add PHP Preflight (install)"
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE="Add Php Preflight Update"
 COM_COMPONENTBUILDER_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE_LABEL="Add PHP Preflight (update)"
+COM_COMPONENTBUILDER_COMPONENT_ADD_PLACEHOLDERS="Add Placeholders"
+COM_COMPONENTBUILDER_COMPONENT_ADD_PLACEHOLDERS_DESCRIPTION="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
+COM_COMPONENTBUILDER_COMPONENT_ADD_PLACEHOLDERS_LABEL="Custom Code Placeholders"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SALES_SERVER="Add Sales Server"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SALES_SERVER_LABEL="Add Sales Server"
 COM_COMPONENTBUILDER_COMPONENT_ADD_SITE_EVENT="Add Site Event"
@@ -909,7 +927,7 @@ COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB_LABEL="Dashboard Tabs"
 COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_TAB_SELECT="Add"
 COM_COMPONENTBUILDER_COMPONENT_DATABASE="Database"
 COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR="Debug Linenr"
-COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR_DESCRIPTION="Add corresponding line numbers, so to see where in the compiler the line of code was build."
+COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR_DESCRIPTION="Add corresponding line numbers to the dynamic comments, so to see where in the compiler the lines of code was build. This will help if you need to get more technical with an issue on github."
 COM_COMPONENTBUILDER_COMPONENT_DEBUG_LINENR_LABEL="Debug (line numbers)"
 COM_COMPONENTBUILDER_COMPONENT_DEFAULT_VIEW_DESCRIPTION="Select only one."
 COM_COMPONENTBUILDER_COMPONENT_DEFAULT_VIEW_LABEL="Default View"
@@ -1045,6 +1063,9 @@ COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_DESC="The date this Component was m
 COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_COMPONENT_MOVE="Move"
 COM_COMPONENTBUILDER_COMPONENT_MUSIC="Music"
+COM_COMPONENTBUILDER_COMPONENT_MVC_VERSIONDATE="Mvc Versiondate"
+COM_COMPONENTBUILDER_COMPONENT_MVC_VERSIONDATE_DESCRIPTION="Use the modified date, and version number of the view/fields instead of the global version in related files."
+COM_COMPONENTBUILDER_COMPONENT_MVC_VERSIONDATE_LABEL="Use View Version & Date"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL="MySQL"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_DESCRIPTION="Update Dump"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_HINT="// MySQL for update or blank for none"
@@ -1515,10 +1536,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"
@@ -1567,6 +1584,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"
@@ -1890,6 +1911,9 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_CODE="Code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT="// Custom PHP that will be added to the file."
 COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL="Custom code"
+COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE="Comment Type"
+COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_DESCRIPTION="Select what type of comment is used to mark the placement of this code."
+COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL="Comment Type (used in placeholder)"
 COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT="Component"
 COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL="Component"
 COM_COMPONENTBUILDER_CUSTOM_CODE_CREATED_BY_DESC="The user that created this Custom Code."
@@ -1903,6 +1927,9 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE="From Line"
 COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_DESCRIPTION="The line from where to start adding the code."
 COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_HINT="Only Numbers"
 COM_COMPONENTBUILDER_CUSTOM_CODE_FROM_LINE_LABEL="From Line (Zero based)"
+COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME="Function Name"
+COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_DESCRIPTION="The name for this code snippet"
+COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_LABEL="Function Name"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET="Hashendtarget"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION="The end hash target to help insert the code until the correct place, if the line position change. This hash is the md5 of a few lines below the custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT="autogenerated md5 hash"
@@ -1911,23 +1938,57 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET="Hashtarget"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_DESCRIPTION="The start hash target to help insert the code at the correct place, if the line position change. This hash is the md5 of a few lines above the custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT="autogenerated md5 hash"
 COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_LABEL="Start Hash Target"
+COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION="Hash (automation)"
+COM_COMPONENTBUILDER_CUSTOM_CODE_HTML="HTML"
 COM_COMPONENTBUILDER_CUSTOM_CODE_ID="Id"
 COM_COMPONENTBUILDER_CUSTOM_CODE_INSERTION="Insertion"
+COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL="JCB (manual)"
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_DESC="The last user that modified this Custom Code."
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_BY_LABEL="Modified By"
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_DESC="The date this Custom Code was modified."
 COM_COMPONENTBUILDER_CUSTOM_CODE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_CUSTOM_CODE_NEW="A New Custom Code"
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION="<span id='jcb-placeholder'><code>[save to see placeholder]</code></span><br />You can also pass values to this code like this: <span id='jcb-placeholder-arg'><code>[save to see placeholder trick]</code></span> <br />Those values will be replace placeholders called args. These placeholders are zero based and should look like this: [[[arg0]]], [[[arge1]]] ... as many as you like. If you use 5 args in your code, you must always pass 5 values, since they are zero based your fifth arg will look like this [[[arg4]]]<br />Please note that you can not use this placeholder in other custom code views, but in all other custom code areas in JCB found in other views like the admin, site and custom admin views.<br />Another important note, all code with args will not be reversed updated from the changes in the editor out side of JCB at this time, since that will remove all the arg placeholders this means you will only be able to update the code here in the JCB UI. <br />This note will change once we have resolved these limitations."
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL="You can use this code in any JCB code area, simply add this PlaceHolder."
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION="<div class='span6'><h1>Understand how the placeholders work</h1><h2>Comment Type PHP/JS</h2>
+<p>New Insert Code = <code>/***[INSERT&lt;&gt;$$$$]***/</code> &lt;YOUR CODE HERE&gt; <code>/***[/INSERT&lt;&gt;$$$$]***/</code>
+<br />New Replace Codec= <code>/***[REPLACE&lt;&gt;$$$$]***/</code> &lt;YOUR CODE HERE&gt; <code>/***[/REPLACE&lt;&gt;$$$$]***/</code></p>
+<h3>When JCB adds it back</h3>
+<p>JCB Add Inserted Code = <code>/***[INSERTED$$$$]***//*<span class='placeholder-key-id'>x</span>*/</code> &lt;YOUR CODE HERE&gt; <code>/***[/INSERTED$$$$]***/</code>
+<br />JCB Add Replaced Code = <code>/***[REPLACED$$$$]***//*<span class='placeholder-key-id'>x</span>*/</code> &lt;YOUR CODE HERE&gt; <code>/***[/REPLACED$$$$]***/</code></p>
+<h3>To changing existing custom code</h3>
+<p>Update Inserted Code = <code>/***[INSERTED&lt;&gt;$$$$]***//*<span class='placeholder-key-id'>x</span>*/</code> &lt;YOUR CODE HERE&gt; <code>/***[/INSERTED&lt;&gt;$$$$]***/</code>
+<br />Update Replaced Code = <code>/***[REPLACED&lt;&gt;$$$$]***//*<span class='placeholder-key-id'>x</span>*/</code> &lt;YOUR CODE HERE&gt; <code>/***[/REPLACED&lt;&gt;$$$$]***/</code></p>
+<h2>Comment Type HTML</h2>
+<p>New Insert Code = <code>&lt;!--[INSERT&lt;&gt;$$$$]--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/INSERT&lt;&gt;$$$$]--&gt;</code>
+<br />New Replace Code = <code>&lt;!--[REPLACE&lt;&gt;$$$$]--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/REPLACE&lt;&gt;$$$$]--&gt;</code></p>
+<h3>When JCB adds it back</h3>
+<p>JCB Add Inserted Code = <code>&lt;!--[INSERTED$$$$]--&gt;&lt;!--<span class='placeholder-key-id'>x</span>--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/INSERTED$$$$]--&gt;</code>
+<br />JCB Add Replaced Code = <code>&lt;!--[REPLACED$$$$]--&gt;&lt;!--<span class='placeholder-key-id'>x</span>--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/REPLACED$$$$]--&gt;</code></p>
+<h3>To changing existing custom code</h3>
+<p>Update Inserted Code = <code>&lt;!--[INSERTED&lt;&gt;$$$$]--&gt;&lt;!--<span class='placeholder-key-id'>x</span>--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/INSERTED&lt;&gt;$$$$]--&gt;</code>
+<br />Update Replaced Code = <code>&lt;!--[REPLACED&lt;&gt;$$$$]--&gt;&lt;!--<span class='placeholder-key-id'>x</span>--&gt;</code> &lt;YOUR CODE HERE&gt; <code>&lt;!--[/REPLACED&lt;&gt;$$$$]--&gt;</code></p>
+<p><span class='placeholder-key-id'>x</span> is the ID of the code in the system don&apos;t change it when you edit the code in your IDE outside of JCB!</p></div><div class='span6' id='usedin'></div>"
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL="Information Area."
+COM_COMPONENTBUILDER_CUSTOM_CODE_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_CUSTOM_CODE_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH="Path"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_DESCRIPTION="File path of where this code should be added."
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_HINT="File Path Here"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL="File Path"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PERMISSION="Permissions"
+COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS="PHP/JS"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_CUSTOM_CODE_REPLACEMENT="Replacement"
 COM_COMPONENTBUILDER_CUSTOM_CODE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Custom Code to customise the alias."
 COM_COMPONENTBUILDER_CUSTOM_CODE_STATUS="Status"
+COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME="System Name"
+COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION="Used only in the system."
+COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT="The System Name Here"
+COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL="System Name"
+COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET="Target"
+COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_DESCRIPTION="Set the way this code will be added to the component.<br />Hash automation means it is added using the hash target of the lines surrounding the code.<br />JCB manual means you add a place-holder in Component Builder User Interface area in one of the custom code blocks manually, and this code is added in at those place holders in any component."
+COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL="Target"
 COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE="To Line"
 COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_DESCRIPTION="The line to where the code must be replaced."
 COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT="Only Numbers"
@@ -1966,6 +2027,7 @@ COM_COMPONENTBUILDER_DASHBOARD_SNIPPET_ADD="Add&nbsp;Snippet<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_TEMPLATES="Templates<br /><br />"
 COM_COMPONENTBUILDER_DASHBOARD_TEMPLATE_ADD="Add&nbsp;Template<br /><br />"
 COM_COMPONENTBUILDER_DATE="Date"
+COM_COMPONENTBUILDER_DEBUG_LINE_NUMBERS="Debug (line numbers)"
 COM_COMPONENTBUILDER_DYNAMIC_GET="Dynamic Get"
 COM_COMPONENTBUILDER_DYNAMIC_GETS="Dynamic Gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access"
@@ -2566,6 +2628,8 @@ COM_COMPONENTBUILDER_FIELD_XML_HINT="Field XML Go Here"
 COM_COMPONENTBUILDER_FIELD_XML_LABEL="XML field definition (Please set the field details here to fit your needs)"
 COM_COMPONENTBUILDER_FIELD_YES="Yes"
 COM_COMPONENTBUILDER_FIELD_ZERO="0"
+COM_COMPONENTBUILDER_GLOBAL="Global"
+COM_COMPONENTBUILDER_GREAT_THIS_FUNCTION_NAME_WILL_WORK="Great, this function name will work!"
 COM_COMPONENTBUILDER_HELP_DOCUMENT="Help Document"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS="Help Documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS="Help Documents Access"
@@ -2831,6 +2895,7 @@ COM_COMPONENTBUILDER_LAYOUT_YES="Yes"
 COM_COMPONENTBUILDER_LICENSE="License"
 COM_COMPONENTBUILDER_NEW="New"
 COM_COMPONENTBUILDER_NEW_ISSUE="New Issue"
+COM_COMPONENTBUILDER_NO="No"
 COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_OPENED_BY="opened by"
 COM_COMPONENTBUILDER_PLEASE_CHECK_AGAIN_LATTER="Please check again latter."
@@ -2838,6 +2903,10 @@ COM_COMPONENTBUILDER_RESPOND_TO_THIS_ISSUE_ON_GITHUB="Respond to this issue on G
 COM_COMPONENTBUILDER_REVIEW_THIS_ISSUE_ON_GITHUB="Review this issue on Github"
 COM_COMPONENTBUILDER_SAVE_SUCCESS="Great! Item successfully saved."
 COM_COMPONENTBUILDER_SAVE_WARNING="The value already existed so please select another."
+COM_COMPONENTBUILDER_SELECT_THE_COMPONENT_TO_COMPILE="Select the component to compile"
+COM_COMPONENTBUILDER_SHOULD_JCB_INSERT_THE_CUSTOM_CODE_PLACEHOLDERS_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_CUSTOM_CODE="Should JCB insert the custom code placeholders? This is only applicable if this component has custom code."
+COM_COMPONENTBUILDER_SHOULD_THE_COMPONENT_BE_MOVED_TO_YOUR_LOCAL_GIT_FOLDER="Should the component be moved to your local git folder?"
+COM_COMPONENTBUILDER_SHOULD_THE_ZIPPED_PACKAGE_OF_THE_COMPONENT_BE_MOVED_TO_THE_LOCAL_BACKUP_AND_REMOTE_SALES_SERVER_THIS_IS_ONLY_APPLICABLE_IF_THIS_COMPONENT_HAS_THOSE_VALUES_SET="Should the zipped package of the component be moved to the local backup and remote sales server? This is only applicable if this component has those values set."
 COM_COMPONENTBUILDER_SITE_VIEW="Site View"
 COM_COMPONENTBUILDER_SITE_VIEWS="Site Views"
 COM_COMPONENTBUILDER_SITE_VIEWS_ACCESS="Site Views Access"
@@ -2907,10 +2976,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"
@@ -2969,6 +3034,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"
@@ -3370,6 +3439,7 @@ COM_COMPONENTBUILDER_SNIPPET_USAGE_HINT="Add Usage Here"
 COM_COMPONENTBUILDER_SNIPPET_USAGE_LABEL="Usage"
 COM_COMPONENTBUILDER_SNIPPET_VERSION_DESC="A count of the number of times this Snippet has been revised."
 COM_COMPONENTBUILDER_SNIPPET_VERSION_LABEL="Revision"
+COM_COMPONENTBUILDER_SORRY_THIS_FUNCTION_NAME_IS_ALREADY_IN_USE="Sorry this function name is already in use!"
 COM_COMPONENTBUILDER_SUBMENU_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_SUBMENU_COMPILER="Compiler"
 COM_COMPONENTBUILDER_SUBMENU_COMPONENTS="Components"
@@ -3495,3 +3565,5 @@ COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch co
 COM_COMPONENTBUILDER_VERSION="Version"
 COM_COMPONENTBUILDER_VIEW_MORE_ISSUES_ON_GITHUB="View more issues on Github"
 COM_COMPONENTBUILDER_WEBSITE="Website"
+COM_COMPONENTBUILDER_YES="Yes"
+COM_COMPONENTBUILDER__SELECT_COMPONENT_="- Select Component -"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.2.9
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th 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
-	@build			1st February, 2017
+	@version		2.3.4
+	@build			13th February, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php