Improved the custom import option to include the display method override.

README.md

@@ -1,4 +1,4 @@
-# Component Builder (2.1.7)
+# Component Builder (2.1.9)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -6,7 +6,7 @@ This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
 The Component Builder for Joomla that is highly advanced, truly able to build extremely complex components in a fraction of the time.
 
-> **You can purchase Component Builder with the following components as demo setup inside Component Builder:**
+> **You can purchase demo content inside Component Builder:**
 
 + **Development Version** ([get this demo set](https://www.vdm.io/joomla-component-builder))
 
@@ -22,9 +22,9 @@ The Component Builder for Joomla that is highly advanced, truly able to build ex
 
     *Training & Help Videos* tutorials in the component included.
 
-# Extra Support
+# gitHub Support
 
-Would you require more help VDM.io has a number of support plans available [visit us today!](https://www.vdm.io/joomla-component-builder).
+Would you require more help please open and issue here on [gitHub today](https://github.com/vdm-io/Joomla-Component-Builder/issues)!
 
 # Build Details
 
@@ -32,38 +32,13 @@ Would you require more help VDM.io has a number of support plans available [visi
 + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io)
 + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 4th May, 2016
++ *Last Build*: 20th May, 2016
-+ *Version*: 2.1.7
++ *Version*: 2.1.9
 + *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*: **82627**
-## Build Time
++ *File count*: **502**
-
-**228 Hours** or **29 Eight Hour Days** (actual time the author saved -
-due to [Automated Component Builder] (https://www.vdm.io/joomla-component-builder))
-
-> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
-> never making one mistake or taking any coffee break.)
-
-+ *Line count*: **81816**
-+ *File count*: **500**
 + *Folder count*: **98**
 
-**151 Hours** or **18 Eight Hour Days** (the actual time the author spent)
-
-> (with the following break down:
-> **debugging @57hours** = codingtime / 4;
-> **planning @33hours** = codingtime / 7;
-> **mapping @23hours** = codingtime / 10;
-> **office @38hours** = codingtime / 6;)
-
-**379 Hours** or **47 Eight Hour Days**
-(a total of the realistic time frame for this project)
-
-> (if creating a folder and file took **5 seconds** and writing one line of code took **10 seconds**,
-> with the normal everyday realities at the office, that includes the component planning, mapping & debugging.)
-
-Project duration: **9.4 weeks** or **2 months**
-
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).
 > Developed by [Llewellyn van der Merwe] (mailto:joomla@vdm.io)

admin/assets/css/admin.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css

admin/assets/css/admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css

admin/assets/css/admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css

admin/assets/css/component.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css

admin/assets/css/components.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.css

admin/assets/css/custom_admin_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css

admin/assets/css/custom_admin_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css

admin/assets/css/dashboard.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css

admin/assets/css/dynamic_get.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css

admin/assets/css/dynamic_gets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css

admin/assets/css/field.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css

admin/assets/css/fields.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css

admin/assets/css/fieldtype.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css

admin/assets/css/fieldtypes.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css

admin/assets/css/help_document.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.css

admin/assets/css/help_documents.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css

admin/assets/css/layout.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css

admin/assets/css/layouts.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css

admin/assets/css/site_view.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.css

admin/assets/css/site_views.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css

admin/assets/css/snippet.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css

admin/assets/css/snippets.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css

admin/assets/css/template.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css

admin/assets/css/templates.css

@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css

admin/compiler/joomla_3/Helper.php

@@ -162,31 +162,33 @@ abstract class ###Component###Helper
 		return false;
 	}
 
-	public static function jsonToString($value, $sperator = ", ")
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
                 // check if string is JSON
                 $result = json_decode($value, true);
-                if (json_last_error() === JSON_ERROR_NONE) {
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
 			// is JSON
 			if (self::checkArray($result))
 			{
-				$value = '';
+				if (self::checkString($table))
-				$counter = 0;
-				foreach ($result as $string)
 				{
-					if ($counter)
+					$names = array();
+					foreach ($result as $val)
 					{
-						$value .= $sperator.$string;
+						if ($name = self::getVar($table, $val, 'id', 'name'))
-					}
-					else
 						{
-						$value .= $string;
+							$names[] = $name;
 						}
-					$counter++;
 					}
-				return $value;
+					if (self::checkArray($names))
+					{
+						return (string) implode($sperator,$names);
 					}	
-                        return json_decode($value);
+				}
+				return (string) implode($sperator,$result);
+			}
+                        return (string) json_decode($value);
                 }
                 return $value;
         }

admin/compiler/joomla_3/Helper_site.php

@@ -35,30 +35,33 @@ defined('_JEXEC') or die('Restricted access');
 abstract class ###Component###Helper
 {###SITE_GLOBAL_EVENT_HELPER### ###SITE_CUSTOM_HELPER_SCRIPT###
 	
-	public static function jsonToString($value)
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
                 // check if string is JSON
                 $result = json_decode($value, true);
-		if (json_last_error() === JSON_ERROR_NONE) {
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
 			// is JSON
 			if (self::checkArray($result))
 			{
-					$value = '';
+				if (self::checkString($table))
-					$counter = 0;
-					foreach ($result as $string)
 				{
-						if ($counter)
+					$names = array();
+					foreach ($result as $val)
 					{
-							$value .= ", ".$string;
+						if ($name = self::getVar($table, $val, 'id', 'name'))
-						}
-						else
 						{
-							$value .= $string;
+							$names[] = $name;
-						}
-						$counter++;
 						}
 					}
-			return json_decode($value);
+					if (self::checkArray($names))
+					{
+						return (string) implode($sperator,$names);
+					}	
+				}
+				return (string) implode($sperator,$result);
+			}
+                        return (string) json_decode($value);
                 }
                 return $value;
         }

admin/compiler/joomla_3/JViewLegacy_import_custom.php

@@ -36,59 +36,7 @@ jimport('joomla.application.component.view');
  * ###Component### ###View### View
  */
 class ###Component###View###View### extends JViewLegacy
-{
+{###IMPORT_DISPLAY_METHOD_CUSTOM###
-	protected $headerList;
-	protected $hasPackage = false;
-	protected $headers;
-	protected $hasHeader = 0;
-	protected $dataType;
-
-	public function display($tpl = null)
-	{
-		if ($this->getLayout() !== 'modal')
-		{
-			// Include helper submenu
-			###Component###Helper::addSubmenu('import');
-		}
-
-		// Check for errors.
-		if (count($errors = $this->get('Errors'))){
-			JError::raiseError(500, implode('<br />', $errors));
-			return false;
-		}
-
-		$paths = new stdClass;
-		$paths->first = '';
-		$state = $this->get('state');
-
-		$this->paths = &$paths;
-		$this->state = &$state;
-                // get global action permissions
-		$this->canDo = ###Component###Helper::getActions('import');
-
-		// We don't need toolbar in the modal window.
-		if ($this->getLayout() !== 'modal')
-		{
-			$this->addToolbar();
-			$this->sidebar = JHtmlSidebar::render();
-		}
-
-		// get the session object
-		$session = JFactory::getSession();
-		// check if it has package
-		$this->hasPackage 	= $session->get('hasPackage', false);
-		$this->dataType 	= $session->get('dataType', false);
-		if($this->hasPackage && $this->dataType)
-		{
-			$this->headerList 	= json_decode($session->get($this->dataType.'_VDM_IMPORTHEADERS', false),true);
-			$this->headers 		= ###Component###Helper::getFileHeaders($this->dataType);
-			// clear the data type
-			$session->clear('dataType');
-		}
-
-		// Display the template
-		parent::display($tpl);
-	}
 
 	/**
 	 * Setting the toolbar

admin/compiler/joomla_3/default_main.php

@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 ?>
-<?php if(is_array($this->icons['main'])) :?>
+<?php if(isset($this->icons['main']) && is_array($this->icons['main'])) :?>
 	<?php foreach($this->icons['main'] as $icon): ?>
 		<div class="dashboard-wraper">
 			<div class="dashboard-content"> 
@@ -42,4 +42,6 @@ defined('_JEXEC') or die('Restricted access');
 		</div>
 	<?php endforeach; ?>
 	<div class="clearfix"></div>
+<?php else: ?>
+	<div class="alert alert-error"><h4 class="alert-heading"><?php echo JText::_("Permission denied, or not correctly set"); ?></h4><div class="alert-message"><?php echo JText::_("Please notify your System Administrator if result is unexpected."); ?></div></div>
 <?php endif; ?>

admin/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controller.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php

admin/controllers/admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php

admin/controllers/admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php

admin/controllers/ajax.json.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php

admin/controllers/compiler.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php

admin/controllers/component.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php

admin/controllers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php

admin/controllers/components.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php

admin/controllers/custom_admin_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php

admin/controllers/custom_admin_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php

admin/controllers/dynamic_get.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php

admin/controllers/dynamic_gets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php

admin/controllers/field.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php

admin/controllers/fields.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php

admin/controllers/fieldtype.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php

admin/controllers/fieldtypes.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php

admin/controllers/help.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php

admin/controllers/help_document.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php

admin/controllers/help_documents.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php

admin/controllers/import.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php

admin/controllers/layout.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php

admin/controllers/layouts.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php

admin/controllers/site_view.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php

admin/controllers/site_views.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php

admin/controllers/snippet.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php

admin/controllers/snippets.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php

admin/controllers/template.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php

admin/controllers/templates.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php

admin/helpers/compiler/a_Get.php

@@ -1089,7 +1089,7 @@ class Get
 			// set custom import scripts
 			if (isset($view->add_custom_import) && $view->add_custom_import == 1)
 			{
-				$addImportArray = array('php_import','php_import_setdata','php_import_save','html_import_view');
+				$addImportArray = array('php_import_display','php_import','php_import_setdata','php_import_save','html_import_view');
 				foreach ($addImportArray as $importScripter)
 				{
 					if (isset($view->$importScripter) && strlen($view->$importScripter) > 0)
@@ -1101,7 +1101,7 @@ class Get
 			}
 			
 			// add_Ajax for this view
-			if ($view->add_php_ajax == 1)
+			if (isset($view->add_php_ajax) && $view->add_php_ajax == 1)
 			{
 				$addAjaxSite = false;
 				if (isset($this->siteEditView[$id]) && $this->siteEditView[$id])
@@ -1128,16 +1128,20 @@ class Get
 							$this->customScriptBuilder['admin']['ajax_controller'][$name_single][$nr][$option] = $value;
 						}
 					}
+					$this->addAjax = true;
+					unset($view->ajax_input);
+				}
+				if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
+				{
 					if ($addAjaxSite)
 					{
 						$this->customScriptBuilder['site']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
 					}
 					$this->customScriptBuilder['admin']['ajax_model'][$name_single] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
-					$this->addAjax = true;
-					unset($view->ajax_input);
-				}
 					// unset anyway
 					unset($view->php_ajaxmethod);
+					$this->addAjax = true;
+				}
 			}
 			// add_sql
 			if ($view->add_sql == 1)
@@ -1303,10 +1307,15 @@ class Get
 						$this->customScriptBuilder[$this->target]['ajax_controller'][$view->code][$nr][$option] = $value;
 					}
 				}
-				$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
 				$this->addSiteAjax = true;
 				unset($view->ajax_input);
 			}
+			if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
+			{
+				
+				$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setCustomContentLang(base64_decode($view->php_ajaxmethod));
+				$this->addSiteAjax = true;
+			}
 			// unset anyway
 			unset($view->php_ajaxmethod);
 		}

admin/helpers/compiler/c_Fields.php

@@ -1340,6 +1340,7 @@ class Fields extends Structure
 			$this->queryBuilder[$viewName][$name] = array(
 			    'type' => $field['settings']->datatype,
 			    'lenght' => $field['settings']->datalenght,
+			    'lenght_other' => $field['settings']->datalenght_other,
 			    'default' => $field['settings']->datadefault,
 			    'other' => $field['settings']->datadefault_other,
 			    'null_switch' => $field['settings']->null_switch);
@@ -1413,6 +1414,7 @@ class Fields extends Structure
 			    'link' => ($field['link']) ? true : false,
 			    'sort' => ($field['sort']) ? true : false,
 			    'custom' => $custom,
+			    'multiple' => $multiple,
 			    'options' => $options);
 
 			$this->customBuilderList[$listViewName][] = $name;
@@ -1498,7 +1500,7 @@ class Fields extends Structure
 			$this->catCodeBuilder[$viewName] = array('code' => $name, 'views' => $otherViews, 'view' => $otherView);
 		}
 		// setup checkbox for this view
-		if ($typeName == 'checkbox')
+		if ($typeName == 'checkbox' || (ComponentbuilderHelper::checkArray($custom) && isset($custom['extends']) && $custom['extends'] == 'checkboxes'))
 		{
 			$this->checkboxBuilder[$viewName][] = $name;
 		}
@@ -1709,7 +1711,7 @@ class Fields extends Structure
 			// ###type### <<<DYNAMIC>>>
 			$this->fileContentDynamic['customfield_'.$data['type']]['###type###'] = $data['custom']['type'];
 			// ###type### <<<DYNAMIC>>>
-			$this->fileContentDynamic['customfield_'.$data['type']]['###ADD_BUTTON###'] = $this->setAddButttonToListField($data['custom']['view']);
+			$this->fileContentDynamic['customfield_'.$data['type']]['###ADD_BUTTON###'] = $this->setAddButttonToListField($data['custom']['view'],$data['custom']['views']);
 		}
 	}
 

admin/helpers/compiler/e_Interpretation.php

@@ -4647,7 +4647,11 @@ class Interpretation extends Fields
 					}
 					// set the lenght
 					$lenght = '';
-					if (isset($data['lenght']) && $data['lenght'] > 0)
+					if ($data['lenght'] == 'Other' && isset($data['lenght_other']) && $data['lenght_other'] > 0)
+					{
+						$lenght = '('.$data['lenght_other'].')';
+					}
+					elseif (isset($data['lenght']) && $data['lenght'] > 0)
 					{
 						$lenght = '('.$data['lenght'].')';
 					}
@@ -4753,6 +4757,8 @@ class Interpretation extends Fields
 		$this->langContent['admin'][$this->langPrefix.'_SAVE_WARNING']			= "The value already existed so please select another.";
 		$this->langContent['admin'][$this->langPrefix.'_HELP_MANAGER']			= "Help";
 		$this->langContent['admin'][$this->langPrefix.'_NEW']				= "New";
+		$this->langContent['admin'][$this->langPrefix.'_CREATE_NEW_S']			= "Create New %s";
+		$this->langContent['admin'][$this->langPrefix.'_EDIT_S']			= "Edit %s";
 		$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_STATE']           = "- Keep Original State -";
 		$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_ACCESS']          = "- Keep Original Access -";
 		$this->langContent['admin'][$this->langPrefix.'_KEEP_ORIGINAL_CATEGORY']        = "- Keep Original Category -";
@@ -4845,6 +4851,9 @@ class Interpretation extends Fields
 		$this->langContent['site']['COM_CONTENT_FIELD_MODIFIED_DESC']	= "The last date this item was modified.";
 		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_BY_LABEL']	= "Modified By";
 		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_BY_DESC']	= "The user who did the last modification.";
+		$this->langContent['site'][$this->langPrefix.'_NEW']		= "New";
+		$this->langContent['site'][$this->langPrefix.'_CREATE_NEW_S']	= "Create New %s";
+		$this->langContent['site'][$this->langPrefix.'_EDIT_S']		= "Edit %s";
 
 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
@@ -5060,8 +5069,11 @@ class Interpretation extends Fields
 				if (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']))
 				{
 					$item['id'] = $item['code'];
+					if (!$item['multiple'])
+					{
 						$item['code'] = $item['code'].'_'.$item['custom']['text'];
 					}
+				}
 				// check if translated vlaue is used
 				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
 					&& array_key_exists($item['code'],$this->selectionTranslationFixBuilder[$viewName_list]))
@@ -6014,8 +6026,11 @@ class Interpretation extends Fields
 				if (isset($item['custom']) && ComponentbuilderHelper::checkArray($item['custom']))
 				{
 					$item['id'] = $item['code'];
+					if (!$item['multiple'])
+					{
 						$item['code'] = $item['code'].'_'.$item['custom']['text'];
 					}
+				}
 				// check if translated vlaue is used
 				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
 					&& array_key_exists($item['code'],$this->selectionTranslationFixBuilder[$viewName_list]))
@@ -6902,6 +6917,12 @@ class Interpretation extends Fields
 		$target = array('admin' => 'import_'.$viewName_list);
 		$this->buildDynamique($target,'customimport');
 		// load the custom script to the files
+		if (isset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]))
+		{
+			// ###IMPORT_DISPLAY_METHOD_CUSTOM### <<<DYNAMIC>>>
+			$this->fileContentDynamic['import_'.$viewName_list]['###IMPORT_DISPLAY_METHOD_CUSTOM###'] = "\n".str_replace(array_keys($this->placeholders),array_values($this->placeholders),$this->customScriptBuilder['php_import_display']['import_'.$viewName_list]);
+			unset($this->customScriptBuilder['php_import_display']['import_'.$viewName_list]);
+		}
 		if (isset($this->customScriptBuilder['php_import_setdata']['import_'.$viewName_list]))
 		{
 			// ###IMPORT_SETDATE_METHOD_CUSTOM### <<<DYNAMIC>>>
@@ -7112,7 +7133,7 @@ class Interpretation extends Fields
 		}
 	}
 
-	public function setAddButttonToListField($targetView)
+	public function setAddButttonToListField($targetView,$targetViews)
 	{
 		$addButton = array();
 		$addButton[] = "\n\t/**";
@@ -7131,6 +7152,25 @@ class Interpretation extends Fields
 		$addButton[] = "\t\t//".$this->setLine(__LINE__)." if true set button";
 		$addButton[] = "\t\tif (\$setButton === 'true')";
 		$addButton[] = "\t\t{";
+		$addButton[] = "\t\t\t\$button = array();";
+		$addButton[] = "\t\t\t\$script = array();";
+		$addButton[] = "\t\t\t\$buttonName = \$this->getAttribute('name');";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." get the input from url";
+		$addButton[] = "\t\t\t\$jinput = JFactory::getApplication()->input;";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." get the view name & id";
+		$addButton[] = "\t\t\t\$values = \$jinput->getArray(array(";
+		$addButton[] = "\t\t\t\t'id' => 'int',";
+		$addButton[] = "\t\t\t\t'view' => 'word'";
+		$addButton[] = "\t\t\t));";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." check if new item";
+		$addButton[] = "\t\t\t\$ref = '';";
+		$addButton[] = "\t\t\t\$refJ = '';";
+		$addButton[] = "\t\t\tif (!is_null(\$values['id']) && strlen(\$values['view']))";
+		$addButton[] = "\t\t\t{";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." only load referal if not new item.";
+		$addButton[] = "\t\t\t\t\$ref = '&amp;ref=' . \$values['view'] . '&amp;refid=' . \$values['id'];";
+		$addButton[] = "\t\t\t\t\$refJ = '&ref=' . \$values['view'] . '&refid=' . \$values['id'];";
+		$addButton[] = "\t\t\t}";
 		$addButton[] = "\t\t\t\$user = JFactory::getUser();";
 		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." only add if user allowed to create " . $targetView;
 		// get core permissions
@@ -7150,26 +7190,65 @@ class Interpretation extends Fields
 			$addButton[] = "\t\t\tif (\$user->authorise('core.create', 'com_".$this->fileContentStatic['###component###']."'))";
 		}
 		$addButton[] = "\t\t\t{";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." get the input from url";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build Create button";
-		$addButton[] = "\t\t\t\t\$jinput = JFactory::getApplication()->input;";
+		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Create\" class=\"btn btn-small btn-success hasTooltip\" title=\"'.JText::sprintf('".$this->langPrefix."_CREATE_NEW_S', ".$this->fileContentStatic['###Component###']."Helper::safeString(\$buttonName, 'W')).'\" style=\"border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;\"";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." get the view name & id";
-		$addButton[] = "\t\t\t\t\$values = \$jinput->getArray(array(";
-		$addButton[] = "\t\t\t\t\t'id' => 'int',";
-		$addButton[] = "\t\t\t\t\t'view' => 'word'";
-		$addButton[] = "\t\t\t\t));";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." check if new item";
-		$addButton[] = "\t\t\t\t\$ref = '';";
-		$addButton[] = "\t\t\t\tif (!is_null(\$values['id']) && strlen(\$values['view']))";
-		$addButton[] = "\t\t\t\t{";
-		$addButton[] = "\t\t\t\t\t//".$this->setLine(__LINE__)." only load referal if not new item.";
-		$addButton[] = "\t\t\t\t\t\$ref = '&amp;ref=' . \$values['view'] . '&amp;refid=' . \$values['id'];";
-		$addButton[] = "\t\t\t\t}";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build the button";
-		$addButton[] = "\t\t\t\t\$button = '<a class=\"btn btn-small btn-success\"";
 		$addButton[] = "\t\t\t\t\thref=\"index.php?option=com_" . $this->fileContentStatic['###component###'] . "&amp;view=" . $targetView . "&amp;layout=edit'.\$ref.'\" >";
-		$addButton[] = "\t\t\t\t\t<span class=\"icon-new icon-white\"></span>' . JText::_('COM_".$this->fileContentStatic['###COMPONENT###']."_NEW') . '</a>';";
+		$addButton[] = "\t\t\t\t\t<span class=\"icon-new icon-white\"></span></a>';";
-		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." return the button attached to input field";
+		$addButton[] = "\t\t\t}";
-		$addButton[] = "\t\t\t\treturn \$html . \$button;";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." only add if user allowed to edit " . $targetView;
+		// check if the item has permissions.
+		if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($targetView,$this->permissionBuilder['global'][$core['core.edit']]))
+		{
+			$addButton[] = "\t\t\tif ((\$buttonName == '".$targetView."' || \$buttonName == '".$targetViews."') && \$user->authorise('".$core['core.edit']."', 'com_".$this->fileContentStatic['###component###']."'))";
+		}
+		else
+		{
+			$addButton[] = "\t\t\tif ((\$buttonName == '".$targetView."' || \$buttonName == '".$targetViews."')  && \$user->authorise('core.edit', 'com_".$this->fileContentStatic['###component###']."'))";
+		}
+		$addButton[] = "\t\t\t{";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build edit button";
+		$addButton[] = "\t\t\t\t\$button[] = '<a id=\"'.\$buttonName.'Edit\" class=\"btn btn-small hasTooltip\" title=\"'.JText::sprintf('".$this->langPrefix."_EDIT_S', ".$this->fileContentStatic['###Component###']."Helper::safeString(\$buttonName, 'W')).'\" style=\"display: none; padding: 4px 4px 4px 7px;\" href=\"#\" >";
+		$addButton[] = "\t\t\t\t\t<span class=\"icon-edit\"></span></a>';";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." build script";
+		$addButton[] = "\t\t\t\t\$script[] = \"";
+		$addButton[] = "\t\t\t\t\tjQuery(document).ready(function() {";
+		$addButton[] = "\t\t\t\t\t\tjQuery('#adminForm').on('change', '#jform_\".\$buttonName.\"',function (e) {";
+		$addButton[] = "\t\t\t\t\t\t\te.preventDefault();";
+		$addButton[] = "\t\t\t\t\t\t\tvar \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
+		$addButton[] = "\t\t\t\t\t\t\t\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
+		$addButton[] = "\t\t\t\t\t\t});";		
+		$addButton[] = "\t\t\t\t\t\tvar \".\$buttonName.\"Value = jQuery('#jform_\".\$buttonName.\"').val();";
+		$addButton[] = "\t\t\t\t\t\t\".\$buttonName.\"Button(\".\$buttonName.\"Value);";
+		$addButton[] = "\t\t\t\t\t});";
+		$addButton[] = "\t\t\t\t\tfunction \".\$buttonName.\"Button(value) {";
+		$addButton[] = "\t\t\t\t\t\tif (value > 0) {"; // TODO not ideal since value may not be an (int)
+		$addButton[] = "\t\t\t\t\t\t\t// hide the create button";
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Create').hide();";
+		$addButton[] = "\t\t\t\t\t\t\t// show edit button";
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').show();";
+		$addButton[] = "\t\t\t\t\t\t\tvar url = 'index.php?option=com_" . $this->fileContentStatic['###component###'] . "&view=".$targetViews."&task=" . $targetView . ".edit&id='+value+'\".\$refJ.\"';"; // TODO this value may not be the ID
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').attr('href', url);";
+		$addButton[] = "\t\t\t\t\t\t} else {";
+		$addButton[] = "\t\t\t\t\t\t\t// show the create button";
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Create').show();";
+		$addButton[] = "\t\t\t\t\t\t\t// hide edit button";
+		$addButton[] = "\t\t\t\t\t\t\tjQuery('#\".\$buttonName.\"Edit').hide();";
+		$addButton[] = "\t\t\t\t\t\t}";
+		$addButton[] = "\t\t\t\t\t}\";";
+		$addButton[] = "\t\t\t}";
+		$addButton[] = "\t\t\t//".$this->setLine(__LINE__)." check if button was created for " . $targetView ." field.";
+		$addButton[] = "\t\t\tif (".$this->fileContentStatic['###Component###']."Helper::checkArray(\$button))";
+		$addButton[] = "\t\t\t{";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." Add some final script";
+		$addButton[] = "\t\t\t\t\$script[] = \"";
+		$addButton[] = "\t\t\t\t\tjQuery(document).ready(function() {";
+		$addButton[] = "\t\t\t\t\t\tjQuery('#jform_\".\$buttonName.\"').closest('.control-group').addClass('input-append');";
+		$addButton[] = "\t\t\t\t\t});\";";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." Load the needed script.";
+		$addButton[] = "\t\t\t\t\$document = JFactory::getDocument();";
+		$addButton[] = "\t\t\t\t\$document->addScriptDeclaration(implode(' ',\$script));";
+		$addButton[] = "\t\t\t\t//".$this->setLine(__LINE__)." return the button attached to input field.";
+		$addButton[] = "\t\t\t\treturn \$html . implode('',\$button);";
 		$addButton[] = "\t\t\t}";
 		$addButton[] = "\t\t}";
 		$addButton[] = "\t\treturn \$html;";
@@ -10264,11 +10343,17 @@ class Interpretation extends Fields
 							$fix .= "\n\t".$tab."\t\t\t\t}";
 							$fix .= "\n\t".$tab."\t\t\t}";
 						}
+						elseif ($item['method'] == 1 && !$export)
+						{
+							// TODO we check if this works well.
+							$fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
+							$fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].", ', ', '".$item['name']."');";
+						}
 						else
 						{
 							if (!$export)
 							{
-								// TODO we must add options for multi custom selection.
+								// For thos we have not cached yet.
 								$fix .= "\n\t".$tab."\t\t\t//".$this->setLine(__LINE__)." convert ".$item['name'];
 								$fix .= "\n\t".$tab."\t\t\t\$item->".$item['name']." = ".$Component."Helper::jsonToString(\$item->".$item['name'].");";
 							}

admin/helpers/componentbuilder.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -710,31 +710,33 @@ abstract class ComponentbuilderHelper
 		return false;
 	}
 
-	public static function jsonToString($value, $sperator = ", ")
+	public static function jsonToString($value, $sperator = ", ", $table = null)
 	{
                 // check if string is JSON
                 $result = json_decode($value, true);
-                if (json_last_error() === JSON_ERROR_NONE) {
+                if (json_last_error() === JSON_ERROR_NONE)
+		{
 			// is JSON
 			if (self::checkArray($result))
 			{
-				$value = '';
+				if (self::checkString($table))
-				$counter = 0;
-				foreach ($result as $string)
 				{
-					if ($counter)
+					$names = array();
+					foreach ($result as $val)
 					{
-						$value .= $sperator.$string;
+						if ($name = self::getVar($table, $val, 'id', 'name'))
-					}
-					else
 						{
-						$value .= $string;
+							$names[] = $name;
 						}
-					$counter++;
 					}
-				return $value;
+					if (self::checkArray($names))
+					{
+						return (string) implode($sperator,$names);
 					}	
-                        return json_decode($value);
+				}
+				return (string) implode($sperator,$result);
+			}
+                        return (string) json_decode($value);
                 }
                 return $value;
         }

admin/helpers/html/batch_.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php

admin/helpers/indenter.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php

admin/helpers/js.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php

admin/helpers/minify.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php

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

@@ -316,6 +316,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT="// PHP Here that should r
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL="PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT="Php Import"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY="Php Import Display"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION="Add your PHP here!"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT="// The display method for the view.html.php file."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL="PHP (display)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT="// PHP Here that should run in the import Method."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL="Import Method PHP"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE="Php Import Save"
@@ -1094,6 +1098,7 @@ COM_COMPONENTBUILDER_CONFIG_UIKIT_STYLE_LABEL="css Style"
 COM_COMPONENTBUILDER_CONFIG_YES="Yes"
 COM_COMPONENTBUILDER_CONTRIBUTOR="Contributor"
 COM_COMPONENTBUILDER_CONTRIBUTORS="Contributors"
+COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW="Custom Admin View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_ACCESS="Custom Admin Views Access"
@@ -1790,6 +1795,7 @@ COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date."
+COM_COMPONENTBUILDER_EDIT_S="Edit %s"
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
 COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
@@ -2131,6 +2137,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view being
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ADMIN_VIEW_LABEL="Admin Views"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS="Alias"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_HINT="Auto-generated from name"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_ALIAS_LABEL="Alias"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ALL="All"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE="Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE_LABEL="Article"

admin/layouts/admin_view/css_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php

admin/layouts/admin_view/custom_import_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
@@ -34,10 +34,11 @@ $fields = $displayData->get('fields') ?: array(
 	'note_beginner_import',
 	'note_advanced_import',
 	'add_custom_import',
+	'php_import_display',
 	'html_import_view',
+	'php_import',
 	'php_import_setdata',
-	'php_import_save',
+	'php_import_save'
-	'php_import'
 );
 
 ?>

admin/layouts/admin_view/fields_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
@@ -29,7 +29,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vxefields;
+$items	= $displayData->vxffields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit	= "index.php?option=com_componentbuilder&view=fields&task=field.edit";
@@ -43,34 +43,34 @@ $can	= ComponentbuilderHelper::getActions('field');
 	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_COMPONENTBUILDER_NEW'); ?></a><br /><br />
 <?php endif; ?>
 <?php if (ComponentbuilderHelper::checkArray($items)): ?>
-<table class="footable table data fields metro-blue" data-page-size="20" data-filter="#filter_fields">
+<table class="footable table data fields" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
 <thead>
 	<tr>
-		<th data-toggle="true">
+		<th data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_NAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_DATATYPE_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_INDEXES_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_NULL_SWITCH_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_FIELD_CATEGORY'); ?>
 		</th>
-		<th data-hide="all">
+		<th data-breakpoints="all" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STORE_LABEL'); ?>
 		</th>
-		<th width="10" data-hide="phone,tablet">
+		<th width="10" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_STATUS'); ?>
 		</th>
-		<th width="5" data-type="numeric" data-hide="phone,tablet">
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_FIELD_ID'); ?>
 		</th>
 	</tr>
@@ -120,25 +120,25 @@ $can	= ComponentbuilderHelper::getActions('field');
 			<?php echo JText::_($item->store); ?>
 		</td>
 		<?php if ($item->published == 1):?>
-			<td class="center"  data-value="1">
+			<td class="center"  data-sort-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
 					<?php echo JText::_('PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0):?>
-			<td class="center"  data-value="2">
+			<td class="center"  data-sort-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
 					<?php echo JText::_('INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2):?>
-			<td class="center"  data-value="3">
+			<td class="center"  data-sort-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2):?>
-			<td class="center"  data-value="4">
+			<td class="center"  data-sort-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
@@ -150,13 +150,6 @@ $can	= ComponentbuilderHelper::getActions('field');
 	</tr>
 <?php endforeach; ?>
 </tbody>
-<tfoot class="hide-if-no-paging">
-	<tr>
-		<td colspan="9">
-			<div class="pagination pagination-centered"></div>
-		</td>
-	</tr>
-</tfoot>
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">

admin/layouts/admin_view/javascript_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php

admin/layouts/admin_view/mysql_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php

admin/layouts/admin_view/mysql_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php

admin/layouts/admin_view/php_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php

admin/layouts/admin_view/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/admin_view/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/admin_view/settings_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php

admin/layouts/admin_view/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/admin_view/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/admin_view/settings_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php

admin/layouts/batchselection.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php

admin/layouts/component/admin_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php
@@ -43,25 +43,25 @@ $can	= ComponentbuilderHelper::getActions('admin_view');
 	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_COMPONENTBUILDER_NEW'); ?></a><br /><br />
 <?php endif; ?>
 <?php if (ComponentbuilderHelper::checkArray($items)): ?>
-<table class="footable table data admin_views metro-blue" data-page-size="20" data-filter="#filter_admin_views">
+<table class="footable table data admin_views" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
 <thead>
 	<tr>
-		<th data-toggle="true">
+		<th data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_LIST_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_LABEL'); ?>
 		</th>
-		<th width="10" data-hide="phone,tablet">
+		<th width="10" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_STATUS'); ?>
 		</th>
-		<th width="5" data-type="numeric" data-hide="phone,tablet">
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ID'); ?>
 		</th>
 	</tr>
@@ -94,25 +94,25 @@ $can	= ComponentbuilderHelper::getActions('admin_view');
 			<?php echo $displayData->escape($item->short_description); ?>
 		</td>
 		<?php if ($item->published == 1):?>
-			<td class="center"  data-value="1">
+			<td class="center"  data-sort-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
 					<?php echo JText::_('PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0):?>
-			<td class="center"  data-value="2">
+			<td class="center"  data-sort-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
 					<?php echo JText::_('INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2):?>
-			<td class="center"  data-value="3">
+			<td class="center"  data-sort-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2):?>
-			<td class="center"  data-value="4">
+			<td class="center"  data-sort-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
@@ -124,13 +124,6 @@ $can	= ComponentbuilderHelper::getActions('admin_view');
 	</tr>
 <?php endforeach; ?>
 </tbody>
-<tfoot class="hide-if-no-paging">
-	<tr>
-		<td colspan="6">
-			<div class="pagination pagination-centered"></div>
-		</td>
-	</tr>
-</tfoot>
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">

admin/layouts/component/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/component/details_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php

admin/layouts/component/details_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php

admin/layouts/component/details_under.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php

admin/layouts/component/ftp_servers_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ftp_servers_fullwidth.php

admin/layouts/component/publishing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php

admin/layouts/component/publlshing.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php

admin/layouts/component/readme_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php

admin/layouts/component/readme_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php

admin/layouts/component/scripts_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_fullwidth.php

admin/layouts/component/settings_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php

admin/layouts/component/settings_right.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php

admin/layouts/component/site_views_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php
@@ -43,28 +43,28 @@ $can	= ComponentbuilderHelper::getActions('site_view');
 	<a class="btn btn-small btn-success" href="<?php echo $new; ?>"><span class="icon-new icon-white"></span> <?php echo JText::_('COM_COMPONENTBUILDER_NEW'); ?></a><br /><br />
 <?php endif; ?>
 <?php if (ComponentbuilderHelper::checkArray($items)): ?>
-<table class="footable table data site_views metro-blue" data-page-size="20" data-filter="#filter_site_views">
+<table class="footable table data site_views" data-show-toggle="true" data-toggle-column="first" data-sorting="true" data-paging="true" data-paging-size="20" data-filtering="true">
 <thead>
 	<tr>
-		<th data-toggle="true">
+		<th data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_SYSTEM_NAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_NAME_LABEL'); ?>
 		</th>
-		<th data-hide="phone">
+		<th data-breakpoints="xs sm" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ALIAS_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_DESCRIPTION_LABEL'); ?>
 		</th>
-		<th data-hide="phone,tablet">
+		<th data-breakpoints="xs sm md" data-type="html" data-sort-use="text">
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_SNIPPET_LABEL'); ?>
 		</th>
-		<th width="10" data-hide="phone,tablet">
+		<th width="10" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_STATUS'); ?>
 		</th>
-		<th width="5" data-type="numeric" data-hide="phone,tablet">
+		<th width="5" data-type="number" data-breakpoints="xs sm md">
 			<?php echo JText::_('COM_COMPONENTBUILDER_SITE_VIEW_ID'); ?>
 		</th>
 	</tr>
@@ -100,25 +100,25 @@ $can	= ComponentbuilderHelper::getActions('site_view');
 			<?php echo $displayData->escape($item->snippet_name); ?>
 		</td>
 		<?php if ($item->published == 1):?>
-			<td class="center"  data-value="1">
+			<td class="center"  data-sort-value="1">
 				<span class="status-metro status-published" title="<?php echo JText::_('PUBLISHED');  ?>">
 					<?php echo JText::_('PUBLISHED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 0):?>
-			<td class="center"  data-value="2">
+			<td class="center"  data-sort-value="2">
 				<span class="status-metro status-inactive" title="<?php echo JText::_('INACTIVE');  ?>">
 					<?php echo JText::_('INACTIVE'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == 2):?>
-			<td class="center"  data-value="3">
+			<td class="center"  data-sort-value="3">
 				<span class="status-metro status-archived" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
 			</td>
 		<?php elseif ($item->published == -2):?>
-			<td class="center"  data-value="4">
+			<td class="center"  data-sort-value="4">
 				<span class="status-metro status-trashed" title="<?php echo JText::_('ARCHIVED');  ?>">
 					<?php echo JText::_('ARCHIVED'); ?>
 				</span>
@@ -130,13 +130,6 @@ $can	= ComponentbuilderHelper::getActions('site_view');
 	</tr>
 <?php endforeach; ?>
 </tbody>
-<tfoot class="hide-if-no-paging">
-	<tr>
-		<td colspan="7">
-			<div class="pagination pagination-centered"></div>
-		</td>
-	</tr>
-</tfoot>
 </table>
 <?php else: ?>
 	<div class="alert alert-no-items">

admin/layouts/custom_admin_view/custom_buttons_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php

admin/layouts/custom_admin_view/custom_buttons_left.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php

admin/layouts/custom_admin_view/custom_script_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php

admin/layouts/custom_admin_view/details_above.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php

admin/layouts/custom_admin_view/details_fullwidth.php

@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.7
+	@version		2.1.9
-	@build			4th May, 2016
+	@build			20th May, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php