Fixed the links of folders in libraries, added another note to libraries, started with linked to ajax functions.

.github/CONTRIBUTING.md

@@ -2,14 +2,16 @@ Contributing to the Joomla Component Builder (JCB)
 ===============
 You are welcome to submit a contribution for review and possible inclusion in the Joomla Component Builder but, before it will be accepted, we ask that you follow these simple steps:
 
-1) Open an issue on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you so you do not have to create an issue if you are creating a pull request.
+1) Please watch [these tutorials](https://www.youtube.com/watch?v=lLOfx9YA7VQ&list=PLQRGFI8XZ_wsfz3NdKawCiYsALuZ-GhwJ)
 
-2) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html).
+2) Open an issue on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you so you do not have to create an issue if you are creating a pull request.
 
-3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible. 
+3) Follow the [Joomla! Coding Standards](https://developer.joomla.org/coding-standards.html).
+
+4) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible. 
 If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
 
-4) Report security issues to the JCB! Core Team using the [Report security issues contact form](https://www.vdm.io/report-security-issues). Please do not use the public forums for security issues.
+5) Report security issues to the JCB! Core Team using the [Report security issues contact form](https://www.vdm.io/report-security-issues). Please do not use the public forums for security issues.
 
 Please be patient as not all items will be tested immediately (remember, all bug testing for the JCB is done by volunteers) and be receptive to feedback about your code.
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,20 +1,16 @@
-Pull Request for Issue # .
+Pull Request for Issue gh- .
 
 ### Summary of Changes
 
 
-
 ### Testing Instructions
 
 
-
 ### Expected result
 
 
-
 ### Actual result
 
 
-
 ### Documentation Changes Required
 

README.md

@@ -10,7 +10,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) 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.6.6) 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.6.7) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -111,12 +111,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 12th December, 2017
++ *Last Build*: 17th December, 2017
-+ *Version*: 2.6.6
++ *Version*: 2.6.7
 + *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*: **177938**
++ *Line count*: **178375**
-+ *File count*: **1142**
++ *File count*: **1145**
 + *Folder count*: **184**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/README.txt

@@ -10,7 +10,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) 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.6.6) 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.6.7) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -111,12 +111,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 12th December, 2017
++ *Last Build*: 17th December, 2017
-+ *Version*: 2.6.6
++ *Version*: 2.6.7
 + *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*: **177938**
++ *Line count*: **178375**
-+ *File count*: **1142**
++ *File count*: **1145**
 + *Folder count*: **184**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).

admin/assets/js/get_snippets.js

@@ -0,0 +1,542 @@
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		get_snippets.js
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-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 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+/* JS Document */
+// start the moment the document is ready
+jQuery(document).ready(function () {
+	// just get the available libraries
+	getLibraries(snippetsPath);
+});
+
+// add an ajax call tracker
+var ajaxcall = null;
+var fromLocal = false;
+
+jQuery(document).ready(function(){
+	jQuery('body').on('click','.getreaction',function(){
+		// Ajax request
+		var btn = jQuery(this);
+		btn.prop('disabled', true);
+		setTimeout(function(){
+			btn.prop('disabled', false);
+		}, 3000);
+		var type = btn.data('type');
+		if ('getLibraries' === type) {
+			getLibraries(snippetsPath);
+		} else if ('getSnippets' === type) {
+			var name = btn.data('name');
+			getSnippets(snippetsPath, name);
+		} else if ('all' === type) {
+			var status = btn.data('status');
+			bulkSnippetGithub(status);
+		} else if ('bulk' === type) {
+			checkBulkSnippetGithub();
+		} else if ('get' === type) {
+			var path = btn.data('path');
+			var status = btn.data('status');
+			setSnippetGithub(path, status);
+		} else {
+			var path = btn.data('path');
+			getSnippetModal(path, type);
+		}
+	});
+});
+
+// load every thing once ready
+jQuery(document).ajaxStop(function () {
+	if (0 === jQuery.active) {
+		//do something special
+		if ('snippets' === ajaxcall) {
+			setTimeout( function() {
+				jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS')+'</h1>');
+				jQuery('#snippets-display').show();
+				jQuery('#snippets-grid').trigger('display.uk.check');
+				jQuery('#loading').hide();
+			}, 1000);
+		} 
+	}
+});
+
+// get the libraries
+function getLibraries(path) {
+	var _paths = jQuery.jStorage.get('JCB-Snippets-Paths', null);
+	// always hide the snippets display
+	jQuery('#snippets-display').hide();
+	// always reset the grid
+	jQuery('#libraries-grid').html('');
+	// set the ajax scope
+	ajaxcall = 'libraries';
+	if (_paths) {
+		buildLibraries(_paths);
+	} else {
+		jQuery.get(path)
+		.success(function(paths) {
+			// load only this library paths
+			jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
+			buildLibraries(paths);
+		})
+		.error(function(jqXHR, textStatus, errorThrown) { 
+			jQuery('#snippets-github').html(returnError);
+		});
+	}
+}
+
+// build the ibraries object
+function buildLibraries(paths) {
+	var _temp = jQuery.jStorage.get('JCB-Libraries', null);
+	if (_temp) {
+		setLibraries(_temp);
+	} else {
+		var temp = {};
+		jQuery.each(paths.tree, function(key,value) {
+			if (value.path.match(".json$")) {
+				var libName = value.path.split(/ -(.+)/)[0];
+				libName = libName.trim()
+				temp[libName] = libName;
+			}
+		});
+		// load only this library paths
+		jQuery.jStorage.set('JCB-Libraries', temp, {TTL: expire});
+		setLibraries(temp);
+	}
+}
+
+// set the libraries
+function setLibraries(names) {
+	// now load the lib buttons
+	jQuery.each(names, function(value) {
+		setLibrary(value);
+	});
+	setTimeout( function() {
+		jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_AVAILABLE_LIBRARIES')+'</h1>');
+		jQuery('#libraries-display').show();
+		jQuery('#libraries-grid').trigger('display.uk.check');
+	}, 1000);
+}
+
+// set the snippets
+function setLibrary(name) {
+	// get useful ID
+	var keyID = getKeyID(name);
+	// build the library display
+	var html = '<div id="'+keyID+'-panel" class="uk-panel">';
+	html += '<div class="uk-panel uk-panel-box uk-width-1-1">';
+	html += '<h3 class="uk-panel-title">' + name + '</h3>';
+	html += '<hr />';
+	// set the data buttons
+	html += setLibButtons(name);
+	// close the box panel
+	html += '</div>';
+	html += '</div>';
+	// now we have the library
+	jQuery('#libraries-grid').append(html);
+}
+
+function setLibButtons(name) {
+	return  '<button class="uk-button uk-button-small uk-button-success uk-width-1-1 getreaction" data-name="'+name+'" data-type="getSnippets" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-thumb-tack"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS')+'</span></button>';
+}
+
+// get the snippets
+function getSnippets(path, libraryName) {
+	jQuery('#loading').show();
+	// get local values if set
+	var _paths = jQuery.jStorage.get('JCB-Snippets-Paths', null);
+	// always reset the grid
+	jQuery('#snippets-grid').html('');
+	// always hide libraries
+	jQuery('#libraries-display').hide();
+	// set the ajax scope
+	ajaxcall = 'snippets';
+	fromLocal = false;
+	if (_paths) {
+		setSnippets(_paths, libraryName);
+		jQuery('#snippets-github').html('<h1>'+Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS')+'</h1>');
+	} else {
+		jQuery.get(path)
+		.success(function(paths) {
+			// load only this library paths
+			jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
+			setSnippets(paths, libraryName);
+		})
+		.error(function(jqXHR, textStatus, errorThrown) { 
+			jQuery('#snippets-github').html(returnError);
+		});
+	}
+	// only use if loading localy
+	if (fromLocal) {
+		jQuery('#snippets-display').show();
+		jQuery('#snippets-grid').trigger('display.uk.check');
+		jQuery('#loading').hide();
+	}
+}
+
+// set the snippets
+function setSnippets(paths, libraryName) {
+	// set the ajax scope
+	ajaxcall = 'snippets';
+	jQuery.each(paths.tree, function(key,value) {
+		if (value.path.match(".json$") && value.path.match("^"+libraryName)) {
+			var _snippet = jQuery.jStorage.get(value.path, null);
+			if (_snippet) {
+				setSnippet(_snippet, value.path);
+				fromLocal = true;
+			} else {
+				jQuery.get(snippetPath+value.path)
+				.success(function(snippet) {
+					// convert the string to json.object
+					snippet = jQuery.parseJSON(snippet);
+					jQuery.jStorage.set(value.path, snippet, {TTL: expire});
+					setSnippet(snippet, value.path);
+				})
+				.error(function(jqXHR, textStatus, errorThrown) { 
+					// we could do more
+				});
+			}
+		}
+	});
+}
+
+// set the snippets
+function setSnippet(snippet, key) {
+	// get useful ID
+	var keyID = getKeyID(key);
+	// get the status
+	var status = getSnippetStatus(snippet, key);
+	// add to bulk updater
+	if ('equal' !== status) {
+		bulkItems[status].push(key);
+	}
+	// build the snippet display
+	var html = '<div id="'+keyID+'-panel" class="uk-panel" data-uk-filter="'+status+'" data-snippet-libraries="'+snippet.library+'" data-snippet-types="'+snippet.type+'" data-snippet-name="'+snippet.name+'">';
+	html += '<div class="uk-panel uk-panel-box uk-width-1-1">';
+	html += '<div class="uk-panel-badge uk-badge" ><a id="'+keyID+'-badge" href="#'+status+'-meaning" data-uk-offcanvas class="uk-text-uppercase uk-text-contrast"><i class="uk-icon-info"></i> '+status+'</a></div><br />';
+	html += '<h3 class="uk-panel-title">' + snippet.library+ ' - (' + snippet.type + ') ' + snippet.name + '</h3>';
+	html += snippet.heading + '<hr />';
+	// set the data buttons
+	html += setDataButtons(snippet, key, status);
+	// set the snippet ref button
+	html += setRefButtons(snippet, key, status, keyID);
+	// set the contributor buttons
+	html += setContributorButtons(snippet, key);
+	// close the box panel
+	html += '</div>';
+	html += '</div>';
+	// now we have the snippet
+	jQuery('#snippets-grid').append(html);
+}
+
+// set the snippet status
+function getSnippetStatus(snippet, key) {
+	// check if JCB already has this snippet
+	if(local_snippets.hasOwnProperty(key)){
+		// first get local time stamp
+		var local_created = strtotime(local_snippets[key].created);
+		var local_modified = strtotime(local_snippets[key].modified);
+		// now get github time stamps					
+		var created = strtotime(snippet.created);
+		var modified = strtotime(snippet.modified);
+		// work out the status
+		if (local_created == created) {
+			if (local_modified == modified) {
+				return 'equal';
+			} else if (local_modified > modified) {
+				return 'ahead';
+			} else if (local_modified < modified) {
+				return 'behind';
+			}
+		}
+		return 'diverged';
+	}
+	return 'new';
+}
+
+function setDataButtons(snippet, key, status) {
+	var html = '<div class="uk-button-group uk-width-1-1 uk-margin-small-bottom">';
+	html += '<button class="uk-button uk-button-small uk-button-success uk-width-1-3 getreaction" data-status="'+status+'" data-path="'+key+'" data-type="usage" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_USAGE_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-info"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_USAGE')+'</span></button>';
+	html += '<button class="uk-button uk-button-small uk-button-success uk-width-1-3 getreaction" data-status="'+status+'" data-path="'+key+'" data-type="description" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-sticky-note-o"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_DESCRIPTION')+'</span></button>';
+	html += '<button class="uk-button uk-button-small uk-button-success uk-width-1-3 getreaction" data-status="'+status+'" data-path="'+key+'" data-type="snippet" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_SNIPPET_OF_COMMUNITY_VERSION')+'"><i class="uk-icon-code"></i><span class="uk-hidden-small"> '+Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET')+'</span></button>';
+	html += '</div>';
+	// return data buttons
+	return html;
+}
+
+function setRefButtons(snippet, key, status, keyID) {
+	var html = '<div><a class="uk-button uk-button-mini uk-button-success uk-margin-small-bottom uk-width-1-1" href="'+snippet.url+'" target="_blank" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_SNIPPET_REFERENCE_URL')+'"><i class="uk-icon-external-link"></i> ' + snippet.name + '</a></div>';
+	// set the update button	
+	html += '<div>';
+	if ('equal' !== status) {
+		if ('new' === status) {
+			var tooltip = Joomla.JText._('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY');
+		} else {
+			var tooltip = Joomla.JText._('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_UPDATE_THE_LOCAL_VERSION');
+		}
+		html += '<button id="'+keyID+'-getbutton" class="uk-button uk-button-small uk-button-primary uk-width-1-1 uk-margin-small-bottom getreaction" data-status="'+status+'" data-path="'+key+'" data-type="get"  title="'+tooltip+'"><i class="uk-icon-cloud-download"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_GET_SNIPPET')+'</button>';
+	} else {
+		html += '<button class="uk-button uk-button-small uk-width-1-1 uk-margin-small-bottom" type="button" disabled title="'+Joomla.JText._('COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION')+'"><i class="uk-icon-check-square-o"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_LOCAL_SNIPPET')+'</button>';
+	}
+	html += '</div>';
+	// return data buttons
+	return html;
+}
+
+function setContributorButtons(snippet, key) {
+	// set the contributor name
+	if (snippet.contributor_company) {
+		var contributor_name = snippet.contributor_company;
+	} else if (snippet.contributor_name) {
+		var contributor_name = snippet.contributor_name;
+	} else {
+		var contributor_name = Joomla.JText._('COM_COMPONENTBUILDER_JCB_COMMUNITY');
+	}
+	// set the contributor url
+	if (snippet.contributor_website) {
+		var contributor_url = snippet.contributor_website;
+	} else if (snippet.contributor_email) {
+		var contributor_url = 'mailto:'+snippet.contributor_email;
+	} else {
+		var contributor_url = 'https://github.com/vdm-io/Joomla-Component-Builder-Snippets';
+	}
+	var html = '<div class="uk-button-group uk-width-1-1">';
+	html += '<button class="uk-button uk-button-primary uk-width-1-10 uk-button-mini getreaction" data-type="contributor" data-path="'+key+'" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_THE_CONTRIBUTOR_DETAILS')+'"><i class="uk-icon-user"></i></button>';
+	html += '<a  class="uk-button uk-button-primary uk-width-5-10 uk-button-mini" href="'+contributor_url+'" target="_blank"  title="'+Joomla.JText._('COM_COMPONENTBUILDER_LINK_TO_THE_CONTRIBUTOR')+'"><i class="uk-icon-external-link"></i> ' + contributor_name + '</a>';
+	html += '<a class="uk-button uk-button-primary uk-width-4-10 uk-button-mini" href="https://github.com/vdm-io/Joomla-Component-Builder-Snippets/blame/master/'+key+'" target="_blank" title="'+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_WHO_CONTRIBUTED_TO_THIS_SNIPPET')+'"><i class="uk-icon-external-link"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_VIEW_BLAME')+'</a>';
+	html += '</div>';
+	// return contributor buttons
+	return html;
+}
+
+// do a bulk update
+function checkBulkSnippetGithub() {
+	// check if there is new items
+	if (bulkItems.new.length === 0) {
+		jQuery('#bulk-button-new').prop('disabled', true);
+		jQuery('#bulk-button-new').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_NEW_SNIPPETS_AT_THIS_TIME'));
+		jQuery('#bulk-notice-new').show();
+	}
+	// check if there is diverged items
+	if (bulkItems.diverged.length === 0) {
+		jQuery('#bulk-button-diverged').prop('disabled', true);
+		jQuery('#bulk-button-diverged').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_DIVERGED_SNIPPETS_AT_THIS_TIME'));
+		jQuery('#bulk-notice-diverged').show();
+	}
+	// check if there is ahead items
+	if (bulkItems.ahead.length === 0) {
+		jQuery('#bulk-button-ahead').prop('disabled', true);
+		jQuery('#bulk-button-ahead').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_AHEAD_SNIPPETS_AT_THIS_TIME'));
+		jQuery('#bulk-notice-ahead').show();
+	}
+	// check if there is behind items
+	if (bulkItems.behind.length === 0) {
+		jQuery('#bulk-button-behind').prop('disabled', true);
+		jQuery('#bulk-button-behind').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_OUT_OF_DATE_SNIPPETS_AT_THIS_TIME'));
+		jQuery('#bulk-notice-behind').show();
+	}
+	// check if all we should close the all button
+	if (bulkItems.behind.length === 0 && bulkItems.new.length === 0 && bulkItems.ahead.length === 0 && bulkItems.diverged.length === 0) {
+		jQuery('#bulk-button-all').prop('disabled', true);
+		jQuery('#bulk-button-all').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_THERE_ARE_NO_SNIPPETS_TO_UPDATE_AT_THIS_TIME'));
+		jQuery('#bulk-notice-all').show();
+	}
+}
+
+// do a bulk update
+function bulkSnippetGithub(status) {
+	// if all then trigger those with values
+	if ('all' === status) {
+		bulkSnippetGithub('behind');
+		bulkSnippetGithub('new');
+		bulkSnippetGithub('ahead');
+		bulkSnippetGithub('diverged');
+	} else if (bulkItems[status].length > 0) {
+		jQuery.each(bulkItems[status], function(i, key){
+			setTimeout(function(){
+				doBulkUpdate_server(key, status).done(function(result) {
+					if (result.message) {
+						// only show errors
+						if ('error' === result.status || 'warning' === result.status) {
+							UIkit.notify(result.message, {status: result.status});
+						}
+						// update local items
+						if ('success' === result.status) {
+							// get key ID
+							var keyID = getKeyID(key);
+							// update snippet if we can
+							updateSnippetDisplay(keyID, 'equal');
+						}
+					} else {
+						UIkit.notify(Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET_COULD_NOT_BE_UPDATEDSAVED'), {status:'danger'});
+					}
+				});
+			}, 200);
+		});
+		// reset array
+		bulkItems[status].length = 0;
+		// update the buttons (since we only do the bulk update once)
+		checkBulkSnippetGithub();
+	}
+}
+
+function doBulkUpdate_server(path, status) {
+	// set the ajax scope
+	ajaxcall = null;
+	var getUrl = "index.php?option=com_[[[component]]]&task=ajax.setSnippetGithub&format=json";
+	if (token.length > 0 && path.length > 0 && status.length > 0) {
+		var request = 'token='+token+'&path='+path+'&status='+status;
+	}
+	return jQuery.ajax({
+		type: 'POST',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+// set the snippet from gitHub
+function setSnippetGithub(key, status) {
+	var message = getConfirmUpdate(status);
+	UIkit.modal.confirm(message, function(){
+		// will be executed on confirm.
+		setSnippetGithub_server(key, status).done(function(result) {
+			if (result.message) {
+				UIkit.notify(result.message, {status: result.status});
+				if ('success' === result.status) {
+					// get key ID
+					var keyID = getKeyID(key);
+					// update snippet if we can
+					updateSnippetDisplay(keyID, 'equal');
+				}
+			} else {
+				UIkit.notify(Joomla.JText._('COM_COMPONENTBUILDER_SNIPPET_COULD_NOT_BE_UPDATEDSAVED'), {status:'danger'});
+			}
+		});
+	});
+}
+
+function setSnippetGithub_server(path, status) {
+	// set the ajax scope
+	ajaxcall = null;
+	var getUrl = "index.php?option=com_[[[component]]]&task=ajax.setSnippetGithub&format=json";
+	if (token.length > 0 && path.length > 0 && status.length > 0) {
+		var request = 'token='+token+'&path='+path+'&status='+status;
+	}
+	return jQuery.ajax({
+		type: 'POST',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+// update the snippet display
+function updateSnippetDisplay(keyID, status) {
+	// update badge
+	jQuery('#'+keyID+'-badge').html('<i class="uk-icon-info"></i> ' +status);
+	jQuery('#'+keyID+'-badge').attr('href' , '#'+status+'-meaning');
+	// update button
+	if ('equal' === status) {
+		// update notice
+		jQuery('#'+keyID+'-getbutton').attr('title', Joomla.JText._('COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION'));
+		jQuery('#'+keyID+'-getbutton').prop('disabled', true);
+		jQuery('#'+keyID+'-getbutton').html('<i class="uk-icon-check-square-o"></i> ' + Joomla.JText._('COM_COMPONENTBUILDER_LOCAL_SNIPPET'));
+		// counter delay just incase
+		setTimeout(function(){
+			jQuery('#'+keyID+'-getbutton').prop('disabled', true);
+		}, 2000);
+	}
+	// update the data filter
+	jQuery('#'+keyID+'-panel').attr('data-uk-filter', status);
+	// tell the grid to update
+	jQuery('#snippets-grid').trigger('display.uk.check');
+}
+
+// set the modal
+function getSnippetModal(key, type) {
+	// set the ajax scope
+	ajaxcall = 'snippets';
+	var _snippet = jQuery.jStorage.get(key, null);
+	if (_snippet) {
+		// show modal
+		showSnippetModal(_snippet, type);
+	} else {
+		jQuery.get('https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder-Snippets/master/'+key)
+		.success(function(snippet) {
+			// convert the string to json.object
+			snippet = jQuery.parseJSON(snippet);
+			jQuery.jStorage.set(key, snippet, {TTL: expire});
+			// show modal
+			showSnippetModal(snippet, type);
+		})
+		.error(function(jqXHR, textStatus, errorThrown) { 
+			// we could do more
+		});
+	}
+}
+
+// show the modal
+function showSnippetModal(snippet, type) {
+	var html = '<div class="uk-modal-dialog uk-modal-dialog-lightbox">';
+	html += '<a href="" class="uk-modal-close uk-close uk-close-alt"></a>';
+	html += '<h3>' + snippet.library + ' - (' + snippet.type + ') ' + snippet.name + '</h3>';
+	if ('contributor' === type) {
+		html += '<dl class="uk-description-list-line">';
+		html += '<dt><i class="uk-icon-institution"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_COMPANY_NAME')+'</dt>';
+		html += '<dd>'+snippet.contributor_company+'</dd>';
+		html += '<dt><i class="uk-icon-user"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_NAME')+'</dt>';
+		html += '<dd>'+snippet.contributor_name+'</dd>';
+		html += '<dt><i class="uk-icon-envelope-o"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_EMAIL')+'</dt>';
+		html += '<dd>'+snippet.contributor_email+'</dd>';
+		html += '<dt><i class="uk-icon-laptop"></i> '+Joomla.JText._('COM_COMPONENTBUILDER_AUTHOR_WEBSITE')+'</dt>';
+		html += '<dd>'+snippet.contributor_website+'</dd>';
+		html += '</dl>';
+	} else {
+		html += '<br /><textarea class="uk-width-1-1" rows="15" readonly>'+snippet[type]+'</textarea>';
+	}
+	html += '<br /><small>C: ' + snippet.created + ' | M: ' + snippet.modified + '</small>';
+	html += '</div>';
+	// get current page position
+	var scroll = jQuery(window).scrollTop();
+	// add html to modal
+	var modal = UIkit.modal.blockUI(html, {center:true, bgclose:true}).on({
+		'hide.uk.modal': function(){
+			// scroll fix since the modal pops to the top of the page
+			jQuery(window).scrollTop(scroll);
+		}
+	});
+	// show modal
+	modal.show();
+}
+
+// get key ID
+function getKeyID(key) {
+	// get useful ID
+	var keyID = key.replace('-', '');
+	keyID = keyID.replace('.json', '');
+	keyID = keyID.replace(/\s+/ig, '-');
+	keyID = keyID.replace(/\(/g, '');
+	keyID = keyID.replace(/\)/g, '');
+	// return the id build
+	return keyID;
+}

admin/compiler/joomla_3/Helper_email.php

@@ -191,7 +191,6 @@ abstract class ###Component###Email
 		// load the bounce email as sender if set
 		if (!is_null($bounce_email))
 		{		
-		
 			$mail->Sender = $bounce_email;
 		}
 		

admin/compiler/joomla_3/JControllerLegacyHelp.php

@@ -51,7 +51,8 @@ class ###Component###ControllerHelp extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($user->id != 0 && $token == $call_token){
+		if($user->id != 0 && $token == $call_token)
+		{
 			$task = $this->getTask();
 			switch($task){
 				case 'getText':

admin/compiler/joomla_3/JControllerLegacyHelp_site.php

@@ -51,7 +51,8 @@ class ###Component###ControllerHelp extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($token == $call_token){
+		if($token == $call_token)
+		{
 			$task = $this->getTask();
 			switch($task){
 				case 'getText':

admin/compiler/joomla_3/JControllerLegacySITE.php

@@ -70,7 +70,6 @@ class ###Component###Controller extends JControllerLegacy
 				}
 				elseif (###Component###Helper::checkString($ref))
 				{
-
 					// redirect to ref
 					 $this->setRedirect(JRoute::_('index.php?option=com_###component###&view='.(string)$ref, false));
 				}

admin/compiler/joomla_3/settings.json

@@ -665,6 +665,11 @@
 					"path": "c0mp0n3nt/site/helpers",
 					"rename": "Helper_category_view",
 					"type": "category"
+				},
+				"viewFileSite.js": {
+					"path": "c0mp0n3nt/site/assets/js",
+					"rename": "viewFileSite",
+					"type": "javascript_file"
 				}
 			},
 			"custom_admin": {
@@ -731,6 +736,11 @@
 					"path": "c0mp0n3nt/admin/layouts",
 					"rename": "layout_custom_admin",
 					"type": "layout"
+				},
+				"viewFileCustomAdmin.js": {
+					"path": "c0mp0n3nt/admin/assets/js",
+					"rename": "viewFileCustomAdmin",
+					"type": "javascript_file"
 				}
 			}
 		}

admin/compiler/joomla_3/viewFile.js

@@ -0,0 +1,4 @@
+###BOM###
+
+/* JS Document */
+###ADMINJS###

admin/compiler/joomla_3/viewFileCustomAdmin.js

@@ -0,0 +1,4 @@
+###BOM###
+
+/* JS Document */
+###CUSTOM_ADMIN_JAVASCRIPT_FILE###

admin/compiler/joomla_3/viewFileSite.js

@@ -0,0 +1,4 @@
+###BOM###
+
+/* JS Document */
+###SITE_JAVASCRIPT_FILE###

admin/controllers/compiler.php

@@ -105,6 +105,7 @@ class ComponentbuilderControllerCompiler extends JControllerAdmin
 				$message .= '<ul>';
 				$message .= '<li>Total folders created: <b>'.$model->compiler->folderCount.'</b></li>';
 				$message .= '<li>Total files created: <b>'.$model->compiler->fileCount.'</b></li>';
+				$message .= '<li>Total fields created: <b>'.$model->compiler->fieldCount.'</b></li>';
 				$message .= '<li>Total lines written: <b>'.$model->compiler->lineCount.'</b></li>';
 				$message .= '<li>A4 Book of: <b>'.$model->compiler->pageCount.' pages</b></li>';
 				$message .= '</ul>';

admin/controllers/help.php

@@ -48,7 +48,8 @@ class ComponentbuilderControllerHelp extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($user->id != 0 && $token == $call_token){
+		if($user->id != 0 && $token == $call_token)
+		{
 			$task = $this->getTask();
 			switch($task){
 				case 'getText':

admin/controllers/snippets.php

@@ -150,12 +150,12 @@ class ComponentbuilderControllerSnippets extends JControllerAdmin
 				if (count($pks) > 1)
 				{
 					$message = '<h1>' . JText::_('COM_COMPONENTBUILDER_THE_SNIPPETS_WERE_SUCCESSFULLY_EXPORTED') . '</h1>';
-					$message .= '<p>' . JText::sprintf('To share these snippets with the rest of the JCB community,');
+					$message .= '<p>' . JText::sprintf('COM_COMPONENTBUILDER_TO_SHARE_THESE_SNIPPETS_WITH_THE_REST_OF_THE_JCB_COMMUNITY');
 				}
 				else
 				{
 					$message = '<h1>' . JText::_('COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED') . '</h1>';
-					$message .= '<p>' . JText::sprintf('To share this snippet with the rest of the JCB community,');
+					$message .= '<p>' . JText::sprintf('COM_COMPONENTBUILDER_TO_SHARE_THIS_SNIPPET_WITH_THE_REST_OF_THE_JCB_COMMUNITY');
 				}
 				$message .= JText::sprintf('COM_COMPONENTBUILDER_YOU_WILL_NEED_TO_KNOW_HOW_S_WORKS_BASIC_YOU_WILL_ALSO_NEED_A_S_ACCOUNT_AND_KNOW_HOW_TO_MAKE_A_PULL_REQUEST_ON_GITHUB', 
 					'<a href="https://try.github.io" target="_blank">git</a>',

admin/helpers/compiler.php

@@ -1,4 +1,5 @@
 <?php
+
 /* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
@@ -10,7 +11,7 @@
                                                       |_|
   /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -39,6 +40,7 @@ class Compiler extends Infusion
 	 * 
 	 * @var      string
 	 */
+
 	private $tempPath;
 
 	/*
@@ -49,7 +51,6 @@ class Compiler extends Infusion
 	private $time_start;
 	private $time_end;
 	public $secondsCompiled;
-	
 	public $filepath = '';
 	// fixed pathes
 	protected $dynamicIntegration = false;
@@ -112,11 +113,9 @@ class Compiler extends Infusion
 				{
 					foreach ($this->langNot as $tag => $percentage)
 					{
-						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated, you will need to translate %s&#37; of the language strings before it will be added.', 
+						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated, you will need to translate %s&#37; of the language strings before it will be added.', $tag, $percentage, $this->percentageLanguageAdd), 'Warning');
-									$tag, $percentage, $this->percentageLanguageAdd), 'Warning');
 					}
-					$this->app->enqueueMessage(JText::sprintf('<b>You can change this percentage of translated strings required in the global options of JCB.</b><br />Please watch this <a href=%s>tutorial for more help surrounding the JCB translations manager</a>.', 
+					$this->app->enqueueMessage(JText::sprintf('<b>You can change this percentage of translated strings required in the global options of JCB.</b><br />Please watch this <a href=%s>tutorial for more help surrounding the JCB translations manager</a>.', '"https://youtu.be/zzAcVkn_cWU?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE" target="_blank" title="JCB Tutorial surrounding Translation Manager"'), 'Notice');
-									'"https://youtu.be/zzAcVkn_cWU?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE" target="_blank" title="JCB Tutorial surrounding Translation Manager"'), 'Notice');
 				}
 				// set why the strings were added
 				$whyAddedLang = JText::sprintf('because more then %s&#37; of the strings have been translated.', $this->percentageLanguageAdd);
@@ -129,8 +128,7 @@ class Compiler extends Infusion
 				{
 					foreach ($this->langSet as $tag => $percentage)
 					{
-						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated. Was addeded %s', 
+						$this->app->enqueueMessage(JText::sprintf('The <b>%s</b> language has %s&#37; translated. Was addeded %s', $tag, $percentage, $whyAddedLang), 'Notice');
-									$tag, $percentage, $whyAddedLang), 'Notice');
 					}
 				}
 			}
@@ -146,6 +144,37 @@ class Compiler extends Infusion
 				// done with error
 				return false;
 			}
+			// do lang mismatch check
+			if (ComponentbuilderHelper::checkArray($this->langMismatch))
+			{
+				if (ComponentbuilderHelper::checkArray($this->langMatch))
+				{
+					$mismatch = array_diff(array_unique($this->langMismatch), array_unique($this->langMatch));
+				}
+				else
+				{
+					$mismatch = array_unique($this->langMismatch);
+				}
+				// set a notice if we have a mismatch
+				if (isset($mismatch) && ComponentbuilderHelper::checkArray($mismatch))
+				{
+					if (count($mismatch) > 1)
+					{
+						$this->app->enqueueMessage(JText::_('<h3>Please check the following mismatching Joomla.JText language constants.</h3>'), 'Warning');
+					}
+					else
+					{
+						$this->app->enqueueMessage(JText::_('<h3>Please check the following mismatch Joomla.JText language constant.</h3>'), 'Warning');
+					}
+					// add the mismatching issues
+					foreach ($mismatch as $string)
+					{
+						$constant = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
+						$this->app->enqueueMessage(JText::sprintf('The <b>Joomla.JText._(\'%s\')</b> language constant for (%s) does not have a corresponding JText::Script() decalaration.', $constant, $string), 'Warning');
+					}
+					$this->app->enqueueMessage('<hr />', 'Warning');
+				}
+			}
 			// end the timer here
 			$this->time_end = microtime(true);
 			$this->secondsCompiled = $this->time_end - $this->time_start;
@@ -396,6 +425,7 @@ class Compiler extends Infusion
 	{
 		// set some defaults
 		$this->fileContentStatic['###LINE_COUNT###'] = $this->lineCount;
+		$this->fileContentStatic['###FIELD_COUNT###'] = $this->fieldCount;
 		$this->fileContentStatic['###FILE_COUNT###'] = $this->fileCount;
 		$this->fileContentStatic['###FOLDER_COUNT###'] = $this->folderCount;
 		$this->fileContentStatic['###PAGE_COUNT###'] = $this->pageCount;
@@ -558,9 +588,7 @@ class Compiler extends Infusion
 		{
 			// reset each time per custom code
 			$fingerPrint = array();
-			if (isset($target['hashtarget'][0]) && $target['hashtarget'][0] > 3 
+			if (isset($target['hashtarget'][0]) && $target['hashtarget'][0] > 3 && isset($target['path']) && ComponentbuilderHelper::checkString($target['path']) && isset($target['hashtarget'][1]) && ComponentbuilderHelper::checkString($target['hashtarget'][1]))
-				&& isset($target['path']) && ComponentbuilderHelper::checkString($target['path'])
-				&& isset($target['hashtarget'][1]) && ComponentbuilderHelper::checkString($target['hashtarget'][1]))
 			{
 				$file = $this->componentPath . '/' . $target['path'];
 				$size = (int) $target['hashtarget'][0];
@@ -745,4 +773,5 @@ class Compiler extends Infusion
 
 		// any help to improve this is welcome...
 	}
+
 }

admin/helpers/compiler/a_Get.php

@@ -1,5 +1,6 @@
 <?php
-/**--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+
+/* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
    \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
@@ -31,6 +32,7 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Get
 {
+
 	/**
 	 * The app
 	 * 
@@ -218,6 +220,32 @@ class Get
 	 */
 	protected $existingLangStrings = array();
 
+	/**
+	 * The Language JS matching check
+	 * 
+	 * @var      array
+	 */
+	public $langMismatch = array();
+
+	/**
+	 * The Language SC matching check
+	 * 
+	 * @var      array
+	 */
+	public $langMatch = array();
+
+	/**
+	 * The Language string targets
+	 * 
+	 * @var      array
+	 */
+	public $langStringTargets = array(
+		'Joomla.JText._(',
+		'JText::script(',
+		'JText::_(',
+		'JText::sprintf('
+	);
+
 	/**
 	 * The Component Code Name
 	 * 
@@ -529,6 +557,7 @@ class Get
 	/*	 * *
 	 * Constructor
 	 */
+
 	public function __construct($config = array())
 	{
 		if (isset($config) && count($config))
@@ -576,8 +605,7 @@ class Get
 					$this->componentData->component_version = '1.0.0';
 				}
 				// update the version
-				if (!isset($this->componentData->old_component_version) 
+				if (!isset($this->componentData->old_component_version) && (ComponentbuilderHelper::checkArray($this->addSQL) || ComponentbuilderHelper::checkArray($this->updateSQL)))
-					&& (ComponentbuilderHelper::checkArray($this->addSQL) || ComponentbuilderHelper::checkArray($this->updateSQL)))
 				{
 					// set the new version
 					$version = (array) explode('.', $this->componentData->component_version);
@@ -647,8 +675,7 @@ class Get
 				'f.sql_tweak',
 				'e.version_update',
 				'e.id'
-					), 
+				), array(
-				array(
 				'addadmin_views',
 				'addadmin_views_id',
 				'addconfig',
@@ -774,10 +801,11 @@ class Get
 		if (ComponentbuilderHelper::checkArray($component->sql_tweak))
 		{
 			// build the tweak settings
-			$this->setSqlTweaking(array_map(function($array) {
+			$this->setSqlTweaking(array_map(function($array)
-				return array_map(function($value) {
+				{
-					if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value)
+					return array_map(function($value)
-						&& strval($value) === strval(intval($value)))
+					{
+						if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value) && strval($value) === strval(intval($value)))
 						{
 							return (int) $value;
 						}
@@ -809,10 +837,11 @@ class Get
 				return 1;
 			});
 			// build the admin_views settings
-			$component->admin_views = array_map(function($array) {
+			$component->admin_views = array_map(function($array)
-				$array = array_map(function($value) {
+			{
-					if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value)
+				$array = array_map(function($value)
-						&& strval($value) === strval(intval($value)))
+				{
+					if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value) && strval($value) === strval(intval($value)))
 					{
 						return (int) $value;
 					}
@@ -844,13 +873,14 @@ class Get
 			$this->lang = 'site';
 			$this->target = 'site';
 			// build the site_views settings
-			$component->site_views = array_map(function($array) {
+			$component->site_views = array_map(function($array)
+			{
 				// has become a lacacy issue, can't remove this
 				$array['view'] = $array['siteview'];
 				$array['settings'] = $this->getCustomViewData($array['view']);
-				return array_map(function($value) {
+				return array_map(function($value)
-					if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value)
+				{
-						&& strval($value) === strval(intval($value)))
+					if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value) && strval($value) === strval(intval($value)))
 					{
 						return (int) $value;
 					}
@@ -868,13 +898,14 @@ class Get
 			$this->lang = 'admin';
 			$this->target = 'custom_admin';
 			// build the custom_admin_views settings
-			$component->custom_admin_views = array_map(function($array) {
+			$component->custom_admin_views = array_map(function($array)
+			{
 				// has become a lacacy issue, can't remove this
 				$array['view'] = $array['customadminview'];
 				$array['settings'] = $this->getCustomViewData($array['view'], 'custom_admin_view');
-				return array_map(function($value) {
+				return array_map(function($value)
-					if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value)
+				{
-						&& strval($value) === strval(intval($value)))
+					if (!ComponentbuilderHelper::checkArray($value) && !ComponentbuilderHelper::checkObject($value) && strval($value) === strval(intval($value)))
 					{
 						return (int) $value;
 					}
@@ -889,7 +920,8 @@ class Get
 		$component->addconfig = (isset($component->addconfig) && ComponentbuilderHelper::checkJson($component->addconfig)) ? json_decode($component->addconfig, true) : null;
 		if (ComponentbuilderHelper::checkArray($component->addconfig))
 		{
-			$component->config = array_map(function($array) {
+			$component->config = array_map(function($array)
+			{
 				$array['alias'] = 0;
 				$array['title'] = 0;
 				$array['settings'] = $this->getFieldData($array['field']);
@@ -1075,7 +1107,8 @@ class Get
 		$component->dashboard_tab = (isset($component->dashboard_tab) && ComponentbuilderHelper::checkJson($component->dashboard_tab)) ? json_decode($component->dashboard_tab, true) : null;
 		if (ComponentbuilderHelper::checkArray($component->dashboard_tab))
 		{
-			$component->dashboard_tab = array_map( function($array) {
+			$component->dashboard_tab = array_map(function($array)
+			{
 				$array['html'] = $this->setDynamicValues($array['html']);
 				return $array;
 			}, array_values($component->dashboard_tab));
@@ -1161,8 +1194,7 @@ class Get
 					'b.id',
 					'c.addconditions',
 					'c.id'
-						), 
+					), array(
-					array(
 					'addfields',
 					'addfields_id',
 					'addconditions',
@@ -1287,7 +1319,8 @@ class Get
 				if (ComponentbuilderHelper::checkArray($view->addfields))
 				{
 					// load the field data
-					$view->fields = array_map( function($array) use($name_single, $name_list){
+					$view->fields = array_map(function($array) use($name_single, $name_list)
+					{
 						$array['settings'] = $this->getFieldData($array['field'], $name_single, $name_list);
 						return $array;
 					}, array_values($view->addfields));
@@ -1720,7 +1753,7 @@ class Get
 		// set the custom_get data
 		$view->custom_get = $this->setGetData(json_decode($view->custom_get, true), $view->code);
 		// set array adding array of scripts
-		$addArray = array('php_view','php_jview','php_jview_display','php_document','js_document','css_document','css');
+		$addArray = array('php_view', 'php_jview', 'php_jview_display', 'php_document', 'javascript_file', 'js_document', 'css_document', 'css');
 		foreach ($addArray as $scripter)
 		{
 			if (isset($view->{'add_' . $scripter}) && $view->{'add_' . $scripter} == 1 && ComponentbuilderHelper::checkString($view->$scripter))
@@ -1773,18 +1806,6 @@ class Get
 						$this->getModule[$this->target][$view->code] = true;
 					}
 				}
-				// (TODO) we may want to automate this .... lets see if someone asks
-//				if (strpos($view->$scripter,"token") !== false || strpos($view->$scripter,"task=ajax") !== false)
-//				{
-//					if(!isset($this->customScriptBuilder['token']))
-//					{
-//						$this->customScriptBuilder['token'] = array();
-//					}
-//					if (!isset($this->customScriptBuilder['token'][$this->target.$view->code]) || !$this->customScriptBuilder['token'][$this->target.$view->code])
-//					{
-//						$this->customScriptBuilder['token'][$this->target.$view->code] = true;
-//					}
-//				}
 			}
 		}
 		// add_Ajax for this view
@@ -2078,8 +2099,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target . '_php_before_getitem'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_before_getitem'][$view_code] .= 
+							$this->customScriptBuilder[$this->target . '_php_before_getitem'][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->php_before_getitem));
-								$this->setDynamicValues(PHP_EOL.PHP_EOL.base64_decode($result->php_before_getitem));
 							unset($result->php_before_getitem);
 						}
 						// add php custom scripting (php_after_getitem)
@@ -2089,8 +2109,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target . '_php_after_getitem'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_after_getitem'][$view_code] .= 
+							$this->customScriptBuilder[$this->target . '_php_after_getitem'][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->php_after_getitem));
-								$this->setDynamicValues(PHP_EOL.PHP_EOL.base64_decode($result->php_after_getitem));
 							unset($result->php_after_getitem);
 						}
 						// add php custom scripting (php_before_getitems)
@@ -2100,8 +2119,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target . '_php_before_getitems'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_before_getitems'][$view_code] .= 
+							$this->customScriptBuilder[$this->target . '_php_before_getitems'][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->php_before_getitems));
-								$this->setDynamicValues(PHP_EOL.PHP_EOL.base64_decode($result->php_before_getitems));
 							unset($result->php_before_getitems);
 						}
 						// add php custom scripting (php_after_getitems)
@@ -2111,8 +2129,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target . '_php_after_getitems'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_after_getitems'][$view_code] .= 
+							$this->customScriptBuilder[$this->target . '_php_after_getitems'][$view_code] .= $this->setDynamicValues(PHP_EOL . PHP_EOL . base64_decode($result->php_after_getitems));
-								$this->setDynamicValues(PHP_EOL.PHP_EOL.base64_decode($result->php_after_getitems));
 							unset($result->php_after_getitems);
 						}
 						// add php custom scripting (php_getlistquery)
@@ -2122,8 +2139,7 @@ class Get
 							{
 								$this->customScriptBuilder[$this->target . '_php_getlistquery'][$view_code] = '';
 							}
-							$this->customScriptBuilder[$this->target.'_php_getlistquery'][$view_code] .= 
+							$this->customScriptBuilder[$this->target . '_php_getlistquery'][$view_code] .= $this->setDynamicValues(PHP_EOL . base64_decode($result->php_getlistquery));
-								$this->setDynamicValues(PHP_EOL.base64_decode($result->php_getlistquery));
 							unset($result->php_getlistquery);
 						}
 						// set the getmethod code name
@@ -2173,8 +2189,7 @@ class Get
 									// get the join field values
 									$join_field = array(); // array(join_field_as, join_field) 
 									$join_field = array_map('trim', explode('.', $option['join_field']));
-									$option['selection'] =
+									$option['selection'] = $this->setDataSelection($result->key, $view_code, $option['selection'], $option['view_table'], $option['as'], $option['row_type'], 'view');
-									$this->setDataSelection($result->key, $view_code, $option['selection'], $option['view_table'], $option['as'], $option['row_type'], 'view');
 									$option['key'] = $result->key;
 									// load to the getters
 									if ($option['row_type'] == 1)
@@ -2220,8 +2235,7 @@ class Get
 									// get the join field values
 									$join_field = array(); // array(join_field_as, join_field) 
 									$join_field = array_map('trim', explode('.', $option1['join_field']));
-									$option1['selection'] =
+									$option1['selection'] = $this->setDataSelection($result->key, $view_code, $option1['selection'], $option1['db_table'], $option1['as'], $option1['row_type'], 'db');
-									$this->setDataSelection($result->key, $view_code, $option1['selection'], $option1['db_table'], $option1['as'], $option1['row_type'], 'db');
 									$option1['key'] = $result->key;
 									// load to the getters
 									if ($option1['row_type'] == 1)
@@ -2375,7 +2389,6 @@ class Get
 				{
 					// remove all sql dump options
 					$this->sqlTweak[(int) $setting['adminview']]['remove'] = true;
-					
 				}
 			}
 		}
@@ -2395,8 +2408,7 @@ class Get
 	protected function setUpdateSQL($old, $new, $type, $key = null)
 	{
 		// check if there were new items added
-		if (ComponentbuilderHelper::checkArray($new) 
+		if (ComponentbuilderHelper::checkArray($new) && ComponentbuilderHelper::checkArray($old))
-			&& ComponentbuilderHelper::checkArray($old))
 		{
 			// check if this is old repeatable field
 			if (isset($new[$type]))
@@ -2501,9 +2513,7 @@ class Get
 				}
 			}
 		}
-		elseif ($key && ComponentbuilderHelper::checkString($new) 
+		elseif ($key && ComponentbuilderHelper::checkString($new) && ComponentbuilderHelper::checkString($old) && $new !== $old)
-			&& ComponentbuilderHelper::checkString($old)
-			&& $new !== $old)
 		{
 			// the string changed, lets add to SQL update
 			if (!isset($this->updateSQL[$type]) || !ComponentbuilderHelper::checkArray($this->updateSQL[$type]))
@@ -2744,7 +2754,8 @@ class Get
 		}
 		// set  the layout data
 		$lay1 = ComponentbuilderHelper::getAllBetween($default, "JLayoutHelper::render('", "',");
-		$lay2 = ComponentbuilderHelper::getAllBetween($default, 'JLayoutHelper::render("','",');;
+		$lay2 = ComponentbuilderHelper::getAllBetween($default, 'JLayoutHelper::render("', '",');
+		;
 		if (ComponentbuilderHelper::checkArray($lay1) && ComponentbuilderHelper::checkArray($lay2))
 		{
 			$layouts = array_merge($lay1, $lay2);
@@ -2974,8 +2985,7 @@ class Get
 					'c.addfolders',
 					'c.addurls',
 					'a.php_setdocument'
-						), 
+					), array(
-					array(
 					'id',
 					'name',
 					'how',
@@ -3050,7 +3060,8 @@ class Get
 					$library->addconfig = (isset($library->addconfig) && ComponentbuilderHelper::checkJson($library->addconfig)) ? json_decode($library->addconfig, true) : null;
 					if (ComponentbuilderHelper::checkArray($library->addconfig))
 					{
-						$library->config = array_map(function($array) {
+						$library->config = array_map(function($array)
+						{
 							$array['alias'] = 0;
 							$array['title'] = 0;
 							$array['settings'] = $this->getFieldData($array['field']);
@@ -3109,18 +3120,64 @@ class Get
 	 */
 	public function setLangStrings($content)
 	{
-		// first check if we should continue
+		// get targets to search for
-		if (strpos($content, 'JText::_(') !== false || strpos($content, 'JText::sprintf(') !== false)
+		$langStringTargets = array_filter(
+			$this->langStringTargets, function($get) use($content)
+		{
+			if (strpos($content, $get) !== false)
+			{
+				return true;
+			}
+			return false;
+		});
+		// check if we should continue
+		if (ComponentbuilderHelper::checkArray($langStringTargets))
 		{
 			// insure string is not broken
 			$content = str_replace('COM_###COMPONENT###', $this->langPrefix, $content);
+			// first get the Joomla.JText._()
+			if (in_array('Joomla.JText._(', $langStringTargets))
+			{
+				$jsTEXT[] = ComponentbuilderHelper::getAllBetween($content, "Joomla.JText._('", "'");
+				$jsTEXT[] = ComponentbuilderHelper::getAllBetween($content, 'Joomla.JText._("', '"');
+				// combine into one array
+				$jsTEXT = ComponentbuilderHelper::mergeArrays($jsTEXT);
+				// we need to add a check to insure these JavaScript lang matchup
+				if (ComponentbuilderHelper::checkArray($jsTEXT)) //<-- not really needed hmmm
+				{
+					// load the JS text to mismatch array
+					$langCheck[] = $jsTEXT;
+					$this->langMismatch = ComponentbuilderHelper::mergeArrays(array($jsTEXT, $this->langMismatch));
+				}
+			}
+			// now get the JText::script()
+			if (in_array('JText::script(', $langStringTargets))
+			{
+				$scTEXT[] = ComponentbuilderHelper::getAllBetween($content, "JText::script('", "'");
+				$scTEXT[] = ComponentbuilderHelper::getAllBetween($content, 'JText::script("', '"');
+				// combine into one array
+				$scTEXT = ComponentbuilderHelper::mergeArrays($scTEXT);
+				// we need to add a check to insure these JavaScript lang matchup
+				if (ComponentbuilderHelper::checkArray($scTEXT)) //<-- not really needed hmmm
+				{
+					// load the Script text to match array
+					$langCheck[] = $scTEXT;
+					$this->langMatch = ComponentbuilderHelper::mergeArrays(array($scTEXT, $this->langMatch));
+				}
+			}
 			// set language data
-			$langCheck[] = ComponentbuilderHelper::getAllBetween($content, "JText::_('","'");
+			foreach ($langStringTargets as $langStringTarget)
-			$langCheck[] = ComponentbuilderHelper::getAllBetween($content, 'JText::_("','"');
+			{
-			$langCheck[] = ComponentbuilderHelper::getAllBetween($content, "JText::sprintf('","'");
+				// need some special treatment here
-			$langCheck[] = ComponentbuilderHelper::getAllBetween($content, 'JText::sprintf("','"');
+				if ($langStringTarget === 'Joomla.JText._(' || $langStringTarget === 'JText::script(')
+				{
+					continue;
+				}
+				$langCheck[] = ComponentbuilderHelper::getAllBetween($content, $langStringTarget . "'", "'");
+				$langCheck[] = ComponentbuilderHelper::getAllBetween($content, $langStringTarget . '"', '"');
+			}
 			$langArray = ComponentbuilderHelper::mergeArrays($langCheck);
-			if (ComponentbuilderHelper::checkArray($langArray))
+			if (ComponentbuilderHelper::checkArray($langArray)) //<-- not really needed hmmm
 			{
 				foreach ($langArray as $string)
 				{
@@ -3135,10 +3192,12 @@ class Get
 					{
 						$this->langContent[$this->lang][$keyLang] = trim($string);
 					}
-					$langHolders["JText::_('".$string."')"] = "JText::_('".$keyLang."')";
+					// load the language targets
-					$langHolders['JText::_("'.$string.'")'] = 'JText::_("'.$keyLang.'")';
+					foreach ($langStringTargets as $langStringTarget)
-					$langHolders["JText::sprintf('".$string."',"] = "JText::sprintf('".$keyLang."',";
+					{
-					$langHolders['JText::sprintf("'.$string.'",'] = 'JText::sprintf("'.$keyLang.'",';
+						$langHolders[$langStringTarget . "'" . $string . "'"] = $langStringTarget . "'" . $keyLang . "'";
+						$langHolders[$langStringTarget . '"' . $string . '"'] = $langStringTarget . '"' . $keyLang . '"';
+					}
 				}
 				// only continue if we have value to replace
 				if (isset($langHolders) && ComponentbuilderHelper::checkArray($langHolders))
@@ -3261,7 +3320,6 @@ class Get
 		$query->where($this->db->quoteName('a.id') . ' = ' . (int) $id);
 		$this->db->setQuery($query);
 		return ComponentbuilderHelper::safeString($this->db->loadResult());
-
 	}
 
 	/**
@@ -3817,7 +3875,10 @@ class Get
 		if (ComponentbuilderHelper::checkArray($values))
 		{
 			$query->select($this->db->quoteName(array('a.id', 'a.translation', 'a.entranslation', 'a.components', 'a.published')));
-			$query->where($this->db->quoteName('a.entranslation') . ' IN (' . implode(',',array_map(function($a){ return $this->db->quote($a); }, $values)) . ')');
+			$query->where($this->db->quoteName('a.entranslation') . ' IN (' . implode(',', array_map(function($a)
+					{
+						return $this->db->quote($a);
+					}, $values)) . ')');
 			$this->db->setQuery($query);
 			$this->db->execute();
 			if ($this->db->getNumRows())
@@ -3855,8 +3916,7 @@ class Get
 						$this->multiLangString[$string]['translation'] = json_decode($this->multiLangString[$string]['translation'], true);
 					}
 					// if we have an array continue
-					if (isset($this->multiLangString[$string]['translation']) 
+					if (isset($this->multiLangString[$string]['translation']) && ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']))
-						&& ComponentbuilderHelper::checkArray($this->multiLangString[$string]['translation']))
 					{
 						// great lets build the multi languages strings
 						foreach ($this->multiLangString[$string]['translation'] as $translations)
@@ -4061,7 +4121,10 @@ class Get
 		$query->from($this->db->quoteName('#__componentbuilder_language_translation', 'a'));
 		$query->select($this->db->quoteName(array('a.id', 'a.translation', 'a.components')));
 		// get all string that are not linked to this component
-		$query->where($this->db->quoteName('a.entranslation') . ' NOT IN (' . implode(',',array_map(function($a){ return $this->db->quote($a); }, $values)) . ')');
+		$query->where($this->db->quoteName('a.entranslation') . ' NOT IN (' . implode(',', array_map(function($a)
+				{
+					return $this->db->quote($a);
+				}, $values)) . ')');
 		$query->where($this->db->quoteName('a.published') . ' = 1');
 		$this->db->setQuery($query);
 		$this->db->execute();
@@ -4609,7 +4672,6 @@ class Get
 							// de activate the reader
 							$reading[$targetKey] = false;
 							$reader = 0;
-							
 						}
 						// reset found comment type
 						$commentType = 0;
@@ -4772,21 +4834,33 @@ class Get
 	 */
 	protected function setReverseLangPlaceholders($updateString, $string)
 	{
-		if (strpos($string, 'JText::_(') !== false || strpos($string, 'JText::sprintf(') !== false)
+		// get targets to search for
+		$langStringTargets = array_filter(
+			$this->langStringTargets, function($get) use($string)
+		{
+			if (strpos($string, $get) !== false)
+			{
+				return true;
+			}
+			return false;
+		});
+		// check if we should continue
+		if (ComponentbuilderHelper::checkArray($langStringTargets))
 		{
 			$langHolders = array();
 			// set the lang for both since we don't know what area is being targeted
 			$_tmp = $this->lang;
 			$this->lang = 'both';
 			// set language data
-			$langCheck[] = ComponentbuilderHelper::getAllBetween($string, "JText::_('","'");
+			foreach ($langStringTargets as $langStringTarget)
-			$langCheck[] = ComponentbuilderHelper::getAllBetween($string, 'JText::_("','"');
+			{
-			$langCheck[] = ComponentbuilderHelper::getAllBetween($string, "JText::sprintf('","'");
+				$langCheck[] = ComponentbuilderHelper::getAllBetween($string, $langStringTarget . "'", "'");
-			$langCheck[] = ComponentbuilderHelper::getAllBetween($string, 'JText::sprintf("','"');
+				$langCheck[] = ComponentbuilderHelper::getAllBetween($string, $langStringTarget . "'", "'");
+			}
 			// merge arrays
 			$langArray = ComponentbuilderHelper::mergeArrays($langCheck);
 			// continue only if strings were found
-			if (ComponentbuilderHelper::checkArray($langArray))
+			if (ComponentbuilderHelper::checkArray($langArray)) //<-- not really needed hmmm
 			{
 				foreach ($langArray as $lang)
 				{
@@ -4803,10 +4877,11 @@ class Get
 						$this->langContent[$this->lang][$keyLang] = trim($lang);
 					}
 					// reverse the placeholders
-					$langHolders["JText::_('".$keyLang."')"] = "JText::_('".$lang."')";
+					foreach ($langStringTargets as $langStringTarget)
-					$langHolders['JText::_("'.$keyLang.'")'] = 'JText::_("'.$lang.'")';
+					{
-					$langHolders["JText::sprintf('".$keyLang."',"] = "JText::sprintf('".$lang."',";
+						$langHolders[$langStringTarget . "'" . $keyLang . "'"] = $langStringTarget . "'" . $lang . "'";
-					$langHolders['JText::sprintf("'.$keyLang.'",'] = 'JText::sprintf("'.$lang.'",';
+						$langHolders[$langStringTarget . '"' . $keyLang . '"'] = $langStringTarget . '"' . $lang . '"';
+					}
 				}
 				// return the found placeholders
 				$updateString = $this->setPlaceholders($updateString, $langHolders);
@@ -4990,4 +5065,5 @@ class Get
 		}
 		return false;
 	}
+
 }

admin/helpers/compiler/b_Structure.php

@@ -1,5 +1,6 @@
 <?php
-/**--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+
+/* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
    \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
@@ -10,7 +11,7 @@
                                                       |_|
   /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -31,6 +32,7 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Structure extends Get
 {
+
 	/**
 	 * The foulder counter
 	 * 
@@ -59,6 +61,13 @@ class Structure extends Get
 	 */
 	public $lineCount = 0;
 
+	/**
+	 * The field counter
+	 * 
+	 * @var     int
+	 */
+	public $fieldCount = 0;
+
 	/**
 	 * The seconds counter
 	 * 
@@ -492,7 +501,8 @@ class Structure extends Get
 					{
 						foreach ($library->config as $cofig)
 						{
-							$found = array_filter($this->componentData->config, function($item) use($cofig) {
+							$found = array_filter($this->componentData->config, function($item) use($cofig)
+							{
 								return $item['field'] == $cofig['field'];
 							});
 							// set the config data if not found
@@ -874,9 +884,7 @@ class Structure extends Get
 	public function getLastModifiedDate($view)
 	{
 		// first set the main date
-		if (isset($view['settings']->modified) 
+		if (isset($view['settings']->modified) && ComponentbuilderHelper::checkString($view['settings']->modified) && '0000-00-00 00:00:00' !== $view['settings']->modified)
-			&& ComponentbuilderHelper::checkString($view['settings']->modified) 
-			&& '0000-00-00 00:00:00' !== $view['settings']->modified)
 		{
 			$date = strtotime($view['settings']->modified);
 		}
@@ -896,9 +904,7 @@ class Structure extends Get
 				{
 					foreach ($view['settings']->fields as $field)
 					{
-						if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']) 
+						if (isset($field['settings']) && ComponentbuilderHelper::checkObject($field['settings']) && isset($field['settings']->modified) && ComponentbuilderHelper::checkString($field['settings']->modified) && '0000-00-00 00:00:00' !== $field['settings']->modified)
-							&& isset($field['settings']->modified) && ComponentbuilderHelper::checkString($field['settings']->modified) 
-							&& '0000-00-00 00:00:00' !== $field['settings']->modified)
 						{
 							$anotherDate = strtotime($field['settings']->modified);
 							if ($anotherDate > $date)
@@ -916,9 +922,7 @@ class Structure extends Get
 			// now check if value has been set
 			if (!isset($this->lastModifiedDate[$id]))
 			{
-				if (isset($view['settings']->main_get->modified)
+				if (isset($view['settings']->main_get->modified) && ComponentbuilderHelper::checkString($view['settings']->main_get->modified) && '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
-					&& ComponentbuilderHelper::checkString($view['settings']->main_get->modified) 
-					&& '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
 				{
 					$anotherDate = strtotime($view['settings']->main_get->modified);
 					if ($anotherDate > $date)
@@ -934,9 +938,7 @@ class Structure extends Get
 			// now check if value has been set
 			if (!isset($this->lastModifiedDate[$id]))
 			{
-				if (isset($view['settings']->main_get->modified)
+				if (isset($view['settings']->main_get->modified) && ComponentbuilderHelper::checkString($view['settings']->main_get->modified) && '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
-					&& ComponentbuilderHelper::checkString($view['settings']->main_get->modified) 
-					&& '0000-00-00 00:00:00' !== $view['settings']->main_get->modified)
 				{
 					$anotherDate = strtotime($view['settings']->main_get->modified);
 					if ($anotherDate > $date)

admin/helpers/compiler/c_Fields.php

@@ -1,5 +1,6 @@
 <?php
-/**--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+
+/* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
    \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
@@ -10,7 +11,7 @@
                                                       |_|
   /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -31,12 +32,12 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Fields extends Structure
 {
+
 	/**
 	 * Metadate Switch
 	 * 
 	 * @var    array
 	 */
-
 	public $metadataBuilder = array();
 
 	/**
@@ -497,6 +498,8 @@ class Fields extends Structure
 				);
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// if created is not set
 			if (!isset($this->fieldsNames[$viewName]['created']))
@@ -514,6 +517,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// if created_by is not set
 			if (!isset($this->fieldsNames[$viewName]['created_by']))
@@ -528,6 +533,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " User Created Field. Type: User (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// if published is not set
 			if (!isset($this->fieldsNames[$viewName]['published']))
@@ -541,6 +548,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Published Field. Type: List (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 				foreach (array('JPUBLISHED' => 1, 'JUNPUBLISHED' => 0, 'JARCHIVED' => 2, 'JTRASHED' => -2) as $text => $value)
 				{
 					$optionXML = $fieldXML->addChild('option');
@@ -565,6 +574,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// if modified_by is not set
 			if (!isset($this->fieldsNames[$viewName]['modified_by']))
@@ -581,6 +592,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// check if view has access
 			if (isset($this->accessBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName]) && !isset($this->fieldsNames[$viewName]['access']))
@@ -597,6 +610,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// if ordering is not set
 			if (!isset($this->fieldsNames[$viewName]['ordering']))
@@ -615,6 +630,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// if version is not set
 			if (!isset($this->fieldsNames[$viewName]['version']))
@@ -632,6 +649,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Version Field. Type: Text (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
@@ -648,6 +667,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 				// metadesc
 				$attributes['name'] = 'metadesc';
 				$attributes['label'] = 'JFIELD_META_DESCRIPTION_LABEL';
@@ -655,6 +676,8 @@ class Fields extends Structure
 				$this->xmlComment($fieldSetXML, $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla)");
 				$fieldXML = $fieldSetXML->addChild('field');
 				$this->xmlAddAttributes($fieldXML, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// load the dynamic fields now
 			if (count($dynamicFieldsXML))
@@ -685,6 +708,8 @@ class Fields extends Structure
 					'description' => 'JFIELD_METADATA_ROBOTS_DESC'
 				);
 				$this->xmlAddAttributes($robots, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 				$options = array(
 					'JGLOBAL_USE_GLOBAL' => '',
 					'JGLOBAL_INDEX_FOLLOW' => 'index, follow',
@@ -709,6 +734,8 @@ class Fields extends Structure
 					'size' => 20
 				);
 				$this->xmlAddAttributes($author, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 				// rights
 				$this->xmlComment($fieldsFieldSetXML, $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla)");
 				$rights = $fieldsFieldSetXML->addChild('field');
@@ -723,6 +750,8 @@ class Fields extends Structure
 					'rows' => 2
 				);
 				$this->xmlAddAttributes($rights, $attributes);
+				// count the static field created
+				$this->fieldCount++;
 			}
 			// just to be safe, lets clear the view placeholders
 			$this->clearFromPlaceHolders('view');
@@ -1797,7 +1826,6 @@ class Fields extends Structure
 		return $name;
 	}
 
-	
 	/**
 	 * set Builders
 	 *
@@ -2342,7 +2370,8 @@ class Fields extends Structure
 	public function xmlAppend(&$xml, $node)
 	{
 		if (!$node)
-		{ // element was not returned
+		{
+			// element was not returned
 			return;
 		}
 		switch (get_class($node))
@@ -2364,6 +2393,8 @@ class Fields extends Structure
 				$xml = simplexml_import_dom($domXML);
 				break;
 		}
+		// count the dynamic fields created
+		$this->fieldCount++;
 	}
 
 	/**

admin/helpers/compiler/e_Interpretation.php

@@ -1,4 +1,5 @@
 <?php
+
 /* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
@@ -10,7 +11,7 @@
                                                       |_|
   /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -31,6 +32,7 @@ defined('_JEXEC') or die('Restricted access');
  */
 class Interpretation extends Fields
 {
+
 	/**
 	 * The contributors
 	 * 
@@ -184,7 +186,6 @@ class Interpretation extends Fields
 	 * @var    array
 	 */
 	protected $hasIdRequest = array();
-	
 	protected $libwarning = array();
 
 	/**
@@ -743,7 +744,6 @@ class Interpretation extends Fields
 			// update the component with the new dynamic SQL
 			$modelJ = ComponentbuilderHelper::getModel('joomla_component');
 			$modelJ->save($newJ); // <-- to insure the history is also updated
-
 			// reset the watch here
 			$this->getHistoryWatch('joomla_component', $this->componentID);
 
@@ -818,8 +818,7 @@ class Interpretation extends Fields
 		}
 		// add dynamic SQL
 		$force = false;
-		if ($addDynamicSQL && ComponentbuilderHelper::checkArray($this->updateSQLBuilder)
+		if ($addDynamicSQL && ComponentbuilderHelper::checkArray($this->updateSQLBuilder) && (isset($this->componentData->old_component_version) && $this->componentData->old_component_version == $update['version']))
-			&& (isset($this->componentData->old_component_version) && $this->componentData->old_component_version == $update['version']))
 		{
 			$searchMySQL = preg_replace('/\s+/', '', $update['mysql']);
 			// add the updates to the SQL only if not found
@@ -1662,7 +1661,8 @@ class Interpretation extends Fields
 			if (strpos($get['selection']['select'], $field) !== false)
 			{
 				// build decoder string
-				if(!$runplugins) {
+				if (!$runplugins)
+				{
 					$runplugins = PHP_EOL . $tab . "\t//" . $this->setLine(__LINE__) . " Load the JEvent Dispatcher";
 					$runplugins .= PHP_EOL . $tab . "\tJPluginHelper::importPlugin('content');";
 					$runplugins .= PHP_EOL . $tab . "\t" . '$this->_dispatcher = JEventDispatcher::getInstance();';
@@ -1914,7 +1914,6 @@ class Interpretation extends Fields
 				if (is_numeric($whe['value_key']))
 				{
 					$value = " " . $whe['value_key'] . "');";
-
 				}
 				elseif (strpos($whe['value_key'], '$') !== false)
 				{
@@ -1962,7 +1961,6 @@ class Interpretation extends Fields
 						$string .= PHP_EOL . "\t" . $tabe . "\t{";
 						$string .= PHP_EOL . "\t" . $tabe . "\t\treturn false;";
 						$string .= PHP_EOL . "\t" . $tabe . "\t}";
-
 					}
 					else
 					{
@@ -2899,17 +2897,17 @@ class Interpretation extends Fields
 			{
 				// for single views
 				$method .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Initialise variables.";
-				$method .= PHP_EOL."\t\t\$this->item\t= \$this->get('Item');";
+				$method .= PHP_EOL . "\t\t\$this->item = \$this->get('Item');";
 			}
 			elseif ($view['settings']->main_get->gettype == 2)
 			{
 				// for list views
 				$method .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Initialise variables.";
-				$method .= PHP_EOL."\t\t\$this->items\t= \$this->get('Items');";
+				$method .= PHP_EOL . "\t\t\$this->items = \$this->get('Items');";
 				// only add if pagination is requered
 				if ($view['settings']->main_get->pagination == 1)
 				{
-					$method .= PHP_EOL."\t\t\$this->pagination\t= \$this->get('Pagination');";
+					$method .= PHP_EOL . "\t\t\$this->pagination = \$this->get('Pagination');";
 				}
 				// add id to list view
 				if (isset($this->customAdminViewListId[$view['settings']->code]))
@@ -2929,7 +2927,7 @@ class Interpretation extends Fields
 				foreach ($view['settings']->custom_get as $custom_get)
 				{
 					$custom_get_name = str_replace('get', '', $custom_get->getcustom);
-					$method .= PHP_EOL."\t\t\$this->".ComponentbuilderHelper::safeString($custom_get_name)."\t= \$this->get('".$custom_get_name."');";
+					$method .= PHP_EOL . "\t\t\$this->" . ComponentbuilderHelper::safeString($custom_get_name) . " = \$this->get('" . $custom_get_name . "');";
 				}
 			}
 			// add custom script
@@ -3017,6 +3015,8 @@ class Interpretation extends Fields
 		// see if we should add get modules to the view.html
 		$this->fileContentDynamic[$view['settings']->code]['###' . $TARGET . '_GET_MODULE###'] = $this->setGetModules($view, $TARGET);
 
+		// set a JavaScript file if needed
+		$this->fileContentDynamic[$view['settings']->code]['###' . $TARGET . '_LIBRARIES_LOADER###'] .= $this->setJavaScriptFile($view, $TARGET);
 	}
 
 	public function setGetModules($view, $TARGET)
@@ -3171,7 +3171,6 @@ class Interpretation extends Fields
 					$this->placeholders['[[[SITE_TOOLBAR]]]'] = '<?php echo $this->toolbar->render(); ?>';
 					break;
 			}
-
 		}
 		// check if custom button should be added
 		if (isset($view['settings']->add_custom_button) && $view['settings']->add_custom_button == 1)
@@ -3241,15 +3240,13 @@ class Interpretation extends Fields
 				if (isset($view['settings']->php_controller_list) && ComponentbuilderHelper::checkString($view['settings']->php_controller_list) && $view['settings']->php_controller_list != '//')
 				{
 					// set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER###
-					$this->fileContentDynamic[$viewsName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER_LIST###'] =
+					$this->fileContentDynamic[$viewsName]['###' . $TARGET . '_CUSTOM_BUTTONS_CONTROLLER_LIST###'] = PHP_EOL . PHP_EOL . $this->setPlaceholders($view['settings']->php_controller_list, $this->placeholders);
-					PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_controller_list, $this->placeholders);
 				}
 				// load the model
 				if (isset($view['settings']->php_model_list) && ComponentbuilderHelper::checkString($view['settings']->php_model_list) && $view['settings']->php_model_list != '//')
 				{
 					// set the custom buttons ###CUSTOM_BUTTONS_METHOD###
-					$this->fileContentDynamic[$viewsName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD_LIST###'] =
+					$this->fileContentDynamic[$viewsName]['###' . $TARGET . '_CUSTOM_BUTTONS_METHOD_LIST###'] = PHP_EOL . PHP_EOL . $this->setPlaceholders($view['settings']->php_model_list, $this->placeholders);
-					PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_model_list, $this->placeholders);
 				}
 			}
 			else
@@ -3258,8 +3255,7 @@ class Interpretation extends Fields
 				if (ComponentbuilderHelper::checkString($view['settings']->php_controller) && $view['settings']->php_controller != '//')
 				{
 					// set the custom buttons ###CUSTOM_BUTTONS_CONTROLLER###
-					$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_CONTROLLER###'] =
+					$this->fileContentDynamic[$viewName]['###' . $TARGET . '_CUSTOM_BUTTONS_CONTROLLER###'] = PHP_EOL . PHP_EOL . $this->setPlaceholders($view['settings']->php_controller, $this->placeholders);
-					PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_controller, $this->placeholders);
 					if ('site' === $this->target)
 					{
 						// add the controller for this view
@@ -3273,8 +3269,7 @@ class Interpretation extends Fields
 				if (ComponentbuilderHelper::checkString($view['settings']->php_model) && $view['settings']->php_model != '//')
 				{
 					// set the custom buttons ###CUSTOM_BUTTONS_METHOD###
-					$this->fileContentDynamic[$viewName]['###'.$TARGET.'_CUSTOM_BUTTONS_METHOD###'] =
+					$this->fileContentDynamic[$viewName]['###' . $TARGET . '_CUSTOM_BUTTONS_METHOD###'] = PHP_EOL . PHP_EOL . $this->setPlaceholders($view['settings']->php_model, $this->placeholders);
-					PHP_EOL.PHP_EOL.$this->setPlaceholders($view['settings']->php_model, $this->placeholders);
 				}
 			}
 			// return buttons if they were build
@@ -3323,6 +3318,34 @@ class Interpretation extends Fields
 		return '';
 	}
 
+	public function setJavaScriptFile(&$view, $TARGET)
+	{
+		if ($view['settings']->add_javascript_file == 1 && ComponentbuilderHelper::checkString($view['settings']->javascript_file))
+		{
+			// get dates
+			$created = $this->getCreatedDate($view);
+			$modified = $this->getLastModifiedDate($view);
+			// add file to view
+			$target = array($this->target => $view['settings']->code);
+			$config = array('###CREATIONDATE###' => $created, '###BUILDDATE###' => $modified, '###VERSION###' => $view['settings']->version);
+			$this->buildDynamique($target, 'javascript_file', false, $config);
+			// set path
+			if ('site' === $this->target)
+			{
+				$path = '/components/com_' . $this->fileContentStatic['###component###'] . '/assets/js/' . $view['settings']->code . '.js';
+			}
+			else
+			{
+				$path = '/administrator/components/com_' . $this->fileContentStatic['###component###'] . '/assets/js/' . $view['settings']->code . '.js';
+			}
+			// add script to file
+			$this->fileContentDynamic[$view['settings']->code]['###' . $TARGET . '_JAVASCRIPT_FILE###'] = $view['settings']->javascript_file;
+			// add script to view
+			return PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add View JavaScript File" . PHP_EOL . "\t\t" . $this->setIncludeLibScript($path);
+		}
+		return '';
+	}
+
 	public function setDocumentCustomJS(&$view)
 	{
 		if ($view['settings']->add_js_document == 1)
@@ -3496,20 +3519,16 @@ class Interpretation extends Fields
 		$setter .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Initialize the header checker.";
 		$setter .= PHP_EOL . "\t\t\$HeaderCheck = new " . $this->fileContentStatic['###component###'] . "HeaderCheck;";
 		// check if this view should get libraries
-		if (isset($this->libManager[$this->target][$view['settings']->code]) 
+		if (isset($this->libManager[$this->target][$view['settings']->code]) && ComponentbuilderHelper::checkArray($this->libManager[$this->target][$view['settings']->code]))
-			&& ComponentbuilderHelper::checkArray($this->libManager[$this->target][$view['settings']->code]))
 		{
 			foreach ($this->libManager[$this->target][$view['settings']->code] as $id => $true)
 			{
-				if (isset($this->libraries[$id]) && ComponentbuilderHelper::checkObject($this->libraries[$id]) 
+				if (isset($this->libraries[$id]) && ComponentbuilderHelper::checkObject($this->libraries[$id]) && isset($this->libraries[$id]->document) && ComponentbuilderHelper::checkString($this->libraries[$id]->document))
-					&& isset($this->libraries[$id]->document) && ComponentbuilderHelper::checkString($this->libraries[$id]->document))
 				{
 					$setter .= PHP_EOL . PHP_EOL . $this->setPlaceholders(
-						str_replace('$document->', '$this->document->', $this->libraries[$id]->document), 
+							str_replace('$document->', '$this->document->', $this->libraries[$id]->document), $this->placeholders);
-						$this->placeholders);
 				}
-				elseif (isset($this->libraries[$id]) && ComponentbuilderHelper::checkObject($this->libraries[$id]) 
+				elseif (isset($this->libraries[$id]) && ComponentbuilderHelper::checkObject($this->libraries[$id]) && isset($this->libraries[$id]->how))
-					&& isset($this->libraries[$id]->how))
 				{
 					$setter .= $this->setLibraryDocument($id);
 				}
@@ -3520,8 +3539,7 @@ class Interpretation extends Fields
 
 	protected function setLibraryDocument($id)
 	{
-		if (2 == $this->libraries[$id]->how && isset($this->libraries[$id]->conditions)
+		if (2 == $this->libraries[$id]->how && isset($this->libraries[$id]->conditions) && ComponentbuilderHelper::checkArray($this->libraries[$id]->conditions))
-			&& ComponentbuilderHelper::checkArray($this->libraries[$id]->conditions))
 		{
 			// build document with the conditions values
 			$this->setLibraryDocConditions($id, $this->setLibraryScripts($id, false));
@@ -3545,7 +3563,7 @@ class Interpretation extends Fields
 		// Start script builder for library files
 		if (!isset($this->libwarning[$id]))
 		{
-			$this->app->enqueueMessage(JText::sprintf('The conditional script builder for <b>%s</b> is not ready, will only be ready in the next update to v2.6.7', $this->libraries[$id]->name), 'warning');
+			$this->app->enqueueMessage(JText::sprintf('The conditional script builder for <b>%s</b> is not ready, sorry!', $this->libraries[$id]->name), 'warning');
 			// set the warning only once
 			$this->libwarning[$id] = true;
 		}
@@ -3917,7 +3935,6 @@ class Interpretation extends Fields
 			{
 				return PHP_EOL . $this->setPlaceholders($view['settings']->default, $this->placeholders);
 			}
-			
 		}
 		return '';
 	}
@@ -3945,7 +3962,6 @@ class Interpretation extends Fields
 
 				return implode(PHP_EOL, $script);
 			}
-			
 		}
 		return '';
 	}
@@ -4024,7 +4040,6 @@ class Interpretation extends Fields
 				}
 				// ###SITE_LAYOUT_BODY### <<<DYNAMIC>>>
 				$this->fileContentDynamic[$layout]['###' . $TARGET . '_LAYOUT_BODY###'] = PHP_EOL . $this->setPlaceholders($data['html'], $this->placeholders);
-
 			}
 		}
 	}
@@ -4112,9 +4127,7 @@ class Interpretation extends Fields
 				$script .= PHP_EOL . PHP_EOL . "\t\t\tif (!empty(\$item->" . $jsonString . "))";
 				$script .= PHP_EOL . "\t\t\t{";
 				$script .= PHP_EOL . "\t\t\t\t//" . $this->setLine(__LINE__) . " JSON Decode " . $jsonString . ".";
-				if (isset($this->jsonItemBuilderArray[$view])
+				if (isset($this->jsonItemBuilderArray[$view]) && ComponentbuilderHelper::checkArray($this->jsonItemBuilderArray[$view]) && in_array($jsonString, $this->jsonItemBuilderArray[$view]))
-					&& ComponentbuilderHelper::checkArray($this->jsonItemBuilderArray[$view])
-					&& in_array($jsonString, $this->jsonItemBuilderArray[$view]))
 				{
 					$makeArray = ',true';
 				}
@@ -4346,7 +4359,6 @@ class Interpretation extends Fields
 					// remove if not array
 					unset($dbStuff[$view]);
 				}
-
 			}
 			// build the db insert query
 			if (ComponentbuilderHelper::checkArray($dbStuff))
@@ -4823,16 +4835,13 @@ class Interpretation extends Fields
 				{
 					if ($get['as'] === 'a')
 					{
-						if (isset($get['selection']) && ComponentbuilderHelper::checkArray($get['selection'])
+						if (isset($get['selection']) && ComponentbuilderHelper::checkArray($get['selection']) && isset($get['selection']['select_gets']) && ComponentbuilderHelper::checkArray($get['selection']['select_gets']))
-							&& isset($get['selection']['select_gets']) 
-							&& ComponentbuilderHelper::checkArray($get['selection']['select_gets']))
 						{
 							if (isset($get['selection']['table']))
 							{
 								$viewTable = str_replace('#__' . $this->fileContentStatic['###component###'] . '_', '', $get['selection']['table']);
 							}
 						}
-						
 					}
 				}
 			}
@@ -5523,8 +5532,7 @@ class Interpretation extends Fields
 				if (isset($this->updateSQL['table_name']) && isset($this->updateSQL['table_name'][$view]))
 				{
 					$old_table_name = $this->updateSQL['table_name'][$view]['old'];
-					$this->updateSQLBuilder["RENAMETABLE`#__".$component."_".$old_table_name."`"] 
+					$this->updateSQLBuilder["RENAMETABLE`#__" . $component . "_" . $old_table_name . "`"] = "RENAME TABLE `#__" . $component . "_" . $old_table_name . "` to `#__" . $component . "_" . $view . "`;";
-						= "RENAME TABLE `#__".$component."_".$old_table_name."` to `#__".$component."_".$view."`;";
 				}
 				// check if default field was over written
 				if (!isset($this->fieldsNames[$view]['id']))
@@ -5582,12 +5590,9 @@ class Interpretation extends Fields
 					// set the field to db
 					$db_ .= PHP_EOL . "\t`" . $field . "` " . $data['type'] . $lenght . " " . $default . ",";
 					// check if this a new field that should be added via SQL update
-					if (isset($this->addSQL['field']) && isset($this->addSQL['field'][$view]) 
+					if (isset($this->addSQL['field']) && isset($this->addSQL['field'][$view]) && ComponentbuilderHelper::checkArray($this->addSQL['field'][$view]) && in_array($data['ID'], $this->addSQL['field'][$view]))
-						&& ComponentbuilderHelper::checkArray($this->addSQL['field'][$view])
-						&& in_array($data['ID'], $this->addSQL['field'][$view]))
 					{
-						$this->updateSQLBuilder["ALTERTABLE`#__".$component."_".$view."`ADD`".$field."`"] 
+						$this->updateSQLBuilder["ALTERTABLE`#__" . $component . "_" . $view . "`ADD`" . $field . "`"] = "ALTER TABLE `#__" . $component . "_" . $view . "` ADD `" . $field . "` " . $data['type'] . $lenght . " " . $default . " AFTER `" . $last_name . "`;";
-							= "ALTER TABLE `#__".$component."_".$view."` ADD `".$field."` ".$data['type'].$lenght." ".$default." AFTER `".$last_name."`;";
 					}
 					// check if the field has changed name and/or data type and lenght
 					elseif (0)
@@ -5707,8 +5712,7 @@ class Interpretation extends Fields
 				$db_ .= PHP_EOL . ") ENGINE=MyISAM AUTO_INCREMENT=0 DEFAULT CHARSET=utf8;";
 
 				// check if this is a new table that should be added via update SQL
-				if (isset($this->addSQL['adminview']) && ComponentbuilderHelper::checkArray($this->addSQL['adminview'])
+				if (isset($this->addSQL['adminview']) && ComponentbuilderHelper::checkArray($this->addSQL['adminview']) && in_array($view, $this->addSQL['adminview']))
-					&& in_array($view, $this->addSQL['adminview']))
 				{
 					// build the update array
 					$this->updateSQLBuilder["CREATETABLEIFNOTEXISTS`#__" . $component . "_" . $view . "`"] = $db_;
@@ -5725,7 +5729,6 @@ class Interpretation extends Fields
 					$placeholders = array('[[[component]]]' => $component, '[[[view]]]' => $for);
 					$db .= $this->setPlaceholders($customSql, $placeholders) . PHP_EOL . PHP_EOL;
 				}
-
 			}
 			return $db;
 		}
@@ -6103,8 +6106,7 @@ class Interpretation extends Fields
 					}
 				}
 				// check if translated value is used
-				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
+				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list]) && array_key_exists($item['code'], $this->selectionTranslationFixBuilder[$viewName_list]))
-					&& array_key_exists($item['code'],$this->selectionTranslationFixBuilder[$viewName_list]))
 				{
 					$itemCode = '<?php echo JText::_($item->' . $item['code'] . '); ?>';
 				}
@@ -6214,7 +6216,6 @@ class Interpretation extends Fields
 									$customAdminView .= PHP_EOL . "\t\t\t<?php endif; ?>";
 								}
 								$customAdminView .= PHP_EOL . "\t\t\t" . '</div>';
-
 							}
 							// 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($viewName_single, $this->permissionBuilder['global'][$core['core.edit']]))
@@ -7110,7 +7111,7 @@ class Interpretation extends Fields
 			}
 			$this->fileContentDynamic[$viewName_single . '_' . $layoutCodeName]['###LAYOUTITEMSHEADER###'] = $headerscript;
 			// ###LINKEDVIEWITEMS### <<<DYNAMIC>>>
-			$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWITEMS###'] .=  PHP_EOL.PHP_EOL."\t\t//".$this->setLine(__LINE__)." Get Linked view data".PHP_EOL."\t\t\$this->".$codeName."\t\t= \$this->get('".$functionName."');";
+			$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWITEMS###'] .= PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Get Linked view data" . PHP_EOL . "\t\t\$this->" . $codeName . " = \$this->get('" . $functionName . "');";
 			// ###LINKEDVIEWTABLESCRIPTS### <<<DYNAMIC>>>
 			$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = $this->setFootableScripts();
 			if (strpos($parentKey, '-R>') !== false || strpos($parentKey, '-A>') !== false)
@@ -7264,8 +7265,7 @@ class Interpretation extends Fields
 					}
 				}
 				// check if translated vlaue is used
-				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
+				if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list]) && array_key_exists($item['code'], $this->selectionTranslationFixBuilder[$viewName_list]))
-					&& array_key_exists($item['code'],$this->selectionTranslationFixBuilder[$viewName_list]))
 				{
 					$itemCode = '<?php echo JText::_($item->' . $item['code'] . '); ?>';
 				}
@@ -7388,7 +7388,6 @@ class Interpretation extends Fields
 									$customAdminView .= PHP_EOL . "\t\t\t<?php endif; ?>";
 								}
 								$customAdminView .= PHP_EOL . "\t\t\t" . '</div>';
-
 							}
 							// 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($viewName_single, $this->permissionBuilder['global'][$core['core.edit']]))
@@ -7875,7 +7874,6 @@ class Interpretation extends Fields
 			$query .= PHP_EOL . "\t\t\t{";
 			$query .= PHP_EOL . "\t\t\t\treturn false;";
 			$query .= PHP_EOL . "\t\t\t}";
-
 		}
 		// filter by parent repetable field values
 		if (ComponentbuilderHelper::checkString($globalKey) && $key && strpos($parentKey, '-R>') !== false && strpos($parentKey, '-A>') === false)
@@ -8455,12 +8453,7 @@ class Interpretation extends Fields
 			foreach ($this->customBuilder[$viewName_list] as $filter)
 			{
 				// only load this if table is set
-				if (isset($this->customBuilderList[$viewName_list]) 
+				if (isset($this->customBuilderList[$viewName_list]) && ComponentbuilderHelper::checkArray($this->customBuilderList[$viewName_list]) && in_array($filter['code'], $this->customBuilderList[$viewName_list]) && isset($filter['custom']['table']) && ComponentbuilderHelper::checkString($filter['custom']['table']) && $filter['method'] == 0)
-					&& ComponentbuilderHelper::checkArray($this->customBuilderList[$viewName_list]) 
-					&& in_array($filter['code'],$this->customBuilderList[$viewName_list])
-					&& isset($filter['custom']['table']) 
-					&& ComponentbuilderHelper::checkString($filter['custom']['table'])
-					&& $filter['method'] == 0)
 				{
 					$query .= PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " From the " . ComponentbuilderHelper::safeString(ComponentbuilderHelper::safeString($filter['custom']['table'], 'w')) . " table.";
 					$query .= PHP_EOL . "\t\t\$query->select(\$db->quoteName('" . $filter['custom']['db'] . "." . $filter['custom']['text'] . "','" . $filter['code'] . "_" . $filter['custom']['text'] . "'));";
@@ -8617,7 +8610,6 @@ class Interpretation extends Fields
 					$filterQuery .= PHP_EOL . "\t\t{";
 					$filterQuery .= PHP_EOL . "\t\t\t\$query->where('a." . $filter['code'] . " = ' . \$db->quote(\$db->escape(\$" . $filter['code'] . ")));";
 					$filterQuery .= PHP_EOL . "\t\t}";
-
 				}
 				elseif ($filter['type'] != 'category')
 				{
@@ -8862,7 +8854,6 @@ class Interpretation extends Fields
 							$aifcounter++;
 						}
 						$func .= ")" . PHP_EOL . "\t{";
-
 					}
 					else
 					{
@@ -8979,7 +8970,6 @@ class Interpretation extends Fields
 				$footerScript .= $customFooterScript;
 				unset($customFooterScript);
 			}
-
 		}
 		// minfy the script
 		if ($this->params->get('minify') && isset($fileScript) && ComponentbuilderHelper::checkString($fileScript))
@@ -9202,7 +9192,6 @@ class Interpretation extends Fields
 		return $bucket;
 	}
 
-
 	public function ifValueScript($value, $behavior, $type, $options)
 	{
 		// reset string
@@ -9441,7 +9430,6 @@ class Interpretation extends Fields
 			case 11: // Max Length
 				// only 4 text_field
 				if (ComponentbuilderHelper::typeField($type, 'text'))
-
 				{
 					if (ComponentbuilderHelper::checkArray($options))
 					{
@@ -9519,7 +9507,6 @@ class Interpretation extends Fields
 						{
 							$buket['keywords'][] = trim($keyword);
 						}
-
 					}
 					else
 					{
@@ -9531,7 +9518,9 @@ class Interpretation extends Fields
 				if (ComponentbuilderHelper::checkString($length))
 				{
 					$buket['length'] = $length;
-				} else {
+				}
+				else
+				{
 					$buket['length'] = false;
 				}
 			}
@@ -9792,7 +9781,6 @@ class Interpretation extends Fields
 		return $methods;
 	}
 
-
 	public function setFilterFunctions($viewName_single, $viewName_list)
 	{
 		if (isset($this->filterBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->filterBuilder[$viewName_list]))
@@ -9879,8 +9867,7 @@ class Interpretation extends Fields
 				elseif ($filter['type'] != 'category' && !ComponentbuilderHelper::checkArray($filter['custom']))
 				{
 					$translation = false;
-					if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list])
+					if (isset($this->selectionTranslationFixBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->selectionTranslationFixBuilder[$viewName_list]) && array_key_exists($filter['code'], $this->selectionTranslationFixBuilder[$viewName_list]))
-						&& array_key_exists($filter['code'],$this->selectionTranslationFixBuilder[$viewName_list]))
 					{
 						$translation = true;
 					}
@@ -10090,11 +10077,10 @@ class Interpretation extends Fields
 		return '';
 	}
 
-
-
 	public function setRouterCategoryViews($viewName_single, $viewName_list)
 	{
-		if(isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])){
+		if (isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list]))
+		{
 			// set component name
 			$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
 			// check if category has another name
@@ -10144,7 +10130,6 @@ class Interpretation extends Fields
 			}
 		}
 		return '';
-
 	}
 
 	public function setJcontrollerAllowAdd($viewName_single, $viewName_list)
@@ -10257,7 +10242,8 @@ class Interpretation extends Fields
 			$core = $this->permissionCore[$viewName_single];
 			$coreLoad = true;
 		}
-		if(isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list])){
+		if (isset($this->categoryBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$viewName_list]))
+		{
 			// check if category has another name
 			if ($coreLoad && isset($this->catOtherName[$viewName_list]) && ComponentbuilderHelper::checkArray($this->catOtherName[$viewName_list]))
 			{
@@ -10897,8 +10883,6 @@ class Interpretation extends Fields
 		return implode(PHP_EOL, $allow);
 	}
 
-
-
 	public function setJviewListCanDo($viewName_single, $viewName_list)
 	{
 		$allow = array();
@@ -10914,47 +10898,47 @@ class Interpretation extends Fields
 		// check if the item has permissions for edit.
 		if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName_single, $this->permissionBuilder['global'][$core['core.edit']]))
 		{
-			$allow[] = PHP_EOL."\t\t\$this->canEdit\t\t= \$this->canDo->get('".$core['core.edit']."');";
+			$allow[] = PHP_EOL . "\t\t\$this->canEdit = \$this->canDo->get('" . $core['core.edit'] . "');";
 		}
 		else
 		{
-			$allow[] = PHP_EOL."\t\t\$this->canEdit\t\t= \$this->canDo->get('core.edit');";
+			$allow[] = PHP_EOL . "\t\t\$this->canEdit = \$this->canDo->get('core.edit');";
 		}
 		// check if the item has permissions for edit state.
 		if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single, $this->permissionBuilder['global'][$core['core.edit.state']]))
 		{
-			$allow[] = "\t\t\$this->canState\t\t= \$this->canDo->get('".$core['core.edit.state']."');";
+			$allow[] = "\t\t\$this->canState = \$this->canDo->get('" . $core['core.edit.state'] . "');";
 		}
 		else
 		{
-			$allow[] = "\t\t\$this->canState\t\t= \$this->canDo->get('core.edit.state');";
+			$allow[] = "\t\t\$this->canState = \$this->canDo->get('core.edit.state');";
 		}
 		// check if the item has permissions for create.
 		if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName_single, $this->permissionBuilder['global'][$core['core.create']]))
 		{
-			$allow[] = "\t\t\$this->canCreate\t= \$this->canDo->get('".$core['core.create']."');";
+			$allow[] = "\t\t\$this->canCreate = \$this->canDo->get('" . $core['core.create'] . "');";
 		}
 		else
 		{
-			$allow[] = "\t\t\$this->canCreate\t= \$this->canDo->get('core.create');";
+			$allow[] = "\t\t\$this->canCreate = \$this->canDo->get('core.create');";
 		}
 		// check if the item has permissions for delete.
 		if ($coreLoad && isset($core['core.delete']) && isset($this->permissionBuilder['global'][$core['core.delete']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.delete']]) && in_array($viewName_single, $this->permissionBuilder['global'][$core['core.delete']]))
 		{
-			$allow[] = "\t\t\$this->canDelete\t= \$this->canDo->get('".$core['core.delete']."');";
+			$allow[] = "\t\t\$this->canDelete = \$this->canDo->get('" . $core['core.delete'] . "');";
 		}
 		else
 		{
-			$allow[] = "\t\t\$this->canDelete\t= \$this->canDo->get('core.delete');";
+			$allow[] = "\t\t\$this->canDelete = \$this->canDo->get('core.delete');";
 		}
 		// check if the item has permissions for batch.
 		if ($coreLoad && isset($core['core.batch']) && isset($this->permissionBuilder['global']['global'][$core['core.batch']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global']['global'][$core['core.batch']]) && in_array($viewName_single, $this->permissionBuilder['global']['global'][$core['core.delete']]))
 		{
-			$allow[] = "\t\t\$this->canBatch\t= (\$this->canDo->get('".$core['core.batch']."') && \$this->canDo->get('core.batch'));";
+			$allow[] = "\t\t\$this->canBatch = (\$this->canDo->get('" . $core['core.batch'] . "') && \$this->canDo->get('core.batch'));";
 		}
 		else
 		{
-			$allow[] = "\t\t\$this->canBatch\t= \$this->canDo->get('core.batch');";
+			$allow[] = "\t\t\$this->canBatch = \$this->canDo->get('core.batch');";
 		}
 
 		return implode(PHP_EOL, $allow);
@@ -11563,7 +11547,6 @@ class Interpretation extends Fields
 			$fix .= PHP_EOL . "\t" . $tab . "\t\t\t\tunset(\$items[\$nr]);";
 			$fix .= PHP_EOL . "\t" . $tab . "\t\t\t\tcontinue;";
 			$fix .= PHP_EOL . "\t" . $tab . "\t\t\t}" . PHP_EOL;
-
 		}
 
 		if (!$export)
@@ -11918,7 +11901,6 @@ class Interpretation extends Fields
 			return $router;
 		}
 		return '';
-
 	}
 
 	public function setComponentImageType($path)
@@ -11946,7 +11928,6 @@ class Interpretation extends Fields
 			return PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " view access array" . PHP_EOL . "\t\t\$viewAccess = array(" . PHP_EOL . "\t\t\t" . implode("," . PHP_EOL . "\t\t\t", $this->permissionDashboard) . ");";
 		}
 		return '';
-
 	}
 
 	public function setDashboardIcons()
@@ -12478,7 +12459,6 @@ class Interpretation extends Fields
 			}
 		}
 		return $custom;
-
 	}
 
 	public function setCustomAdminSubMenu(&$view, &$codeName, &$lang, &$nr, &$menu, $type)
@@ -12702,7 +12682,6 @@ class Interpretation extends Fields
 			}
 		}
 		return $customMenu;
-
 	}
 
 	public function setConfigFieldsets($timer = 0)
@@ -12770,7 +12749,6 @@ class Interpretation extends Fields
 			// first run we must set the globals
 			$this->setGlobalConfigFieldsets($lang, $autorName, $autorEmail);
 			$this->setSiteControlConfigFieldsets($lang);
-			
 		}
 		elseif (2 == $timer) // this is after the admin views are build
 		{
@@ -13210,7 +13188,8 @@ class Interpretation extends Fields
 		// add more contributors if required
 		if (1 == $this->componentData->emptycontributors)
 		{
-			if (isset($counter)){
+			if (isset($counter))
+			{
 				$min = $counter + 1;
 				unset($counter);
 			}
@@ -13455,7 +13434,6 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			// close that fieldset
 			$this->configFieldSets[] = "\t</fieldset>";
 		}
-
 	}
 
 	public function setEmailHelperConfigFieldsets($lang)
@@ -13925,7 +13903,6 @@ function vdm_dkim() {
 			// close that fieldset
 			$this->configFieldSets[] = "\t</fieldset>";
 		}
-
 	}
 
 	public function setGooglechartConfigFieldsets($lang)
@@ -14843,7 +14820,6 @@ function vdm_dkim() {
 		if ($typeName === 'category')
 		{
 			return 'catid';
-
 		}
 		// if tag is set then enable all tag options for this view (only one per view)
 		elseif ($typeName === 'tag')
@@ -14911,4 +14887,5 @@ function vdm_dkim() {
 		preg_match_all($regex, $str, $matches);
 		return $matches[1];
 	}
+
 }

admin/helpers/compiler/f_Infusion.php

@@ -1,4 +1,5 @@
 <?php
+
 /* --------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
   __      __       _     _____                 _                                  _     __  __      _   _               _
   \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
@@ -10,7 +11,7 @@
                                                       |_|
   /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.6.0
+  @version		2.6.x
   @created		30th April, 2015
   @package		Component Builder
   @subpackage	compiler.php
@@ -177,12 +178,10 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
 
 			// ###CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] 
+			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
-				= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
 
 			// ###BOTH_CUSTOM_HELPER_SCRIPT###
-			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] 
+			$this->fileContentStatic['###BOTH_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_both'], $this->placeholders);
-				= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_both'], $this->placeholders);
 
 			// ###ADMIN_GLOBAL_EVENT_HELPER###
 			$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] = '';
@@ -198,16 +197,14 @@ class Infusion extends Interpretation
 			{
 				// ###ADMIN_GLOBAL_EVENT###
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] = PHP_EOL . PHP_EOL . '// Triger the Global Admin Event';
-				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] 
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT###'] .= PHP_EOL . $this->fileContentStatic['###Component###'] . 'Helper::globalEvent($document);';
-					.= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 				// ###ADMIN_GLOBAL_EVENT_HELPER###
 				$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###'] 
+				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . $this->setPlaceholders($this->customScriptBuilder['component_php_admin_event'], $this->placeholders);
-					.= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_admin_event'], $this->placeholders);
 				$this->fileContentStatic['###ADMIN_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '}';
 			}
 
@@ -290,8 +287,7 @@ class Infusion extends Interpretation
 					$this->setLockLicensePer($viewName_list, $this->target);
 
 					// ###FIELDSETS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] 
+					$this->fileContentDynamic[$viewName_single]['###FIELDSETS###'] = $this->setFieldSet($view, $this->fileContentStatic['###component###']);
-						= $this->setFieldSet($view, $this->fileContentStatic['###component###']);
 
 					// ###ACCESSCONTROL### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###ACCESSCONTROL###'] = $this->setFieldSetAccessControl($viewName_single);
@@ -314,15 +310,12 @@ class Infusion extends Interpretation
 					// ###AJAXTOKE### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###AJAXTOKE###'] = $this->setAjaxToke($viewName_single);
 
-                                        if (isset($this->customScriptBuilder['php_document'][$viewName_single]) 
+					if (isset($this->customScriptBuilder['php_document'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single]))
-						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['php_document'][$viewName_single]))
 					{
 						// ###DOCUMENT_CUSTOM_PHP### <<<DYNAMIC>>>
 						$this->customScriptBuilder['php_document'][$viewName_single] = str_replace('$document->', '$this->document->', $this->customScriptBuilder['php_document'][$viewName_single]);
-                                                $this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] 
+						$this->fileContentDynamic[$viewName_single]['###DOCUMENT_CUSTOM_PHP###'] = PHP_EOL . $this->setPlaceholders(
-                                                        = PHP_EOL.$this->setPlaceholders(
+								$this->customScriptBuilder['php_document'][$viewName_single], $this->placeholders);
-								$this->customScriptBuilder['php_document'][$viewName_single], 
-								$this->placeholders);
 						// clear some memory
 						unset($this->customScriptBuilder['php_document'][$viewName_single]);
 					}
@@ -335,8 +328,7 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWTABLESCRIPTS###'] = '';
 
 					// ###VALIDATEFIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] 
+					$this->fileContentDynamic[$viewName_single]['###VALIDATIONFIX###'] = $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']);
-						= $this->setValidationFix($viewName_single, $this->fileContentStatic['###Component###']);
 
 					// ###EDITBODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###EDITBODY###'] = $this->setEditBody($view);
@@ -360,20 +352,16 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_single]['###LINKEDVIEWMETHODS###'] = '';
 
 					// ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] 
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_DELETE###'] = $this->getCustomScriptBuilder('php_before_delete', $viewName_single, PHP_EOL);
-						= $this->getCustomScriptBuilder('php_before_delete', $viewName_single, PHP_EOL);
 
 					// ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] 
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_DELETE###'] = $this->getCustomScriptBuilder('php_after_delete', $viewName_single, PHP_EOL . PHP_EOL);
-						= $this->getCustomScriptBuilder('php_after_delete', $viewName_single, PHP_EOL.PHP_EOL);
 
 					// ###JMODELADMIN_BEFORE_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] 
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_BEFORE_PUBLISH###'] = $this->getCustomScriptBuilder('php_before_publish', $viewName_single, PHP_EOL);
-						= $this->getCustomScriptBuilder('php_before_publish', $viewName_single, PHP_EOL);
 
 					// ###JMODELADMIN_AFTER_DELETE### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] 
+					$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_AFTER_PUBLISH###'] = $this->getCustomScriptBuilder('php_after_publish', $viewName_single, PHP_EOL . PHP_EOL);
-						= $this->getCustomScriptBuilder('php_after_publish', $viewName_single, PHP_EOL.PHP_EOL);
 
 					// ###CHECKBOX_SAVE### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_single]['###CHECKBOX_SAVE###'] = $this->setCheckboxSave($viewName_single);
@@ -382,16 +370,12 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_single]['###METHOD_ITEM_SAVE###'] = $this->setMethodItemSave($viewName_single);
 
 					// ###POSTSAVEHOOK### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_single]['###POSTSAVEHOOK###'] 
+					$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;");
-						= $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]) 
+					if (isset($this->customScriptBuilder['css_view'][$viewName_single]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
-						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['css_view'][$viewName_single]))
 					{
 						// ###VIEWCSS### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_single]['###VIEWCSS###']
+						$this->fileContentDynamic[$viewName_single]['###VIEWCSS###'] = $this->setPlaceholders($this->customScriptBuilder['css_view'][$viewName_single], $this->placeholders);
-                                                        = $this->setPlaceholders($this->customScriptBuilder['css_view'][$viewName_single], $this->placeholders);
 						// clear some memory
 						unset($this->customScriptBuilder['css_view'][$viewName_single]);
 					}
@@ -403,8 +387,7 @@ class Infusion extends Interpretation
 					// add css to front end
 					if (isset($view['edit_create_site_view']) && $view['edit_create_site_view'])
 					{
-                                                $this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] 
+						$this->fileContentDynamic[$viewName_single]['###SITE_VIEWCSS###'] = $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'];
-							= $this->fileContentDynamic[$viewName_single]['###VIEWCSS###'];
 					}
 				}
 				// set the views names
@@ -455,11 +438,9 @@ class Infusion extends Interpretation
 					if (isset($view['checkin']) && $view['checkin'] == 1)
 					{
 						// ###AUTOCHECKIN### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###']
+						$this->fileContentDynamic[$viewName_list]['###AUTOCHECKIN###'] = $this->setAutoCheckin($viewName_single, $this->fileContentStatic['###component###']);
-							= $this->setAutoCheckin($viewName_single,$this->fileContentStatic['###component###']);
 						// ###CHECKINCALL### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_list]['###CHECKINCALL###']
+						$this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = $this->setCheckinCall();
-							= $this->setCheckinCall();
 					}
 					else
 					{
@@ -469,26 +450,20 @@ class Infusion extends Interpretation
 						$this->fileContentDynamic[$viewName_list]['###CHECKINCALL###'] = '';
 					}
 					// ###ADMIN_CUSTOM_BUTTONS_LIST###
-                                        $this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_BUTTONS_LIST###']
+					$this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_BUTTONS_LIST###'] = $this->setCustomButtons($view, 3, "\t");
-						= $this->setCustomButtons($view, 3, "\t");
+					$this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST###'] = $this->setFunctionOnlyButtons($viewName_list);
-                                        $this->fileContentDynamic[$viewName_list]['###ADMIN_CUSTOM_FUNCTION_ONLY_BUTTONS_LIST###'] 
-						= $this->setFunctionOnlyButtons($viewName_list);
 
 					// ###GET_ITEMS_METHOD_STRING_FIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###']
+					$this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_STRING_FIX###'] = $this->setGetItemsMethodStringFix($viewName_single, $this->fileContentStatic['###Component###']);
-						= $this->setGetItemsMethodStringFix($viewName_single,$this->fileContentStatic['###Component###']);
 
 					// ###GET_ITEMS_METHOD_AFTER_ALL### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###']
+					$this->fileContentDynamic[$viewName_list]['###GET_ITEMS_METHOD_AFTER_ALL###'] = $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL);
-						= $this->getCustomScriptBuilder('php_getitems_after_all', $viewName_single, PHP_EOL);
 
 					// ###SELECTIONTRANSLATIONFIX### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###']
+					$this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIX###'] = $this->setSelectionTranslationFix($viewName_list, $this->fileContentStatic['###Component###']);
-						= $this->setSelectionTranslationFix($viewName_list,$this->fileContentStatic['###Component###']);
 
 					// ###SELECTIONTRANSLATIONFIXFUNC### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###']
+					$this->fileContentDynamic[$viewName_list]['###SELECTIONTRANSLATIONFIXFUNC###'] = $this->setSelectionTranslationFixFunc($viewName_list, $this->fileContentStatic['###Component###']);
-						= $this->setSelectionTranslationFixFunc($viewName_list,$this->fileContentStatic['###Component###']);
 
 					// ###FILTER_FIELDS### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list]['###FILTER_FIELDS###'] = $this->setFilterFields($viewName_list);
@@ -510,34 +485,28 @@ class Infusion extends Interpretation
 					{
 						$this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] = '';
 					}
-                                        $this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] 
+					$this->fileContentStatic['###ROUTER_CATEGORY_VIEWS###'] .= $this->setRouterCategoryViews($viewName_single, $viewName_list);
-						.= $this->setRouterCategoryViews($viewName_single,$viewName_list);
 
 					// ###OTHERFILTERS### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list]['###OTHERFILTERS###'] = $this->setOtherFilter($viewName_list);
 
 					// ###FILTERFUNCTIONS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] 
+					$this->fileContentDynamic[$viewName_list]['###FILTERFUNCTIONS###'] = $this->setFilterFunctions($viewName_single, $viewName_list);
-						= $this->setFilterFunctions($viewName_single,$viewName_list);
 
 					// ###LISTQUERY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list]['###LISTQUERY###'] = $this->setListQuery($viewName_single, $viewName_list);
 
 					// ###MODELEXPORTMETHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] 
+					$this->fileContentDynamic[$viewName_list]['###MODELEXPORTMETHOD###'] = $this->setModelExportMethod($viewName_single, $viewName_list);
-						= $this->setModelExportMethod($viewName_single, $viewName_list);
 
 					// ###MODELEXIMPORTMETHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] 
+					$this->fileContentDynamic[$viewName_list]['###CONTROLLEREXIMPORTMETHOD###'] = $this->setControllerEximportMethod($viewName_single, $viewName_list);
-						= $this->setControllerEximportMethod($viewName_single, $viewName_list);
 
 					// ###EXPORTBUTTON### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] 
+					$this->fileContentDynamic[$viewName_list]['###EXPORTBUTTON###'] = $this->setExportButton($viewName_single, $viewName_list);
-						= $this->setExportButton($viewName_single, $viewName_list);
 
 					// ###IMPORTBUTTON### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] 
+					$this->fileContentDynamic[$viewName_list]['###IMPORTBUTTON###'] = $this->setImportButton($viewName_single, $viewName_list);
-						= $this->setImportButton($viewName_single, $viewName_list);
 
 					// ###LISTHEAD### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$viewName_list]['###LISTHEAD###'] = $this->setListHead($viewName_single, $viewName_list);
@@ -549,15 +518,12 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$viewName_list]['###LISTCOLNR###'] = $this->setListColnr($viewName_list);
 
 					// ###JVIEWLISTCANDO### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] 
+					$this->fileContentDynamic[$viewName_list]['###JVIEWLISTCANDO###'] = $this->setJviewListCanDo($viewName_single, $viewName_list);
-						= $this->setJviewListCanDo($viewName_single,$viewName_list);
 
-                                        if (isset($this->customScriptBuilder['css_views'][$viewName_list]) 
+					if (isset($this->customScriptBuilder['css_views'][$viewName_list]) && ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list]))
-						&& ComponentbuilderHelper::checkString($this->customScriptBuilder['css_views'][$viewName_list]))
 					{
 						// ###VIEWCSS### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$viewName_list]['###VIEWSCSS###']
+						$this->fileContentDynamic[$viewName_list]['###VIEWSCSS###'] = $this->setPlaceholders($this->customScriptBuilder['css_views'][$viewName_list], $this->placeholders);
-                                                        = $this->setPlaceholders($this->customScriptBuilder['css_views'][$viewName_list], $this->placeholders);
 						// clear some memory
 						unset($this->customScriptBuilder['css_views'][$viewName_list]);
 					}
@@ -585,38 +551,29 @@ class Infusion extends Interpretation
 
 				// ###BATCH_ONCLICK_CANCEL_SCRIPT### <<<DYNAMIC>>>
 				$this->fileContentDynamic[$viewName_list]['###BATCH_ONCLICK_CANCEL_SCRIPT###'] = ''; // TODO <-- must still be build
-
 				// ###JCONTROLLERFORM_ALLOWADD### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] 
+				$this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWADD###'] = $this->setJcontrollerAllowAdd($viewName_single, $viewName_list);
-					= $this->setJcontrollerAllowAdd($viewName_single,$viewName_list);
 
 				// ###JCONTROLLERFORM_ALLOWEDIT### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] 
+				$this->fileContentDynamic[$viewName_single]['###JCONTROLLERFORM_ALLOWEDIT###'] = $this->setJcontrollerAllowEdit($viewName_single, $viewName_list);
-					= $this->setJcontrollerAllowEdit($viewName_single,$viewName_list);
 
 				// ###JMODELADMIN_GETFORM### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] 
+				$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_GETFORM###'] = $this->setJmodelAdminGetForm($viewName_single, $viewName_list);
-					= $this->setJmodelAdminGetForm($viewName_single,$viewName_list);
 
 				// ###JMODELADMIN_ALLOWEDIT### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] 
+				$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_ALLOWEDIT###'] = $this->setJmodelAdminAllowEdit($viewName_single, $viewName_list);
-					= $this->setJmodelAdminAllowEdit($viewName_single,$viewName_list);
 
 				// ###JMODELADMIN_CANDELETE### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] 
+				$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANDELETE###'] = $this->setJmodelAdminCanDelete($viewName_single, $viewName_list);
-					= $this->setJmodelAdminCanDelete($viewName_single,$viewName_list);
 
 				// ###JMODELADMIN_CANEDITSTATE### <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] 
+				$this->fileContentDynamic[$viewName_single]['###JMODELADMIN_CANEDITSTATE###'] = $this->setJmodelAdminCanEditState($viewName_single, $viewName_list);
-					= $this->setJmodelAdminCanEditState($viewName_single,$viewName_list);
 
 				// set custom admin view Toolbare buttons
 				// ###CUSTOM_ADMIN_DYNAMIC_BUTTONS###  <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] 
+				$this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS###'] = $this->setCustomAdminDynamicButton($viewName_list);
-					= $this->setCustomAdminDynamicButton($viewName_list);
 				// ###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###  <<<DYNAMIC>>>
-                                $this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] 
+				$this->fileContentDynamic[$viewName_list]['###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER###'] = $this->setCustomAdminDynamicButtonController($viewName_list);
-					= $this->setCustomAdminDynamicButtonController($viewName_list);
 
 				// set helper router
 				if (!isset($this->fileContentStatic['###ROUTEHELPER###']))
@@ -641,7 +598,6 @@ class Infusion extends Interpretation
 
 				// ###HELPER_EXEL###
 				$this->fileContentStatic['###HELPER_EXEL###'] = $this->setExelHelperMethods();
-
 			}
 
 			// setup custom_admin_views and all needed stuff for the site
@@ -668,8 +624,7 @@ class Infusion extends Interpretation
 					}
 					if (!isset($this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC']))
 					{
-                                                $this->langContent[$this->lang][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] 
+						$this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC'] = $view['settings']->description;
-							= $view['settings']->description;
 					}
 					// ###ICOMOON### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###ICOMOON###'] = $view['icomoon'];
@@ -694,12 +649,10 @@ class Infusion extends Interpretation
 					if ($view['settings']->main_get->gettype == 1)
 					{
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_BEFORE_GET_ITEM### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEM###'] = $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code], $this->placeholders);
-                                                                = $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]);
 						}
@@ -710,16 +663,13 @@ class Infusion extends Interpretation
 						}
 
 						// ###CUSTOM_ADMIN_GET_ITEM### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code, "\t\t");
-							= $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");
 
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_AFTER_GET_ITEM### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEM###'] = $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code], $this->placeholders);
-                                                                = $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]);
 						}
@@ -732,16 +682,13 @@ class Infusion extends Interpretation
 					elseif ($view['settings']->main_get->gettype == 2)
 					{
 						// ###CUSTOM_ADMIN_GET_LIST_QUERY### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
-							= $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
 
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_getlistquery'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_getlistquery'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_getlistquery'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_BEFORE_LIST_QUERY###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_getlistquery'][$view['settings']->code], $this->placeholders);
-                                                                = 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]);
 						}
@@ -752,12 +699,10 @@ class Infusion extends Interpretation
 						}
 
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BEFORE_GET_ITEMS###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code], $this->placeholders);
-                                                                = 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]);
 						}
@@ -768,16 +713,13 @@ class Infusion extends Interpretation
 						}
 
 						// ###CUSTOM_ADMIN_GET_ITEMS### <<<DYNAMIC>>>
-                                                $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
-							= $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
 
 						// check if there is any custom script
-                                                if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
 						{
 							// ###CUSTOM_ADMIN_AFTER_GET_ITEMS### <<<DYNAMIC>>>
-                                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###']
+							$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_AFTER_GET_ITEMS###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code], $this->placeholders);
-                                                                = 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]);
 						}
@@ -789,25 +731,20 @@ class Infusion extends Interpretation
 					}
 
 					// ###CUSTOM_ADMIN_CUSTOM_METHODS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
-						= $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CUSTOM_METHODS###'] 
-						.= $this->setCustomViewCustomMethods($view, $view['settings']->code);
 					// ###CUSTOM_ADMIN_DIPLAY_METHOD### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view);
-						= $this->setCustomViewDisplayMethod($view);
 					// set document details
 					$this->setPrepareDocument($view);
 					// ###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view);
-						= $this->setCustomViewExtraDisplayMethods($view);
 					// ###CUSTOM_ADMIN_CODE_BODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
 					// ###CUSTOM_ADMIN_BODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_BODY###'] = $this->setCustomViewBody($view);
 					// ###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT### <<<DYNAMIC>>>
-                                        $this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###'] = $this->setCustomViewSubmitButtonScript($view);
-						= $this->setCustomViewSubmitButtonScript($view);
 
 					// setup the templates
 					$this->setCustomViewTemplateBody($view);
@@ -912,7 +849,6 @@ class Infusion extends Interpretation
 						}
 					}
 				}
-
 			}
 
 			// ###CONFIG_FIELDSETS###
@@ -967,8 +903,7 @@ class Infusion extends Interpretation
 					}
 
 					// insure the needed route helper is loaded
-					$this->fileContentStatic['###ROUTEHELPER###'] 
+					$this->fileContentStatic['###ROUTEHELPER###'] .= $this->setRouterHelp($view['settings']->code, $view['settings']->code, true);
-						.= $this->setRouterHelp($view['settings']->code,$view['settings']->code, true);
 					// build route details 
 					$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] .= $this->routerParseSwitch($view['settings']->code, $view);
 					$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] .= $this->routerBuildViews($view['settings']->code);
@@ -976,15 +911,12 @@ class Infusion extends Interpretation
 					if ($view['settings']->main_get->gettype == 1)
 					{
 						// set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 1);
-							= $this->setUserPermissionCheckAccess($view, 1);
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitem'][$view['settings']->code]))
 						{
 							// ###SITE_BEFORE_GET_ITEM### <<<DYNAMIC>>>
-							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###']
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEM###'] = $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_before_getitem'][$view['settings']->code], $this->placeholders);
-								= $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]);
 						}
@@ -995,16 +927,13 @@ class Infusion extends Interpretation
 						}
 
 						// ###SITE_GET_ITEM### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEM###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEM###'] = $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code, "\t\t");
-							= $this->setCustomViewGetItem($view['settings']->main_get, $view['settings']->code,"\t\t");
 
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitem'][$view['settings']->code]))
 						{
 							// ###SITE_AFTER_GET_ITEM### <<<DYNAMIC>>>
-							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###']
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEM###'] = $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_after_getitem'][$view['settings']->code], $this->placeholders);
-								= $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]);
 						}
@@ -1017,19 +946,15 @@ class Infusion extends Interpretation
 					elseif ($view['settings']->main_get->gettype == 2)
 					{
 						// set user permission access check ###USER_PERMISSION_CHECK_ACCESS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###USER_PERMISSION_CHECK_ACCESS###'] = $this->setUserPermissionCheckAccess($view, 2);
-							= $this->setUserPermissionCheckAccess($view, 2);					
 						// ###SITE_GET_LIST_QUERY### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_LIST_QUERY###'] = $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
-							= $this->setCustomViewListQuery($view['settings']->main_get, $view['settings']->code);
 
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_before_getitems'][$view['settings']->code]))
 						{
 							// ###SITE_BEFORE_GET_ITEMS### <<<DYNAMIC>>>
-							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###']
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_BEFORE_GET_ITEMS###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_before_getitems'][$view['settings']->code], $this->placeholders);
-								= 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]);
 						}
@@ -1040,16 +965,13 @@ class Infusion extends Interpretation
 						}
 
 						// ###SITE_GET_ITEMS### <<<DYNAMIC>>>
-						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEMS###'] 
+						$this->fileContentDynamic[$view['settings']->code]['###SITE_GET_ITEMS###'] = $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
-							= $this->setCustomViewGetItems($view['settings']->main_get, $view['settings']->code);
 
 						// check if there is any custom script
-						if (isset($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]) 
+						if (isset($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]) && ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code]))
-							&& ComponentbuilderHelper::checkString($this->customScriptBuilder[$this->target.'_php_after_getitems'][$view['settings']->code]))
 						{
 							// ###SITE_AFTER_GET_ITEMS### <<<DYNAMIC>>>
-							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###']
+							$this->fileContentDynamic[$view['settings']->code]['###SITE_AFTER_GET_ITEMS###'] = PHP_EOL . $this->setPlaceholders($this->customScriptBuilder[$this->target . '_php_after_getitems'][$view['settings']->code], $this->placeholders);
-								= 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]);
 						}
@@ -1066,22 +988,17 @@ class Infusion extends Interpretation
 					}
 					if (!isset($this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC']))
 					{
-						$this->langContent['site'][$this->langPrefix.'_'.$view['settings']->CODE.'_DESC'] 
+						$this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC'] = $view['settings']->description;
-							= $view['settings']->description;
 					}
 					// ###SITE_CUSTOM_METHODS### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
-						= $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_CUSTOM_METHODS###'] 
-						.= $this->setCustomViewCustomMethods($view, $view['settings']->code);
 					// ###SITE_DIPLAY_METHOD### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_DIPLAY_METHOD###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_DIPLAY_METHOD###'] = $this->setCustomViewDisplayMethod($view);
-						= $this->setCustomViewDisplayMethod($view);
 					// set document details
 					$this->setPrepareDocument($view);
 					// ###SITE_EXTRA_DIPLAY_METHODS### <<<DYNAMIC>>>
-					$this->fileContentDynamic[$view['settings']->code]['###SITE_EXTRA_DIPLAY_METHODS###'] 
+					$this->fileContentDynamic[$view['settings']->code]['###SITE_EXTRA_DIPLAY_METHODS###'] = $this->setCustomViewExtraDisplayMethods($view);
-						= $this->setCustomViewExtraDisplayMethods($view);
 					// ###SITE_CODE_BODY### <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code]['###SITE_CODE_BODY###'] = $this->setCustomViewCodeBody($view);
 					// ###SITE_BODY### <<<DYNAMIC>>>
@@ -1097,8 +1014,7 @@ class Infusion extends Interpretation
 				}
 				// set site custom script to helper class
 				// ###SITE_CUSTOM_HELPER_SCRIPT###
-				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] 
+				$this->fileContentStatic['###SITE_CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_site'], $this->placeholders);
-					= $this->setPlaceholders($this->customScriptBuilder['component_php_helper_site'], $this->placeholders);
 				// ###SITE_GLOBAL_EVENT_HELPER###
 				$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] = '';
 				// ###SITE_GLOBAL_EVENT###
@@ -1107,17 +1023,14 @@ class Infusion extends Interpretation
 				if ($this->componentData->add_site_event == 1)
 				{
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] = PHP_EOL . PHP_EOL . '// Triger the Global Site Event';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] 
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT###'] .= PHP_EOL . $this->fileContentStatic['###Component###'] . 'Helper::globalEvent($document);';
-						.= PHP_EOL.$this->fileContentStatic['###Component###'].'Helper::globalEvent($document);';
 					// ###SITE_GLOBAL_EVENT_HELPER###
 					$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###'] 
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . 'public static function globalEvent($document)';
-						.= PHP_EOL."\t".'public static function globalEvent($document)';
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '{';
-					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] 
+					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . $this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
-						.= PHP_EOL.$this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
 					$this->fileContentStatic['###SITE_GLOBAL_EVENT_HELPER###'] .= PHP_EOL . "\t" . '}';
 				}
 				// setup the layouts
@@ -1151,8 +1064,7 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###CONFIG_FIELDSETS###'] = implode(PHP_EOL, $this->configFieldSets);
 
 			// check if this has been set
-			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) 
+			if (!isset($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']) || !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))
-				|| !ComponentbuilderHelper::checkString($this->fileContentStatic['###ROUTER_BUILD_VIEWS###']))
 			{
 				$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = 0;
 			}
@@ -1314,4 +1226,5 @@ class Infusion extends Interpretation
 			}
 		}
 	}
+
 }

admin/helpers/componentbuilder.php

@@ -391,12 +391,16 @@ abstract class ComponentbuilderHelper
 								// load document script
 								$files[md5($url['path'])] =  '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LOCAL');
 							}
+							// check if link must be added
+							if (isset($url['url']) && ((isset($url['type']) && $url['type'] == 1) || (isset($url['type']) && $url['type'] == 3) || !isset($url['type'])))
+							{
 								// load url also if not building document
 								$files[md5($url['url'])] = '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LINK');
 							}
 						}
 					}
 				}
+			}
 			// load the local files
 			if (self::checkJson($result->addfiles))
 			{
@@ -475,7 +479,7 @@ abstract class ComponentbuilderHelper
 							// load per path
 							foreach($paths as $path)
 							{
-								$files[md5($root.'/'.trim($path, '/'))] = '(' . JText::_('COM_COMPONENTBUILDER_FOLDER') . ') ' . basename($path);
+								$files[md5($root.'/'.trim($path, '/'))] = '(' . JText::_('COM_COMPONENTBUILDER_FOLDER') . ') ' . basename($path) . ' - ' . basename($root);
 							}
 						}
 					}

admin/helpers/componentbuilderemail.php

@@ -188,7 +188,6 @@ abstract class ComponentbuilderEmail
 		// load the bounce email as sender if set
 		if (!is_null($bounce_email))
 		{		
-		
 			$mail->Sender = $bounce_email;
 		}
 		

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

@@ -898,6 +898,7 @@ COM_COMPONENTBUILDER_BASIC_TUTORIAL_ON_GIT_BSB="Basic Tutorial on git: <b>%s</b>
 COM_COMPONENTBUILDER_BCUSTOM_FILESB_NOT_MOVE_TO_CORRECT_LOCATION="<b>Custom files</b> not move to correct location!"
 COM_COMPONENTBUILDER_BEHIND="Behind"
 COM_COMPONENTBUILDER_BEHIND_MEANS_YOUR_BLOCAL_SNIPPETB_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_A_BOLDER_MODIFIED_DATEB_THEN_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE="Behind means your <b>local snippet</b> (with the same name, library and type) has a <b>older modified date</b> then the community snippet (with the same name, library and type)."
+COM_COMPONENTBUILDER_BETA_RELEASE="Beta Release"
 COM_COMPONENTBUILDER_BE_CAUTIOUS_DO_NOT_CONTINUE_UNLESS_YOU_TRUST_THE_ORIGIN_OF_THIS_PACKAGE="Be cautious! Do not continue unless you trust the origin of this package!"
 COM_COMPONENTBUILDER_BFIELD_TYPEB_IDS_MISMATCH_IN_BSB="<b>Field type</b> id:%s mismatch in <b>%s</b>."
 COM_COMPONENTBUILDER_BFIELD_TYPEB_NOT_SET_FOR_BSB="<b>Field type</b> not set for <b>%s</b>."
@@ -2460,6 +2461,9 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL="Add CSS (custom d
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL="Add CSS"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON="Add Custom Button"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL="Add Custom Button"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE="Add Javascript File"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION="Add JavaScript to the JavaScript file linked to this view."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL="Add JavaScript (file)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT="Add Js Document"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL="Add JS (custom document script)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
@@ -2551,7 +2555,6 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_BUTTON_LABEL="Custom Buttons"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET="Custom Get"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION="Select the custom get methods"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL="Custom Gets"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DASHBOARD="Dashboard"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DATABASE="Database"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT="Default"
@@ -2624,6 +2627,11 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGE="Image"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGES="Images"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INFO="Info"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INFO_CIRCLE="Info Circle"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_CSS="JavaScript & CSS"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE="Javascript File"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_HINT="// JavaScript for the view that is loaded in the header via a JS file"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL="Javascript"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT="Js Document"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION="JS script to the document method."
@@ -2693,6 +2701,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PENCIL_TWO="Pencil 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE_TWO="Phone 2"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP="PHP"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER="Php Controller"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target"
@@ -3410,6 +3419,7 @@ COM_COMPONENTBUILDER_EMOWNEREM_BSB="<em>Owner:</em> <b>%s</b>"
 COM_COMPONENTBUILDER_EMWEBSITEEM_BSB="<em>Website:</em> <b>%s</b>"
 COM_COMPONENTBUILDER_EQUAL="Equal"
 COM_COMPONENTBUILDER_EQUAL_MEANS_THAT_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_AND_YOUR_LOCAL_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_THE_SAME_BCREATIONB_AND_BMODIFIED_DATEB="Equal means that the community snippet (with the same name, library and type) and your local snippet (with the same name, library and type) has the same <b>creation</b> and <b>modified date</b>."
+COM_COMPONENTBUILDER_ERROR="Error"
 COM_COMPONENTBUILDER_ERROR_THE_PATH_HAS_A_MISMATCH_AND_COULD_THEREFORE_NOT_RETRIEVE_THE_SNIPPET_FROM_GITHUB="Error! The path has a mismatch and could therefore not retrieve the snippet from gitHub!"
 COM_COMPONENTBUILDER_ERROR_THE_SNIPPET_IS_FAULTY_AND_COULD_NOT_BE_SAVED="Error! The snippet is faulty and could not be saved."
 COM_COMPONENTBUILDER_ERROR_YOU_DO_NOT_HAVE_ACCESS_TO_THE_SNIPPETS="Error! You do not have access to the snippets."
@@ -5030,6 +5040,8 @@ COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION="This libra
 COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL="Build-in Behaviour"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION="<h4>Linked Config Fields <span id='header_library_config_buttons'></span></h4><div id='display_library_config' >Display of the config fields will load here!</div>"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION="<h4>Linked Files, Folders & URLs <span id='header_library_files_folders_urls_buttons'></span></h4><div id='display_library_files_folders_urls' >Display of the files, folders & urls will load here!</div>"
+COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION="Watch a <a href='https://www.youtube.com/watch?v=rDjvgLYOt1o&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE' target='_blank'>tutorial overview</a> of the new library manager concept."
+COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL="Quick overview"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION="There is no behaviour set for this library. This means JCB will not add any files unless you custom code it in somewhere."
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL="No Behaviour"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION="There is no behaviour set for this library. This means JCB will not add any files unless you custom code it in somewhere."
@@ -5209,6 +5221,9 @@ COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL="Add CSS (custom document
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL="Add CSS"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON="Add Custom Button"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL="Add Custom Button"
+COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE="Add Javascript File"
+COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION="Add JavaScript to the JavaScript file linked to this view."
+COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_LABEL="Add JavaScript (file)"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT="Add Js Document"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL="Add JS (custom document script)"
 COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX="Add Php Ajax"
@@ -5394,6 +5409,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_INPUT_FILTER_DESCRIPTION="Select the filter used
 COM_COMPONENTBUILDER_SITE_VIEW_INPUT_FILTER_LABEL="Select a Filter"
 COM_COMPONENTBUILDER_SITE_VIEW_INT="INT"
 COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_CSS="JavaScript & CSS"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE="Javascript File"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_HINT="// JavaScript for the view that is loaded in the header via a JS file"
+COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL="Javascript"
 COM_COMPONENTBUILDER_SITE_VIEW_JOOMLA="Joomla"
 COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT="Js Document"
 COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION="JS script to the document method."
@@ -5825,6 +5844,7 @@ COM_COMPONENTBUILDER_SUBMENU_TEMPLATES="Templates"
 COM_COMPONENTBUILDER_SUCCESS_THE_SNIPPET_WAS_SAVED="Success! The snippet was saved."
 COM_COMPONENTBUILDER_SUCCESS_THE_SNIPPET_WAS_SAVED_BUT_THE_MODIFIED_DATE_COULD_NOT_BE_ADJUSTED_BR_BR_BTHIS_MEANS_THE_SNIPPETS_WILL_CONTINUE_TO_APPEAR_OUT_OF_DATEB="Success! The snippet was saved. But the modified date could not be adjusted. <br /><br /><b>This means the snippets will continue to appear out of date.</b>"
 COM_COMPONENTBUILDER_S_BEING_IMPORTED="%s Being Imported"
+COM_COMPONENTBUILDER_S_NOT_LINKED="%s Not Linked"
 COM_COMPONENTBUILDER_S_PLEASE_WAIT_THE_COMPONENT_IS_BEING_COMPILED="%s, please wait! The component is being compiled"
 COM_COMPONENTBUILDER_TAB="Tab"
 COM_COMPONENTBUILDER_TARGET_BEHAVIOR="Target Behavior"
@@ -5953,6 +5973,7 @@ COM_COMPONENTBUILDER_THERE_ARE_NO_NEW_SNIPPETS_AT_THIS_TIME="There are no new sn
 COM_COMPONENTBUILDER_THERE_ARE_NO_OUT_OF_DATE_SNIPPETS_AT_THIS_TIME="There are no out of date snippets at this time"
 COM_COMPONENTBUILDER_THERE_ARE_NO_SNIPPETS_TO_UPDATE_AT_THIS_TIME="There are no snippets to update at this time"
 COM_COMPONENTBUILDER_THERE_HAS_BEEN_AN_ERROR_IF_THIS_CONTINUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR_OF_A_TYPE_ERROR_IN_THE_FIELDS_DISPLAY_REQUEST="There has been an error, if this continues please inform your system administrator of a type error in the fields display request!"
+COM_COMPONENTBUILDER_THERE_WAS_A_PROBLEM_BNO_VIEW_OR_ID_FOUND_IN_SESSION_OR_VIEW_NOT_ALLOWED_TO_ACCESS_AREAB_WE_COULD_NOT_LOAD_ANY_LINKED_TO_VALUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR="There was a problem, <b>no view or id found in session or view not allowed to access area</b>, we could not load any linked to values. Please inform your system administrator!"
 COM_COMPONENTBUILDER_THE_BSB_LIBRARY_CAN_NOT_BE_DELETED_OR_THINGS_WILL_BREAK="The <b>%s</b> library can not be deleted, or things will break."
 COM_COMPONENTBUILDER_THE_COMPONENT_ADMIN_VIEWS="The component admin views"
 COM_COMPONENTBUILDER_THE_COMPONENT_CONFIG="The component config"
@@ -5973,6 +5994,7 @@ COM_COMPONENTBUILDER_THE_SEARCH_FOR_THE_SNIPPETS_ARE_CASE_SENSITIVE_SO_IF_YOU_CH
 COM_COMPONENTBUILDER_THE_SNIPPETS_WERE_SUCCESSFULLY_EXPORTED="The Snippets Were Successfully Exported!"
 COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED="The Snippet Was Successfully Exported!"
 COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
+COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_S="This <b>%s</b> is not linked to any (%s)!"
 COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
 COM_COMPONENTBUILDER_TITLE="Title"
 COM_COMPONENTBUILDER_TOTAL_DOWNLOADS="total downloads"

admin/layouts/custom_admin_view/javascript_css_fullwidth.php

@@ -0,0 +1,55 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		javascript_css_fullwidth.php
+	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'add_js_document',
+	'js_document',
+	'add_javascript_file',
+	'javascript_file',
+	'add_css_document',
+	'css_document',
+	'add_css',
+	'css'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>

admin/layouts/custom_admin_view/php_fullwidth.php

@@ -13,7 +13,7 @@
 	@version		2.6.x
 	@created		30th April, 2015
 	@package		Component Builder
-	@subpackage		custom_script_fullwidth.php
+	@subpackage		php_fullwidth.php
 	@author			Llewellyn van der Merwe <http://vdm.bz/component-builder>	
 	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
 	@copyright		Copyright (C) 2015. All Rights Reserved
@@ -37,13 +37,7 @@ $fields = $displayData->get('fields') ?: array(
 	'add_php_jview_display',
 	'php_jview_display',
 	'add_php_jview',
-	'php_jview',
+	'php_jview'
-	'add_js_document',
-	'js_document',
-	'add_css_document',
-	'css_document',
-	'add_css',
-	'css'
 );
 
 ?>

admin/layouts/fieldtype/fields_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vzwfields;
+$items	= $displayData->vzyfields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";

admin/layouts/ftp/linked_components_fullwidth.php

@@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items	= $displayData->vzxlinked_components;
+$items	= $displayData->vzzlinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";

admin/layouts/library/behaviour_left.php

@@ -30,6 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
+	'note_library_instruction',
 	'libraries'
 );
 

admin/layouts/site_view/javascript_css_fullwidth.php

@@ -30,6 +30,8 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();
 
 $fields = $displayData->get('fields') ?: array(
+	'add_javascript_file',
+	'javascript_file',
 	'add_js_document',
 	'js_document',
 	'add_css_document',

admin/models/ajax.php

@@ -1072,6 +1072,103 @@ class ComponentbuilderModelAjax extends JModelList
 		return false;
 	}
 
+	/**
+	 * Get Linked to
+	 * 
+	 * @param   string   $type  Item Name
+	 * @param   int        $id     Item ID
+	 *
+	 * @return  string      The table of the linked to result
+	 * 
+	 */
+	protected function getLinked($to)
+	{
+		// get the view name & id
+		$values = $this->getViewID();
+		// check if item is set
+		if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']))
+		{
+			// get linked to
+			$linkedToArray = (array) explode('__', $to);
+			// check if item is linked to component
+			if (in_array('component', $linkedToArray))
+			{
+				if (!$components = getComponentLinked($values['a_view'], $values['a_id']))
+				{
+					$linkedToString =  implode(', ', array_map( function($name) { return ComponentbuilderHelper::safeString($name, 'w'); }, $linkedToArray));
+					return '<div class="control-group"><div class="alert alert-info"><h4>' . JText::sprintf('COM_COMPONENTBUILDER_S_NOT_LINKED', ComponentbuilderHelper::safeString($values['a_view'], 'Ww')) . '</h4><p>' . JText::sprintf('COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_S', $values['a_view'], $linkedToString) . '</p></div></div>';
+				}
+			}
+			// if fields and components found get admin views
+			
+		}
+		// no view or id found in session, or view not allowed to access area
+		return '<div class="control-group"><div class="alert alert-error"><h4>' . JText::_('COM_COMPONENTBUILDER_ERROR') . '</h4><p>' . JText::_('COM_COMPONENTBUILDER_THERE_WAS_A_PROBLEM_BNO_VIEW_OR_ID_FOUND_IN_SESSION_OR_VIEW_NOT_ALLOWED_TO_ACCESS_AREAB_WE_COULD_NOT_LOAD_ANY_LINKED_TO_VALUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR') . '</p></div></div>';
+	}
+
+	/**
+	 * Get Component Linked to Item
+	 * 
+	 * @param   string   $type  Item Name
+	 * @param   int        $id     Item ID
+	 *
+	 * @return  array       Components Id if found
+	 * 
+	 */
+	protected function getComponentLinked($type, $id)
+	{
+		// reset bucket
+		$componentsLinked = array();
+		// Create a new query object.
+		$query = $this->db->getQuery(true);
+		// get all history values
+		$query->select('h.*');
+		$query->from('#__ucm_history AS h');
+		$query->where($this->db->quoteName('h.ucm_item_id') . ' = ' . (int) $id);
+		// Join over the content type for the type id
+		$query->join('LEFT', '#__content_types AS ct ON ct.type_id = h.ucm_type_id');
+		$query->where('ct.type_alias = ' . $this->db->quote('com_componentbuilder.' . $type));
+		$this->db->setQuery($query);
+		$this->db->execute();
+		if ($this->db->getNumRows())
+		{
+			// load all item history
+			$items = $db->loadObjectList();
+			// load the components ids
+			foreach ($items as $item)
+			{
+				// only work with those who have notes
+				if (ComponentbuilderHelper::checkJson($item->version_note))
+				{
+					$note = json_decode($item->version_note, true);
+					if (ComponentbuilderHelper::checkArray($note))
+					{
+						foreach($note as $ids)
+						{
+							if (ComponentbuilderHelper::checkArray($ids))
+							{
+								foreach ($ids as $_id)
+								{
+									$componentsLinked[(int) $_id] = array('component' => (int) $_id);
+								}
+							}
+							elseif (is_numeric($ids))
+							{
+								$componentsLinked[(int) $ids] = array('component' => (int) $ids);
+							}
+						}
+					}
+				}
+			}
+			// check if we found any
+			if (ComponentbuilderHelper::checkArray($componentLinked))
+			{
+				return $componentLinked;
+			}
+		}
+		return false;
+	}
+
 	// Used in site_view
 			
 	public function getSnippets($libraries)

admin/models/componentbuilder.php

@@ -379,10 +379,22 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 				// set the update notice while we are at it
 				var activeVersion = tagreleases[0].tag_name.substring(1);
 				if (activeVersion === manifest.version) {
+					// local version is in sync with latest release
 					jQuery(".update-notice").html("<small><span style=\'color:green;\'><span class=\'icon-shield\'></span>'.JText::_('COM_COMPONENTBUILDER_UP_TO_DATE').'</span></small>");
 				} else {
+					// split versions in to array
+					var activeVersionArray = activeVersion.split(".");
+					var localVersionArray = manifest.version.split(".");
+					if (localVersionArray[0] > activeVersionArray[0] || 
+					(localVersionArray[0] == activeVersionArray[0] && localVersionArray[1] > activeVersionArray[1]) || 
+					(localVersionArray[0] == activeVersionArray[0] && localVersionArray[1] == activeVersionArray[1] && localVersionArray[2] > activeVersionArray[2])) {
+						// local version head latest release
+						jQuery(".update-notice").html("<small><span style=\'color:#F7B033;\'><span class=\'icon-wrench\'></span>'.JText::_('COM_COMPONENTBUILDER_BETA_RELEASE').'</span></small>");
+					} else {
+						// local version behind latest release
 						jQuery(".update-notice").html("<small><span style=\'color:red;\'><span class=\'icon-warning-circle\'></span>'.JText::_('COM_COMPONENTBUILDER_OUT_OF_DATE').'</span></small>");
 					}
+				}
 				// set the taged releases
 				jQuery("#tagreleases").html("");
 				jQuery.each(tagreleases, function (i, tagrelease) {

admin/models/custom_admin_view.php

@@ -103,14 +103,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}
 
-			if (!empty($item->custom_button))
-			{
-				// Convert the custom_button field to an array.
-				$custom_button = new Registry;
-				$custom_button->loadString($item->custom_button);
-				$item->custom_button = $custom_button->toArray();
-			}
-
 			if (!empty($item->custom_get))
 			{
 				// Convert the custom_get field to an array.
@@ -119,6 +111,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->custom_get = $custom_get->toArray();
 			}
 
+			if (!empty($item->custom_button))
+			{
+				// Convert the custom_button field to an array.
+				$custom_button = new Registry;
+				$custom_button->loadString($item->custom_button);
+				$item->custom_button = $custom_button->toArray();
+			}
+
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
@@ -137,6 +137,30 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->php_model = base64_decode($item->php_model);
 			}
 
+			if (!empty($item->js_document))
+			{
+				// base64 Decode js_document.
+				$item->js_document = base64_decode($item->js_document);
+			}
+
+			if (!empty($item->javascript_file))
+			{
+				// base64 Decode javascript_file.
+				$item->javascript_file = base64_decode($item->javascript_file);
+			}
+
+			if (!empty($item->css_document))
+			{
+				// base64 Decode css_document.
+				$item->css_document = base64_decode($item->css_document);
+			}
+
+			if (!empty($item->css))
+			{
+				// base64 Decode css.
+				$item->css = base64_decode($item->css);
+			}
+
 			if (!empty($item->php_document))
 			{
 				// base64 Decode php_document.
@@ -161,24 +185,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->php_jview = base64_decode($item->php_jview);
 			}
 
-			if (!empty($item->js_document))
-			{
-				// base64 Decode js_document.
-				$item->js_document = base64_decode($item->js_document);
-			}
-
-			if (!empty($item->css_document))
-			{
-				// base64 Decode css_document.
-				$item->css_document = base64_decode($item->css_document);
-			}
-
-			if (!empty($item->css))
-			{
-				// base64 Decode css.
-				$item->css = base64_decode($item->css);
-			}
-
 			// check what type of custom_button array we have here (should be subform... but just incase)
 			// This could happen due to huge data sets
 			if (isset($item->custom_button) && isset($item->custom_button['name']))
@@ -939,19 +945,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['libraries'] = '';
 		}
 
-		// Set the custom_button items to data.
-		if (isset($data['custom_button']) && is_array($data['custom_button']))
-		{
-			$custom_button = new JRegistry;
-			$custom_button->loadArray($data['custom_button']);
-			$data['custom_button'] = (string) $custom_button;
-		}
-		elseif (!isset($data['custom_button']))
-		{
-			// Set the empty custom_button to data
-			$data['custom_button'] = '';
-		}
-
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
 		{
@@ -965,6 +958,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['custom_get'] = '';
 		}
 
+		// Set the custom_button items to data.
+		if (isset($data['custom_button']) && is_array($data['custom_button']))
+		{
+			$custom_button = new JRegistry;
+			$custom_button->loadArray($data['custom_button']);
+			$data['custom_button'] = (string) $custom_button;
+		}
+		elseif (!isset($data['custom_button']))
+		{
+			// Set the empty custom_button to data
+			$data['custom_button'] = '';
+		}
+
 		// Set the php_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
@@ -983,6 +989,30 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
+		// Set the js_document string to base64 string.
+		if (isset($data['js_document']))
+		{
+			$data['js_document'] = base64_encode($data['js_document']);
+		}
+
+		// Set the javascript_file string to base64 string.
+		if (isset($data['javascript_file']))
+		{
+			$data['javascript_file'] = base64_encode($data['javascript_file']);
+		}
+
+		// Set the css_document string to base64 string.
+		if (isset($data['css_document']))
+		{
+			$data['css_document'] = base64_encode($data['css_document']);
+		}
+
+		// Set the css string to base64 string.
+		if (isset($data['css']))
+		{
+			$data['css'] = base64_encode($data['css']);
+		}
+
 		// Set the php_document string to base64 string.
 		if (isset($data['php_document']))
 		{
@@ -1007,24 +1037,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['php_jview'] = base64_encode($data['php_jview']);
 		}
         
-		// Set the js_document string to base64 string.
-		if (isset($data['js_document']))
-		{
-			$data['js_document'] = base64_encode($data['js_document']);
-		}
-
-		// Set the css_document string to base64 string.
-		if (isset($data['css_document']))
-		{
-			$data['css_document'] = base64_encode($data['css_document']);
-		}
-
-		// Set the css string to base64 string.
-		if (isset($data['css']))
-		{
-			$data['css'] = base64_encode($data['css']);
-		}
-        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{

admin/models/custom_admin_views.php

@@ -272,6 +272,14 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 						$item->default = base64_decode($item->default);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
+						// decode js_document
+						$item->js_document = base64_decode($item->js_document);
+						// decode javascript_file
+						$item->javascript_file = base64_decode($item->javascript_file);
+						// decode css_document
+						$item->css_document = base64_decode($item->css_document);
+						// decode css
+						$item->css = base64_decode($item->css);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
 						// decode php_view
@@ -280,12 +288,6 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 						$item->php_jview_display = base64_decode($item->php_jview_display);
 						// decode php_jview
 						$item->php_jview = base64_decode($item->php_jview);
-						// decode js_document
-						$item->js_document = base64_decode($item->js_document);
-						// decode css_document
-						$item->css_document = base64_decode($item->css_document);
-						// decode css
-						$item->css = base64_decode($item->css);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);

admin/models/fieldtype.php

@@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVzwfields()
+	public function getVzyfields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationVzwfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationVzyfields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationVzwfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationVzyfields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationVzwfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationVzyfields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationVzwfields($item->store, 'store');
+					$item->store = $this->selectionTranslationVzyfields($item->store, 'store');
 				}
 			}
 
@@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationVzwfields($value,$name)
+	public function selectionTranslationVzyfields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')

admin/models/forms/custom_admin_view.js

@@ -30,8 +30,9 @@ jform_vvvvvydvxy_required = false;
 jform_vvvvvyevxz_required = false;
 jform_vvvvvyfvya_required = false;
 jform_vvvvvygvyb_required = false;
-jform_vvvvvygvyc_required = false;
+jform_vvvvvyhvyc_required = false;
 jform_vvvvvyhvyd_required = false;
+jform_vvvvvyivye_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -51,14 +52,17 @@ jQuery(document).ready(function()
 	var add_css_document_vvvvvye = jQuery("#jform_add_css_document input[type='radio']:checked").val();
 	vvvvvye(add_css_document_vvvvvye);
 
-	var add_js_document_vvvvvyf = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyf(add_js_document_vvvvvyf);
+	vvvvvyf(add_javascript_file_vvvvvyf);
 
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	vvvvvyg(add_js_document_vvvvvyg);
 
-	var add_css_vvvvvyh = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_css_vvvvvyh);
+	vvvvvyh(add_custom_button_vvvvvyh);
+
+	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyi(add_css_vvvvvyi);
 });
 
 // the vvvvvya function
@@ -217,61 +221,92 @@ function vvvvvye(add_css_document_vvvvvye)
 }
 
 // the vvvvvyf function
-function vvvvvyf(add_js_document_vvvvvyf)
+function vvvvvyf(add_javascript_file_vvvvvyf)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyf == 1)
+	if (add_javascript_file_vvvvvyf == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_javascript_file').closest('.control-group').show();
 		if (jform_vvvvvyfvya_required)
 		{
-			updateFieldRequired('js_document',0);
+			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyfvya_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_javascript_file').closest('.control-group').hide();
 		if (!jform_vvvvvyfvya_required)
 		{
-			updateFieldRequired('js_document',1);
+			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyfvya_required = true;
 		}
 	}
 }
 
 // the vvvvvyg function
-function vvvvvyg(add_custom_button_vvvvvyg)
+function vvvvvyg(add_js_document_vvvvvyg)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyg == 1)
+	if (add_js_document_vvvvvyg == 1)
+	{
+		jQuery('#jform_js_document').closest('.control-group').show();
+		if (jform_vvvvvygvyb_required)
+		{
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
+			jform_vvvvvygvyb_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document').closest('.control-group').hide();
+		if (!jform_vvvvvygvyb_required)
+		{
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
+			jform_vvvvvygvyb_required = true;
+		}
+	}
+}
+
+// the vvvvvyh function
+function vvvvvyh(add_custom_button_vvvvvyh)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyh == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvygvyb_required)
+		if (jform_vvvvvyhvyc_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvygvyb_required = false;
+			jform_vvvvvyhvyc_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvygvyc_required)
+		if (jform_vvvvvyhvyd_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvygvyc_required = false;
+			jform_vvvvvyhvyd_required = false;
 		}
 
 	}
@@ -279,53 +314,53 @@ function vvvvvyg(add_custom_button_vvvvvyg)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvygvyb_required)
+		if (!jform_vvvvvyhvyc_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvygvyb_required = true;
+			jform_vvvvvyhvyc_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvygvyc_required)
+		if (!jform_vvvvvyhvyd_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvygvyc_required = true;
+			jform_vvvvvyhvyd_required = true;
 		}
 	}
 }
 
-// the vvvvvyh function
+// the vvvvvyi function
-function vvvvvyh(add_css_vvvvvyh)
+function vvvvvyi(add_css_vvvvvyi)
 {
 	// set the function logic
-	if (add_css_vvvvvyh == 1)
+	if (add_css_vvvvvyi == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvyhvyd_required)
+		if (jform_vvvvvyivye_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyhvyd_required = false;
+			jform_vvvvvyivye_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyd_required)
+		if (!jform_vvvvvyivye_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyhvyd_required = true;
+			jform_vvvvvyivye_required = true;
 		}
 	}
 }

admin/models/forms/custom_admin_view.xml

@@ -138,30 +138,10 @@
                        multiple="false"
                        required="false"
                        button="true" />
-                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Add_css_document Field. Type: Radio. (joomla)-->
-                <field type="note"
-                       name="note_libraries_selection"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_libraries_selection" />
-                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_add_language_string"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
-                       heading="h4"
-                       class="note_add_language_string" />
-                <!-- Icon Field. Type: Media. (joomla)-->
-                <field type="media"
-                       name="icon"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
-                       directory="" />
-                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_jview"
+                       name="add_css_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -169,10 +149,16 @@
                         <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
                 </field>
-                <!-- Add_css_document Field. Type: Radio. (joomla)-->
+                <!-- Icon Field. Type: Media. (joomla)-->
+                <field type="media"
+                       name="icon"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
+                       directory="" />
+                <!-- Add_js_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_css_document"
+                       name="add_js_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -191,6 +177,31 @@
                         <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
                 </field>
+                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_add_language_string"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
+                       heading="h4"
+                       class="note_add_language_string" />
+                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_jview_display"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_libraries_selection"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_libraries_selection" />
                 <!-- Libraries Field. Type: Libraries. (custom)-->
                 <field type="libraries"
                        name="libraries"
@@ -201,10 +212,27 @@
                        default="0"
                        required="false"
                        button="true" />
-                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <!-- Add_css Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_jview_display"
+                       name="add_css"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
+                <!-- Add_php_view Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_view"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -223,27 +251,10 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT"
                        required="false" />
-                <!-- Add_js_document Field. Type: Radio. (joomla)-->
+                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_js_document"
+                       name="add_php_jview"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_uikit_snippet"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
-                       heading="h4"
-                       class="snippet-code note_uikit_snippet" />
-                <!-- Add_css Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_css"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CSS_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -257,6 +268,159 @@
                        label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL"
                        heading="h4"
                        class="snippet-usage note_snippet_usage" />
+                <!-- Default Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="default"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_LABEL"
+                       rows="20"
+                       cols="15"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT"
+                       required="true" />
+                <!-- Php_model Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_model"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT"
+                       required="false" />
+                <!-- Add_javascript_file Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_javascript_file"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Js_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="js_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
+                <!-- Javascript_file Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="javascript_file"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_HINT"
+                       required="true" />
+                <!-- Custom_get Field. Type: Customgets. (custom)-->
+                <field type="customgets"
+                       name="custom_get"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
+                       multiple="true" />
+                <!-- Css_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="css_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Main_get Field. Type: Maingets. (custom)-->
+                <field type="maingets"
+                       name="main_get"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
+                       multiple="false"
+                       required="true"
+                       button="true" />
+                <!-- Css Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="css"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_HINT"
+                       required="true" />
+                <!-- Dynamic_get Field. Type: Dynamicgets. (custom)-->
+                <field type="dynamicgets"
+                       name="dynamic_get"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
+                       multiple="false"
+                       required="false" />
+                <!-- Php_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="dynamic_values"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_DESCRIPTION"
+                       heading="h4"
+                       class="dynamic_values" />
+                <!-- Php_view Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_view"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
+                       required="true" />
+                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_custom_button"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview_display"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT"
+                       required="true" />
                 <!-- Custom_button Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="custom_button"
@@ -544,89 +708,6 @@
                                 </field>
                         </form>
                 </field>
-                <!-- Default Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="default"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_LABEL"
-                       rows="20"
-                       cols="15"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT"
-                       required="true" />
-                <!-- Php_model Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_model"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT"
-                       required="false" />
-                <!-- Add_php_view Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Php_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
-                       required="true" />
-                <!-- Custom_get Field. Type: Customgets. (custom)-->
-                <field type="customgets"
-                       name="custom_get"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_GET_DESCRIPTION"
-                       multiple="true" />
-                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_jview_display"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT"
-                       required="true" />
-                <!-- Main_get Field. Type: Maingets. (custom)-->
-                <field type="maingets"
-                       name="main_get"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MAIN_GET_DESCRIPTION"
-                       multiple="false"
-                       required="true"
-                       button="true" />
                 <!-- Php_jview Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_jview"
@@ -638,64 +719,6 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_HINT"
                        required="true" />
-                <!-- Dynamic_get Field. Type: Dynamicgets. (custom)-->
-                <field type="dynamicgets"
-                       name="dynamic_get"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
-                       multiple="false"
-                       required="false" />
-                <!-- Js_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="js_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JS_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="dynamic_values"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_DESCRIPTION"
-                       heading="h4"
-                       class="dynamic_values" />
-                <!-- Css_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="css_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_custom_button"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Css Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="css"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS_HINT"
-                       required="true" />
         </fieldset>
 	
 	<!-- Access Control Fields. -->

admin/models/forms/custom_code.js

@@ -23,43 +23,43 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzqvzi_required = false;
+jform_vvvvvzsvzk_required = false;
-jform_vvvvvzrvzj_required = false;
+jform_vvvvvztvzl_required = false;
-jform_vvvvvzrvzk_required = false;
+jform_vvvvvztvzm_required = false;
-jform_vvvvvzrvzl_required = false;
+jform_vvvvvztvzn_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvvzq = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzq(target_vvvvvzq);
-
-	var target_vvvvvzr = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzr(target_vvvvvzr);
-
 	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzs(target_vvvvvzs);
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
 
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
+	vvvvvzt(target_vvvvvzt);
+
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
 });
 
-// the vvvvvzq function
+// the vvvvvzs function
-function vvvvvzq(target_vvvvvzq)
+function vvvvvzs(target_vvvvvzs)
 {
 	// set the function logic
-	if (target_vvvvvzq == 2)
+	if (target_vvvvvzs == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzqvzi_required)
+		if (jform_vvvvvzsvzk_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvvzqvzi_required = false;
+			jform_vvvvvzsvzk_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -68,99 +68,99 @@ function vvvvvzq(target_vvvvvzq)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzqvzi_required)
+		if (!jform_vvvvvzsvzk_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvvzqvzi_required = true;
+			jform_vvvvvzsvzk_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvvzr function
+// the vvvvvzt function
-function vvvvvzr(target_vvvvvzr)
+function vvvvvzt(target_vvvvvzt)
 {
 	// set the function logic
-	if (target_vvvvvzr == 1)
+	if (target_vvvvvzt == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvzrvzj_required)
+		if (jform_vvvvvztvzl_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvzrvzj_required = false;
+			jform_vvvvvztvzl_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzrvzk_required)
+		if (jform_vvvvvztvzm_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvzrvzk_required = false;
+			jform_vvvvvztvzm_required = false;
 		}
 
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvvzrvzl_required)
+		if (jform_vvvvvztvzn_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvzrvzl_required = false;
+			jform_vvvvvztvzn_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzj_required)
+		if (!jform_vvvvvztvzl_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvzrvzj_required = true;
+			jform_vvvvvztvzl_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzk_required)
+		if (!jform_vvvvvztvzm_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvzrvzk_required = true;
+			jform_vvvvvztvzm_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzl_required)
+		if (!jform_vvvvvztvzn_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvzrvzl_required = true;
+			jform_vvvvvztvzn_required = true;
 		}
 	}
 }
 
-// the vvvvvzs function
+// the vvvvvzu function
-function vvvvvzs(target_vvvvvzs,type_vvvvvzs)
+function vvvvvzu(target_vvvvvzu,type_vvvvvzu)
 {
 	// set the function logic
-	if (target_vvvvvzs == 1 && type_vvvvvzs == 1)
+	if (target_vvvvvzu == 1 && type_vvvvvzu == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -172,11 +172,11 @@ function vvvvvzs(target_vvvvvzs,type_vvvvvzs)
 	}
 }
 
-// the vvvvvzt function
+// the vvvvvzv function
-function vvvvvzt(type_vvvvvzt,target_vvvvvzt)
+function vvvvvzv(type_vvvvvzv,target_vvvvvzv)
 {
 	// set the function logic
-	if (type_vvvvvzt == 1 && target_vvvvvzt == 1)
+	if (type_vvvvvzv == 1 && target_vvvvvzv == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();

admin/models/forms/field.js

@@ -23,210 +23,96 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwacvzo_required = false;
-jform_vvvvwadvzp_required = false;
 jform_vvvvwaevzq_required = false;
 jform_vvvvwafvzr_required = false;
-jform_vvvvwaivzs_required = false;
+jform_vvvvwagvzs_required = false;
-jform_vvvvwajvzt_required = false;
+jform_vvvvwahvzt_required = false;
 jform_vvvvwakvzu_required = false;
 jform_vvvvwalvzv_required = false;
+jform_vvvvwamvzw_required = false;
+jform_vvvvwanvzx_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwac = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwac(datalenght_vvvvwac);
+	vvvvwae(datalenght_vvvvwae);
 
-	var datadefault_vvvvwad = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwad(datadefault_vvvvwad);
+	vvvvwaf(datadefault_vvvvwaf);
 
-	var datatype_vvvvwae = jQuery("#jform_datatype").val();
-	vvvvwae(datatype_vvvvwae);
-
-	var datatype_vvvvwaf = jQuery("#jform_datatype").val();
-	vvvvwaf(datatype_vvvvwaf);
-
-	var store_vvvvwag = jQuery("#jform_store").val();
 	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
+	vvvvwag(datatype_vvvvwag);
 
-	var add_css_view_vvvvwai = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var datatype_vvvvwah = jQuery("#jform_datatype").val();
-	vvvvwai(add_css_view_vvvvwai);
+	vvvvwah(datatype_vvvvwah);
 
-	var add_css_views_vvvvwaj = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var store_vvvvwai = jQuery("#jform_store").val();
-	vvvvwaj(add_css_views_vvvvwaj);
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
 
-	var add_javascript_view_footer_vvvvwak = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwak(add_javascript_view_footer_vvvvwak);
+	vvvvwak(add_css_view_vvvvwak);
 
-	var add_javascript_views_footer_vvvvwal = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwal(add_javascript_views_footer_vvvvwal);
+	vvvvwal(add_css_views_vvvvwal);
+
+	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwam(add_javascript_view_footer_vvvvwam);
+
+	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwan(add_javascript_views_footer_vvvvwan);
 });
 
-// the vvvvwac function
+// the vvvvwae function
-function vvvvwac(datalenght_vvvvwac)
+function vvvvwae(datalenght_vvvvwae)
 {
-	if (isSet(datalenght_vvvvwac) && datalenght_vvvvwac.constructor !== Array)
+	if (isSet(datalenght_vvvvwae) && datalenght_vvvvwae.constructor !== Array)
 	{
-		var temp_vvvvwac = datalenght_vvvvwac;
+		var temp_vvvvwae = datalenght_vvvvwae;
-		var datalenght_vvvvwac = [];
+		var datalenght_vvvvwae = [];
-		datalenght_vvvvwac.push(temp_vvvvwac);
+		datalenght_vvvvwae.push(temp_vvvvwae);
 	}
-	else if (!isSet(datalenght_vvvvwac))
+	else if (!isSet(datalenght_vvvvwae))
 	{
-		var datalenght_vvvvwac = [];
+		var datalenght_vvvvwae = [];
 	}
-	var datalenght = datalenght_vvvvwac.some(datalenght_vvvvwac_SomeFunc);
+	var datalenght = datalenght_vvvvwae.some(datalenght_vvvvwae_SomeFunc);
 
 
 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwacvzo_required)
+		if (jform_vvvvwaevzq_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwacvzo_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwacvzo_required)
-		{
-			updateFieldRequired('datalenght_other',1);
-			jQuery('#jform_datalenght_other').removeAttr('required');
-			jQuery('#jform_datalenght_other').removeAttr('aria-required');
-			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwacvzo_required = true;
-		}
-	}
-}
-
-// the vvvvwac Some function
-function datalenght_vvvvwac_SomeFunc(datalenght_vvvvwac)
-{
-	// set the function logic
-	if (datalenght_vvvvwac == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwad function
-function vvvvwad(datadefault_vvvvwad)
-{
-	if (isSet(datadefault_vvvvwad) && datadefault_vvvvwad.constructor !== Array)
-	{
-		var temp_vvvvwad = datadefault_vvvvwad;
-		var datadefault_vvvvwad = [];
-		datadefault_vvvvwad.push(temp_vvvvwad);
-	}
-	else if (!isSet(datadefault_vvvvwad))
-	{
-		var datadefault_vvvvwad = [];
-	}
-	var datadefault = datadefault_vvvvwad.some(datadefault_vvvvwad_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwadvzp_required)
-		{
-			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwadvzp_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwadvzp_required)
-		{
-			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwadvzp_required = true;
-		}
-	}
-}
-
-// the vvvvwad Some function
-function datadefault_vvvvwad_SomeFunc(datadefault_vvvvwad)
-{
-	// set the function logic
-	if (datadefault_vvvvwad == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwae function
-function vvvvwae(datatype_vvvvwae)
-{
-	if (isSet(datatype_vvvvwae) && datatype_vvvvwae.constructor !== Array)
-	{
-		var temp_vvvvwae = datatype_vvvvwae;
-		var datatype_vvvvwae = [];
-		datatype_vvvvwae.push(temp_vvvvwae);
-	}
-	else if (!isSet(datatype_vvvvwae))
-	{
-		var datatype_vvvvwae = [];
-	}
-	var datatype = datatype_vvvvwae.some(datatype_vvvvwae_SomeFunc);
-
-
-	// set this function logic
-	if (datatype)
-	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvwaevzq_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwaevzq_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
 		if (!jform_vvvvwaevzq_required)
 		{
-			updateFieldRequired('indexes',1);
+			updateFieldRequired('datalenght_other',1);
-			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_datalenght_other').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_datalenght_other').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			jQuery('#jform_datalenght_other').removeClass('required');
 			jform_vvvvwaevzq_required = true;
 		}
 	}
 }
 
 // the vvvvwae Some function
-function datatype_vvvvwae_SomeFunc(datatype_vvvvwae)
+function datalenght_vvvvwae_SomeFunc(datalenght_vvvvwae)
 {
 	// set the function logic
-	if (datatype_vvvvwae == 'CHAR' || datatype_vvvvwae == 'VARCHAR' || datatype_vvvvwae == 'DATETIME' || datatype_vvvvwae == 'DATE' || datatype_vvvvwae == 'TIME' || datatype_vvvvwae == 'INT' || datatype_vvvvwae == 'TINYINT' || datatype_vvvvwae == 'BIGINT' || datatype_vvvvwae == 'FLOAT' || datatype_vvvvwae == 'DECIMAL' || datatype_vvvvwae == 'DOUBLE')
+	if (datalenght_vvvvwae == 'Other')
 	{
 		return true;
 	}
@@ -234,54 +120,54 @@ function datatype_vvvvwae_SomeFunc(datatype_vvvvwae)
 }
 
 // the vvvvwaf function
-function vvvvwaf(datatype_vvvvwaf)
+function vvvvwaf(datadefault_vvvvwaf)
 {
-	if (isSet(datatype_vvvvwaf) && datatype_vvvvwaf.constructor !== Array)
+	if (isSet(datadefault_vvvvwaf) && datadefault_vvvvwaf.constructor !== Array)
 	{
-		var temp_vvvvwaf = datatype_vvvvwaf;
+		var temp_vvvvwaf = datadefault_vvvvwaf;
-		var datatype_vvvvwaf = [];
+		var datadefault_vvvvwaf = [];
-		datatype_vvvvwaf.push(temp_vvvvwaf);
+		datadefault_vvvvwaf.push(temp_vvvvwaf);
 	}
-	else if (!isSet(datatype_vvvvwaf))
+	else if (!isSet(datadefault_vvvvwaf))
 	{
-		var datatype_vvvvwaf = [];
+		var datadefault_vvvvwaf = [];
 	}
-	var datatype = datatype_vvvvwaf.some(datatype_vvvvwaf_SomeFunc);
+	var datadefault = datadefault_vvvvwaf.some(datadefault_vvvvwaf_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		if (jform_vvvvwafvzr_required)
 		{
-			updateFieldRequired('store',0);
+			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			jQuery('#jform_datadefault_other').addClass('required');
 			jform_vvvvwafvzr_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		if (!jform_vvvvwafvzr_required)
 		{
-			updateFieldRequired('store',1);
+			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwafvzr_required = true;
 		}
 	}
 }
 
 // the vvvvwaf Some function
-function datatype_vvvvwaf_SomeFunc(datatype_vvvvwaf)
+function datadefault_vvvvwaf_SomeFunc(datadefault_vvvvwaf)
 {
 	// set the function logic
-	if (datatype_vvvvwaf == 'CHAR' || datatype_vvvvwaf == 'VARCHAR' || datatype_vvvvwaf == 'TEXT' || datatype_vvvvwaf == 'MEDIUMTEXT' || datatype_vvvvwaf == 'LONGTEXT')
+	if (datadefault_vvvvwaf == 'Other')
 	{
 		return true;
 	}
@@ -289,20 +175,8 @@ function datatype_vvvvwaf_SomeFunc(datatype_vvvvwaf)
 }
 
 // the vvvvwag function
-function vvvvwag(store_vvvvwag,datatype_vvvvwag)
+function vvvvwag(datatype_vvvvwag)
 {
-	if (isSet(store_vvvvwag) && store_vvvvwag.constructor !== Array)
-	{
-		var temp_vvvvwag = store_vvvvwag;
-		var store_vvvvwag = [];
-		store_vvvvwag.push(temp_vvvvwag);
-	}
-	else if (!isSet(store_vvvvwag))
-	{
-		var store_vvvvwag = [];
-	}
-	var store = store_vvvvwag.some(store_vvvvwag_SomeFunc);
-
 	if (isSet(datatype_vvvvwag) && datatype_vvvvwag.constructor !== Array)
 	{
 		var temp_vvvvwag = datatype_vvvvwag;
@@ -316,6 +190,132 @@ function vvvvwag(store_vvvvwag,datatype_vvvvwag)
 	var datatype = datatype_vvvvwag.some(datatype_vvvvwag_SomeFunc);
 
 
+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		if (jform_vvvvwagvzs_required)
+		{
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
+			jform_vvvvwagvzs_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		if (!jform_vvvvwagvzs_required)
+		{
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
+			jform_vvvvwagvzs_required = true;
+		}
+	}
+}
+
+// the vvvvwag Some function
+function datatype_vvvvwag_SomeFunc(datatype_vvvvwag)
+{
+	// set the function logic
+	if (datatype_vvvvwag == 'CHAR' || datatype_vvvvwag == 'VARCHAR' || datatype_vvvvwag == 'DATETIME' || datatype_vvvvwag == 'DATE' || datatype_vvvvwag == 'TIME' || datatype_vvvvwag == 'INT' || datatype_vvvvwag == 'TINYINT' || datatype_vvvvwag == 'BIGINT' || datatype_vvvvwag == 'FLOAT' || datatype_vvvvwag == 'DECIMAL' || datatype_vvvvwag == 'DOUBLE')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwah function
+function vvvvwah(datatype_vvvvwah)
+{
+	if (isSet(datatype_vvvvwah) && datatype_vvvvwah.constructor !== Array)
+	{
+		var temp_vvvvwah = datatype_vvvvwah;
+		var datatype_vvvvwah = [];
+		datatype_vvvvwah.push(temp_vvvvwah);
+	}
+	else if (!isSet(datatype_vvvvwah))
+	{
+		var datatype_vvvvwah = [];
+	}
+	var datatype = datatype_vvvvwah.some(datatype_vvvvwah_SomeFunc);
+
+
+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_store').closest('.control-group').show();
+		if (jform_vvvvwahvzt_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwahvzt_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_store').closest('.control-group').hide();
+		if (!jform_vvvvwahvzt_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwahvzt_required = true;
+		}
+	}
+}
+
+// the vvvvwah Some function
+function datatype_vvvvwah_SomeFunc(datatype_vvvvwah)
+{
+	// set the function logic
+	if (datatype_vvvvwah == 'CHAR' || datatype_vvvvwah == 'VARCHAR' || datatype_vvvvwah == 'TEXT' || datatype_vvvvwah == 'MEDIUMTEXT' || datatype_vvvvwah == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwai function
+function vvvvwai(store_vvvvwai,datatype_vvvvwai)
+{
+	if (isSet(store_vvvvwai) && store_vvvvwai.constructor !== Array)
+	{
+		var temp_vvvvwai = store_vvvvwai;
+		var store_vvvvwai = [];
+		store_vvvvwai.push(temp_vvvvwai);
+	}
+	else if (!isSet(store_vvvvwai))
+	{
+		var store_vvvvwai = [];
+	}
+	var store = store_vvvvwai.some(store_vvvvwai_SomeFunc);
+
+	if (isSet(datatype_vvvvwai) && datatype_vvvvwai.constructor !== Array)
+	{
+		var temp_vvvvwai = datatype_vvvvwai;
+		var datatype_vvvvwai = [];
+		datatype_vvvvwai.push(temp_vvvvwai);
+	}
+	else if (!isSet(datatype_vvvvwai))
+	{
+		var datatype_vvvvwai = [];
+	}
+	var datatype = datatype_vvvvwai.some(datatype_vvvvwai_SomeFunc);
+
+
 	// set this function logic
 	if (store && datatype)
 	{
@@ -327,148 +327,148 @@ function vvvvwag(store_vvvvwag,datatype_vvvvwag)
 	}
 }
 
-// the vvvvwag Some function
+// the vvvvwai Some function
-function store_vvvvwag_SomeFunc(store_vvvvwag)
+function store_vvvvwai_SomeFunc(store_vvvvwai)
 {
 	// set the function logic
-	if (store_vvvvwag == 4)
+	if (store_vvvvwai == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwag Some function
+// the vvvvwai Some function
-function datatype_vvvvwag_SomeFunc(datatype_vvvvwag)
+function datatype_vvvvwai_SomeFunc(datatype_vvvvwai)
 {
 	// set the function logic
-	if (datatype_vvvvwag == 'CHAR' || datatype_vvvvwag == 'VARCHAR' || datatype_vvvvwag == 'TEXT' || datatype_vvvvwag == 'MEDIUMTEXT' || datatype_vvvvwag == 'LONGTEXT')
+	if (datatype_vvvvwai == 'CHAR' || datatype_vvvvwai == 'VARCHAR' || datatype_vvvvwai == 'TEXT' || datatype_vvvvwai == 'MEDIUMTEXT' || datatype_vvvvwai == 'LONGTEXT')
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwai function
+// the vvvvwak function
-function vvvvwai(add_css_view_vvvvwai)
+function vvvvwak(add_css_view_vvvvwak)
 {
 	// set the function logic
-	if (add_css_view_vvvvwai == 1)
+	if (add_css_view_vvvvwak == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwaivzs_required)
+		if (jform_vvvvwakvzu_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwaivzs_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwaivzs_required)
-		{
-			updateFieldRequired('css_view',1);
-			jQuery('#jform_css_view').removeAttr('required');
-			jQuery('#jform_css_view').removeAttr('aria-required');
-			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwaivzs_required = true;
-		}
-	}
-}
-
-// the vvvvwaj function
-function vvvvwaj(add_css_views_vvvvwaj)
-{
-	// set the function logic
-	if (add_css_views_vvvvwaj == 1)
-	{
-		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwajvzt_required)
-		{
-			updateFieldRequired('css_views',0);
-			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvwajvzt_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwajvzt_required)
-		{
-			updateFieldRequired('css_views',1);
-			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
-			jform_vvvvwajvzt_required = true;
-		}
-	}
-}
-
-// the vvvvwak function
-function vvvvwak(add_javascript_view_footer_vvvvwak)
-{
-	// set the function logic
-	if (add_javascript_view_footer_vvvvwak == 1)
-	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwakvzu_required)
-		{
-			updateFieldRequired('javascript_view_footer',0);
-			jQuery('#jform_javascript_view_footer').prop('required','required');
-			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_view_footer').addClass('required');
 			jform_vvvvwakvzu_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		jQuery('#jform_css_view').closest('.control-group').hide();
 		if (!jform_vvvvwakvzu_required)
 		{
-			updateFieldRequired('javascript_view_footer',1);
+			updateFieldRequired('css_view',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_css_view').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_css_view').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jQuery('#jform_css_view').removeClass('required');
 			jform_vvvvwakvzu_required = true;
 		}
 	}
 }
 
 // the vvvvwal function
-function vvvvwal(add_javascript_views_footer_vvvvwal)
+function vvvvwal(add_css_views_vvvvwal)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwal == 1)
+	if (add_css_views_vvvvwal == 1)
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		jQuery('#jform_css_views').closest('.control-group').show();
 		if (jform_vvvvwalvzv_required)
 		{
-			updateFieldRequired('javascript_views_footer',0);
+			updateFieldRequired('css_views',0);
-			jQuery('#jform_javascript_views_footer').prop('required','required');
+			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
+			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_javascript_views_footer').addClass('required');
+			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwalvzv_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		jQuery('#jform_css_views').closest('.control-group').hide();
 		if (!jform_vvvvwalvzv_required)
+		{
+			updateFieldRequired('css_views',1);
+			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeClass('required');
+			jform_vvvvwalvzv_required = true;
+		}
+	}
+}
+
+// the vvvvwam function
+function vvvvwam(add_javascript_view_footer_vvvvwam)
+{
+	// set the function logic
+	if (add_javascript_view_footer_vvvvwam == 1)
+	{
+		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
+		if (jform_vvvvwamvzw_required)
+		{
+			updateFieldRequired('javascript_view_footer',0);
+			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').addClass('required');
+			jform_vvvvwamvzw_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		if (!jform_vvvvwamvzw_required)
+		{
+			updateFieldRequired('javascript_view_footer',1);
+			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jform_vvvvwamvzw_required = true;
+		}
+	}
+}
+
+// the vvvvwan function
+function vvvvwan(add_javascript_views_footer_vvvvwan)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwan == 1)
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		if (jform_vvvvwanvzx_required)
+		{
+			updateFieldRequired('javascript_views_footer',0);
+			jQuery('#jform_javascript_views_footer').prop('required','required');
+			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_views_footer').addClass('required');
+			jform_vvvvwanvzx_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		if (!jform_vvvvwanvzx_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwalvzv_required = true;
+			jform_vvvvwanvzx_required = true;
 		}
 	}
 }

admin/models/forms/help_document.js

@@ -23,207 +23,97 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvwamvzy_required = false;
-jform_vvvvwanvzz_required = false;
 jform_vvvvwaowaa_required = false;
 jform_vvvvwapwab_required = false;
 jform_vvvvwaqwac_required = false;
 jform_vvvvwarwad_required = false;
+jform_vvvvwaswae_required = false;
+jform_vvvvwatwaf_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwam = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwao = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwam(location_vvvvwam);
+	vvvvwao(location_vvvvwao);
 
-	var location_vvvvwan = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwap = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwan(location_vvvvwan);
+	vvvvwap(location_vvvvwap);
-
-	var type_vvvvwao = jQuery("#jform_type").val();
-	vvvvwao(type_vvvvwao);
-
-	var type_vvvvwap = jQuery("#jform_type").val();
-	vvvvwap(type_vvvvwap);
 
 	var type_vvvvwaq = jQuery("#jform_type").val();
 	vvvvwaq(type_vvvvwaq);
 
-	var target_vvvvwar = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwar = jQuery("#jform_type").val();
-	vvvvwar(target_vvvvwar);
+	vvvvwar(type_vvvvwar);
+
+	var type_vvvvwas = jQuery("#jform_type").val();
+	vvvvwas(type_vvvvwas);
+
+	var target_vvvvwat = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwat(target_vvvvwat);
 });
 
-// the vvvvwam function
+// the vvvvwao function
-function vvvvwam(location_vvvvwam)
+function vvvvwao(location_vvvvwao)
 {
 	// set the function logic
-	if (location_vvvvwam == 1)
+	if (location_vvvvwao == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwamvzy_required)
+		if (jform_vvvvwaowaa_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwamvzy_required = false;
+			jform_vvvvwaowaa_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwamvzy_required)
+		if (!jform_vvvvwaowaa_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwamvzy_required = true;
-		}
-	}
-}
-
-// the vvvvwan function
-function vvvvwan(location_vvvvwan)
-{
-	// set the function logic
-	if (location_vvvvwan == 2)
-	{
-		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwanvzz_required)
-		{
-			updateFieldRequired('site_view',0);
-			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwanvzz_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwanvzz_required)
-		{
-			updateFieldRequired('site_view',1);
-			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwanvzz_required = true;
-		}
-	}
-}
-
-// the vvvvwao function
-function vvvvwao(type_vvvvwao)
-{
-	if (isSet(type_vvvvwao) && type_vvvvwao.constructor !== Array)
-	{
-		var temp_vvvvwao = type_vvvvwao;
-		var type_vvvvwao = [];
-		type_vvvvwao.push(temp_vvvvwao);
-	}
-	else if (!isSet(type_vvvvwao))
-	{
-		var type_vvvvwao = [];
-	}
-	var type = type_vvvvwao.some(type_vvvvwao_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwaowaa_required)
-		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
-			jform_vvvvwaowaa_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwaowaa_required)
-		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwaowaa_required = true;
 		}
 	}
 }
 
-// the vvvvwao Some function
+// the vvvvwap function
-function type_vvvvwao_SomeFunc(type_vvvvwao)
+function vvvvwap(location_vvvvwap)
 {
 	// set the function logic
-	if (type_vvvvwao == 3)
+	if (location_vvvvwap == 2)
 	{
-		return true;
+		jQuery('#jform_site_view').closest('.control-group').show();
-	}
-	return false;
-}
-
-// the vvvvwap function
-function vvvvwap(type_vvvvwap)
-{
-	if (isSet(type_vvvvwap) && type_vvvvwap.constructor !== Array)
-	{
-		var temp_vvvvwap = type_vvvvwap;
-		var type_vvvvwap = [];
-		type_vvvvwap.push(temp_vvvvwap);
-	}
-	else if (!isSet(type_vvvvwap))
-	{
-		var type_vvvvwap = [];
-	}
-	var type = type_vvvvwap.some(type_vvvvwap_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwapwab_required)
 		{
-			updateFieldRequired('article',0);
+			updateFieldRequired('site_view',0);
-			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			jQuery('#jform_site_view').addClass('required');
 			jform_vvvvwapwab_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
 		if (!jform_vvvvwapwab_required)
 		{
-			updateFieldRequired('article',1);
+			updateFieldRequired('site_view',1);
-			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwapwab_required = true;
 		}
 	}
 }
 
-// the vvvvwap Some function
-function type_vvvvwap_SomeFunc(type_vvvvwap)
-{
-	// set the function logic
-	if (type_vvvvwap == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwaq function
 function vvvvwaq(type_vvvvwaq)
 {
@@ -243,26 +133,26 @@ function vvvvwaq(type_vvvvwaq)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwaqwac_required)
 		{
-			updateFieldRequired('content',0);
+			updateFieldRequired('url',0);
-			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwaqwac_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
 		if (!jform_vvvvwaqwac_required)
 		{
-			updateFieldRequired('content',1);
+			updateFieldRequired('url',1);
-			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwaqwac_required = true;
 		}
 	}
@@ -272,7 +162,7 @@ function vvvvwaq(type_vvvvwaq)
 function type_vvvvwaq_SomeFunc(type_vvvvwaq)
 {
 	// set the function logic
-	if (type_vvvvwaq == 2)
+	if (type_vvvvwaq == 3)
 	{
 		return true;
 	}
@@ -280,32 +170,142 @@ function type_vvvvwaq_SomeFunc(type_vvvvwaq)
 }
 
 // the vvvvwar function
-function vvvvwar(target_vvvvwar)
+function vvvvwar(type_vvvvwar)
 {
-	// set the function logic
+	if (isSet(type_vvvvwar) && type_vvvvwar.constructor !== Array)
-	if (target_vvvvwar == 1)
 	{
-		jQuery('#jform_groups').closest('.control-group').show();
+		var temp_vvvvwar = type_vvvvwar;
+		var type_vvvvwar = [];
+		type_vvvvwar.push(temp_vvvvwar);
+	}
+	else if (!isSet(type_vvvvwar))
+	{
+		var type_vvvvwar = [];
+	}
+	var type = type_vvvvwar.some(type_vvvvwar_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwarwad_required)
 		{
-			updateFieldRequired('groups',0);
+			updateFieldRequired('article',0);
-			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_groups').addClass('required');
+			jQuery('#jform_article').addClass('required');
 			jform_vvvvwarwad_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_groups').closest('.control-group').hide();
+		jQuery('#jform_article').closest('.control-group').hide();
 		if (!jform_vvvvwarwad_required)
+		{
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
+			jform_vvvvwarwad_required = true;
+		}
+	}
+}
+
+// the vvvvwar Some function
+function type_vvvvwar_SomeFunc(type_vvvvwar)
+{
+	// set the function logic
+	if (type_vvvvwar == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwas function
+function vvvvwas(type_vvvvwas)
+{
+	if (isSet(type_vvvvwas) && type_vvvvwas.constructor !== Array)
+	{
+		var temp_vvvvwas = type_vvvvwas;
+		var type_vvvvwas = [];
+		type_vvvvwas.push(temp_vvvvwas);
+	}
+	else if (!isSet(type_vvvvwas))
+	{
+		var type_vvvvwas = [];
+	}
+	var type = type_vvvvwas.some(type_vvvvwas_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		if (jform_vvvvwaswae_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwaswae_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwaswae_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwaswae_required = true;
+		}
+	}
+}
+
+// the vvvvwas Some function
+function type_vvvvwas_SomeFunc(type_vvvvwas)
+{
+	// set the function logic
+	if (type_vvvvwas == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwat function
+function vvvvwat(target_vvvvwat)
+{
+	// set the function logic
+	if (target_vvvvwat == 1)
+	{
+		jQuery('#jform_groups').closest('.control-group').show();
+		if (jform_vvvvwatwaf_required)
+		{
+			updateFieldRequired('groups',0);
+			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_groups').addClass('required');
+			jform_vvvvwatwaf_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_groups').closest('.control-group').hide();
+		if (!jform_vvvvwatwaf_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwarwad_required = true;
+			jform_vvvvwatwaf_required = true;
 		}
 	}
 }

admin/models/forms/layout.js

@@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvytvyp_required = false;
+jform_vvvvvyvvyr_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyv = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyt(add_php_view_vvvvvyt);
+	vvvvvyv(add_php_view_vvvvvyv);
 });
 
-// the vvvvvyt function
+// the vvvvvyv function
-function vvvvvyt(add_php_view_vvvvvyt)
+function vvvvvyv(add_php_view_vvvvvyv)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyt == 1)
+	if (add_php_view_vvvvvyv == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvytvyp_required)
+		if (jform_vvvvvyvvyr_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvytvyp_required = false;
+			jform_vvvvvyvvyr_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvytvyp_required)
+		if (!jform_vvvvvyvvyr_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvytvyp_required = true;
+			jform_vvvvvyvvyr_required = true;
 		}
 	}
 }

admin/models/forms/library.js

@@ -23,18 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvzvvzm_required = false;
+jform_vvvvvzxvzo_required = false;
-jform_vvvvwabvzn_required = false;
+jform_vvvvwadvzp_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvvzu = jQuery("#jform_how").val();
-	vvvvvzu(how_vvvvvzu);
-
-	var how_vvvvvzv = jQuery("#jform_how").val();
-	vvvvvzv(how_vvvvvzv);
-
 	var how_vvvvvzw = jQuery("#jform_how").val();
 	vvvvvzw(how_vvvvvzw);
 
@@ -50,103 +44,16 @@ jQuery(document).ready(function()
 	var how_vvvvwaa = jQuery("#jform_how").val();
 	vvvvwaa(how_vvvvwaa);
 
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	var how_vvvvwab = jQuery("#jform_how").val();
-	vvvvwab(type_vvvvwab);
+	vvvvwab(how_vvvvwab);
+
+	var how_vvvvwac = jQuery("#jform_how").val();
+	vvvvwac(how_vvvvwac);
+
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwad(type_vvvvwad);
 });
 
-// the vvvvvzu function
-function vvvvvzu(how_vvvvvzu)
-{
-	if (isSet(how_vvvvvzu) && how_vvvvvzu.constructor !== Array)
-	{
-		var temp_vvvvvzu = how_vvvvvzu;
-		var how_vvvvvzu = [];
-		how_vvvvvzu.push(temp_vvvvvzu);
-	}
-	else if (!isSet(how_vvvvvzu))
-	{
-		var how_vvvvvzu = [];
-	}
-	var how = how_vvvvvzu.some(how_vvvvvzu_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvvzu Some function
-function how_vvvvvzu_SomeFunc(how_vvvvvzu)
-{
-	// set the function logic
-	if (how_vvvvvzu == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzv function
-function vvvvvzv(how_vvvvvzv)
-{
-	if (isSet(how_vvvvvzv) && how_vvvvvzv.constructor !== Array)
-	{
-		var temp_vvvvvzv = how_vvvvvzv;
-		var how_vvvvvzv = [];
-		how_vvvvvzv.push(temp_vvvvvzv);
-	}
-	else if (!isSet(how_vvvvvzv))
-	{
-		var how_vvvvvzv = [];
-	}
-	var how = how_vvvvvzv.some(how_vvvvvzv_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvvzvvzm_required)
-		{
-			updateFieldRequired('php_setdocument',0);
-			jQuery('#jform_php_setdocument').prop('required','required');
-			jQuery('#jform_php_setdocument').attr('aria-required',true);
-			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvvzvvzm_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzm_required)
-		{
-			updateFieldRequired('php_setdocument',1);
-			jQuery('#jform_php_setdocument').removeAttr('required');
-			jQuery('#jform_php_setdocument').removeAttr('aria-required');
-			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvvzvvzm_required = true;
-		}
-	}
-}
-
-// the vvvvvzv Some function
-function how_vvvvvzv_SomeFunc(how_vvvvvzv)
-{
-	// set the function logic
-	if (how_vvvvvzv == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvvzw function
 function vvvvvzw(how_vvvvvzw)
 {
@@ -166,11 +73,11 @@ function vvvvvzw(how_vvvvvzw)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }
 
@@ -178,7 +85,7 @@ function vvvvvzw(how_vvvvvzw)
 function how_vvvvvzw_SomeFunc(how_vvvvvzw)
 {
 	// set the function logic
-	if (how_vvvvvzw == 2 || how_vvvvvzw == 3)
+	if (how_vvvvvzw == 2)
 	{
 		return true;
 	}
@@ -204,11 +111,28 @@ function vvvvvzx(how_vvvvvzx)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvvzxvzo_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvvzxvzo_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvvzxvzo_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvvzxvzo_required = true;
+		}
 	}
 }
 
@@ -216,7 +140,7 @@ function vvvvvzx(how_vvvvvzx)
 function how_vvvvvzx_SomeFunc(how_vvvvvzx)
 {
 	// set the function logic
-	if (how_vvvvvzx == 1 || how_vvvvvzx == 2 || how_vvvvvzx == 3)
+	if (how_vvvvvzx == 3)
 	{
 		return true;
 	}
@@ -242,15 +166,11 @@ function vvvvvzy(how_vvvvvzy)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -258,7 +178,7 @@ function vvvvvzy(how_vvvvvzy)
 function how_vvvvvzy_SomeFunc(how_vvvvvzy)
 {
 	// set the function logic
-	if (how_vvvvvzy == 0)
+	if (how_vvvvvzy == 2 || how_vvvvvzy == 3)
 	{
 		return true;
 	}
@@ -284,13 +204,11 @@ function vvvvvzz(how_vvvvvzz)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -298,7 +216,7 @@ function vvvvvzz(how_vvvvvzz)
 function how_vvvvvzz_SomeFunc(how_vvvvvzz)
 {
 	// set the function logic
-	if (how_vvvvvzz == 1)
+	if (how_vvvvvzz == 1 || how_vvvvvzz == 2 || how_vvvvvzz == 3)
 	{
 		return true;
 	}
@@ -321,6 +239,88 @@ function vvvvwaa(how_vvvvwaa)
 	var how = how_vvvvwaa.some(how_vvvvwaa_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwaa Some function
+function how_vvvvwaa_SomeFunc(how_vvvvwaa)
+{
+	// set the function logic
+	if (how_vvvvwaa == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwab function
+function vvvvwab(how_vvvvwab)
+{
+	if (isSet(how_vvvvwab) && how_vvvvwab.constructor !== Array)
+	{
+		var temp_vvvvwab = how_vvvvwab;
+		var how_vvvvwab = [];
+		how_vvvvwab.push(temp_vvvvwab);
+	}
+	else if (!isSet(how_vvvvwab))
+	{
+		var how_vvvvwab = [];
+	}
+	var how = how_vvvvwab.some(how_vvvvwab_SomeFunc);
+
+
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwab Some function
+function how_vvvvwab_SomeFunc(how_vvvvwab)
+{
+	// set the function logic
+	if (how_vvvvwab == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwac function
+function vvvvwac(how_vvvvwac)
+{
+	if (isSet(how_vvvvwac) && how_vvvvwac.constructor !== Array)
+	{
+		var temp_vvvvwac = how_vvvvwac;
+		var how_vvvvwac = [];
+		how_vvvvwac.push(temp_vvvvwac);
+	}
+	else if (!isSet(how_vvvvwac))
+	{
+		var how_vvvvwac = [];
+	}
+	var how = how_vvvvwac.some(how_vvvvwac_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -336,44 +336,44 @@ function vvvvwaa(how_vvvvwaa)
 	}
 }
 
-// the vvvvwaa Some function
+// the vvvvwac Some function
-function how_vvvvwaa_SomeFunc(how_vvvvwaa)
+function how_vvvvwac_SomeFunc(how_vvvvwac)
 {
 	// set the function logic
-	if (how_vvvvwaa == 4)
+	if (how_vvvvwac == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwab function
+// the vvvvwad function
-function vvvvwab(type_vvvvwab)
+function vvvvwad(type_vvvvwad)
 {
 	// set the function logic
-	if (type_vvvvwab == 2)
+	if (type_vvvvwad == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwabvzn_required)
+		if (jform_vvvvwadvzp_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwabvzn_required = false;
+			jform_vvvvwadvzp_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwabvzn_required)
+		if (!jform_vvvvwadvzp_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwabvzn_required = true;
+			jform_vvvvwadvzp_required = true;
 		}
 	}
 }

admin/models/forms/library.xml

@@ -136,6 +136,13 @@
                        description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION"
                        heading="h4"
                        class="alert alert-success note_yes_behaviour_one" />
+                <!-- Note_build_in_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_build_in_behaviour_one"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-success note_build_in_behaviour_one" />
                 <!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_no_behaviour_two"
@@ -255,27 +262,13 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_HINT"
                        required="true" />
-                <!-- Note_build_in_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_build_in_behaviour_one"
+                       name="note_build_in_behaviour_two"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-success note_build_in_behaviour_one" />
+                       class="alert alert-success note_build_in_behaviour_two" />
-                <!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_no_behaviour_one"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-error note_no_behaviour_one" />
-                <!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_no_behaviour_three"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-error note_no_behaviour_three" />
                 <!-- Libraries Field. Type: Librariesx. (custom)-->
                 <field type="librariesx"
                        name="libraries"
@@ -286,18 +279,32 @@
                        default="0"
                        required="false"
                        button="true" />
+                <!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_no_behaviour_three"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-error note_no_behaviour_three" />
+                <!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_library_instruction"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_library_instruction" />
                 <!-- Note_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_display_library_files_folders_urls"
                        description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION"
                        class="note_display_library_files_folders_urls" />
-                <!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
-                       name="note_build_in_behaviour_two"
+                       name="note_no_behaviour_one"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION"
                        heading="h4"
-                       class="alert alert-success note_build_in_behaviour_two" />
+                       class="alert alert-error note_no_behaviour_one" />
                 <!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_yes_behaviour_two"

admin/models/forms/site_view.js

@@ -23,7 +23,6 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvyivye_required = false;
 jform_vvvvvyjvyf_required = false;
 jform_vvvvvykvyg_required = false;
 jform_vvvvvylvyh_required = false;
@@ -32,274 +31,310 @@ jform_vvvvvynvyj_required = false;
 jform_vvvvvyovyk_required = false;
 jform_vvvvvypvyl_required = false;
 jform_vvvvvyqvym_required = false;
-jform_vvvvvyqvyn_required = false;
+jform_vvvvvyrvyn_required = false;
+jform_vvvvvysvyo_required = false;
+jform_vvvvvysvyp_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	vvvvvyo(add_javascript_file_vvvvvyo);
 
-	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyo(add_css_vvvvvyo);
+	vvvvvyp(add_js_document_vvvvvyp);
 
-	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyp(add_php_ajax_vvvvvyp);
+	vvvvvyq(add_css_vvvvvyq);
 
-	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyq(add_custom_button_vvvvvyq);
+	vvvvvyr(add_php_ajax_vvvvvyr);
 
-	var button_position_vvvvvyr = jQuery("#jform_button_position").val();
+	var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyr(button_position_vvvvvyr);
+	vvvvvys(add_custom_button_vvvvvys);
+
+	var button_position_vvvvvyt = jQuery("#jform_button_position").val();
+	vvvvvyt(button_position_vvvvvyt);
 });
 
-// the vvvvvyi function
+// the vvvvvyj function
-function vvvvvyi(add_php_view_vvvvvyi)
+function vvvvvyj(add_php_view_vvvvvyj)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyi == 1)
+	if (add_php_view_vvvvvyj == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyivye_required)
+		if (jform_vvvvvyjvyf_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyivye_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyivye_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyivye_required = true;
-		}
-	}
-}
-
-// the vvvvvyj function
-function vvvvvyj(add_php_jview_display_vvvvvyj)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyj == 1)
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvyjvyf_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyjvyf_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview_display').closest('.control-group').hide();
+		jQuery('#jform_php_view').closest('.control-group').hide();
 		if (!jform_vvvvvyjvyf_required)
 		{
-			updateFieldRequired('php_jview_display',1);
+			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvyjvyf_required = true;
 		}
 	}
 }
 
 // the vvvvvyk function
-function vvvvvyk(add_php_jview_vvvvvyk)
+function vvvvvyk(add_php_jview_display_vvvvvyk)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyk == 1)
+	if (add_php_jview_display_vvvvvyk == 1)
 	{
-		jQuery('#jform_php_jview').closest('.control-group').show();
+		jQuery('#jform_php_jview_display').closest('.control-group').show();
 		if (jform_vvvvvykvyg_required)
 		{
-			updateFieldRequired('php_jview',0);
+			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvykvyg_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display').closest('.control-group').hide();
 		if (!jform_vvvvvykvyg_required)
 		{
-			updateFieldRequired('php_jview',1);
+			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvykvyg_required = true;
 		}
 	}
 }
 
 // the vvvvvyl function
-function vvvvvyl(add_php_document_vvvvvyl)
+function vvvvvyl(add_php_jview_vvvvvyl)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyl == 1)
+	if (add_php_jview_vvvvvyl == 1)
 	{
-		jQuery('#jform_php_document').closest('.control-group').show();
+		jQuery('#jform_php_jview').closest('.control-group').show();
 		if (jform_vvvvvylvyh_required)
 		{
-			updateFieldRequired('php_document',0);
+			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvylvyh_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview').closest('.control-group').hide();
 		if (!jform_vvvvvylvyh_required)
 		{
-			updateFieldRequired('php_document',1);
+			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvylvyh_required = true;
 		}
 	}
 }
 
 // the vvvvvym function
-function vvvvvym(add_css_document_vvvvvym)
+function vvvvvym(add_php_document_vvvvvym)
 {
 	// set the function logic
-	if (add_css_document_vvvvvym == 1)
+	if (add_php_document_vvvvvym == 1)
 	{
-		jQuery('#jform_css_document').closest('.control-group').show();
+		jQuery('#jform_php_document').closest('.control-group').show();
 		if (jform_vvvvvymvyi_required)
 		{
-			updateFieldRequired('css_document',0);
+			updateFieldRequired('php_document',0);
-			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvymvyi_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css_document').closest('.control-group').hide();
+		jQuery('#jform_php_document').closest('.control-group').hide();
 		if (!jform_vvvvvymvyi_required)
 		{
-			updateFieldRequired('css_document',1);
+			updateFieldRequired('php_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvymvyi_required = true;
 		}
 	}
 }
 
 // the vvvvvyn function
-function vvvvvyn(add_js_document_vvvvvyn)
+function vvvvvyn(add_css_document_vvvvvyn)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyn == 1)
+	if (add_css_document_vvvvvyn == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_css_document').closest('.control-group').show();
 		if (jform_vvvvvynvyj_required)
 		{
-			updateFieldRequired('js_document',0);
+			updateFieldRequired('css_document',0);
-			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvynvyj_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_css_document').closest('.control-group').hide();
 		if (!jform_vvvvvynvyj_required)
 		{
-			updateFieldRequired('js_document',1);
+			updateFieldRequired('css_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvynvyj_required = true;
 		}
 	}
 }
 
 // the vvvvvyo function
-function vvvvvyo(add_css_vvvvvyo)
+function vvvvvyo(add_javascript_file_vvvvvyo)
 {
 	// set the function logic
-	if (add_css_vvvvvyo == 1)
+	if (add_javascript_file_vvvvvyo == 1)
 	{
-		jQuery('#jform_css').closest('.control-group').show();
+		jQuery('#jform_javascript_file').closest('.control-group').show();
 		if (jform_vvvvvyovyk_required)
 		{
-			updateFieldRequired('css',0);
+			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyovyk_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css').closest('.control-group').hide();
+		jQuery('#jform_javascript_file').closest('.control-group').hide();
 		if (!jform_vvvvvyovyk_required)
 		{
-			updateFieldRequired('css',1);
+			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyovyk_required = true;
 		}
 	}
 }
 
 // the vvvvvyp function
-function vvvvvyp(add_php_ajax_vvvvvyp)
+function vvvvvyp(add_js_document_vvvvvyp)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyp == 1)
+	if (add_js_document_vvvvvyp == 1)
+	{
+		jQuery('#jform_js_document').closest('.control-group').show();
+		if (jform_vvvvvypvyl_required)
+		{
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
+			jform_vvvvvypvyl_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document').closest('.control-group').hide();
+		if (!jform_vvvvvypvyl_required)
+		{
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
+			jform_vvvvvypvyl_required = true;
+		}
+	}
+}
+
+// the vvvvvyq function
+function vvvvvyq(add_css_vvvvvyq)
+{
+	// set the function logic
+	if (add_css_vvvvvyq == 1)
+	{
+		jQuery('#jform_css').closest('.control-group').show();
+		if (jform_vvvvvyqvym_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyqvym_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css').closest('.control-group').hide();
+		if (!jform_vvvvvyqvym_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyqvym_required = true;
+		}
+	}
+}
+
+// the vvvvvyr function
+function vvvvvyr(add_php_ajax_vvvvvyr)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyr == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvypvyl_required)
+		if (jform_vvvvvyrvyn_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvypvyl_required = false;
+			jform_vvvvvyrvyn_required = false;
 		}
 
 	}
@@ -307,42 +342,42 @@ function vvvvvyp(add_php_ajax_vvvvvyp)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvypvyl_required)
+		if (!jform_vvvvvyrvyn_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvypvyl_required = true;
+			jform_vvvvvyrvyn_required = true;
 		}
 	}
 }
 
-// the vvvvvyq function
+// the vvvvvys function
-function vvvvvyq(add_custom_button_vvvvvyq)
+function vvvvvys(add_custom_button_vvvvvys)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyq == 1)
+	if (add_custom_button_vvvvvys == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyqvym_required)
+		if (jform_vvvvvysvyo_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyqvym_required = false;
+			jform_vvvvvysvyo_required = false;
 		}
 
 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyqvyn_required)
+		if (jform_vvvvvysvyp_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyqvyn_required = false;
+			jform_vvvvvysvyp_required = false;
 		}
 
 	}
@@ -350,40 +385,40 @@ function vvvvvyq(add_custom_button_vvvvvyq)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyqvym_required)
+		if (!jform_vvvvvysvyo_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyqvym_required = true;
+			jform_vvvvvysvyo_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyqvyn_required)
+		if (!jform_vvvvvysvyp_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyqvyn_required = true;
+			jform_vvvvvysvyp_required = true;
 		}
 	}
 }
 
-// the vvvvvyr function
+// the vvvvvyt function
-function vvvvvyr(button_position_vvvvvyr)
+function vvvvvyt(button_position_vvvvvyt)
 {
-	if (isSet(button_position_vvvvvyr) && button_position_vvvvvyr.constructor !== Array)
+	if (isSet(button_position_vvvvvyt) && button_position_vvvvvyt.constructor !== Array)
 	{
-		var temp_vvvvvyr = button_position_vvvvvyr;
+		var temp_vvvvvyt = button_position_vvvvvyt;
-		var button_position_vvvvvyr = [];
+		var button_position_vvvvvyt = [];
-		button_position_vvvvvyr.push(temp_vvvvvyr);
+		button_position_vvvvvyt.push(temp_vvvvvyt);
 	}
-	else if (!isSet(button_position_vvvvvyr))
+	else if (!isSet(button_position_vvvvvyt))
 	{
-		var button_position_vvvvvyr = [];
+		var button_position_vvvvvyt = [];
 	}
-	var button_position = button_position_vvvvvyr.some(button_position_vvvvvyr_SomeFunc);
+	var button_position = button_position_vvvvvyt.some(button_position_vvvvvyt_SomeFunc);
 
 
 	// set this function logic
@@ -397,11 +432,11 @@ function vvvvvyr(button_position_vvvvvyr)
 	}
 }
 
-// the vvvvvyr Some function
+// the vvvvvyt Some function
-function button_position_vvvvvyr_SomeFunc(button_position_vvvvvyr)
+function button_position_vvvvvyt_SomeFunc(button_position_vvvvvyt)
 {
 	// set the function logic
-	if (button_position_vvvvvyr == 5)
+	if (button_position_vvvvvyt == 5)
 	{
 		return true;
 	}

admin/models/forms/site_view.xml

@@ -138,27 +138,6 @@
                        multiple="false"
                        required="false"
                        button="true" />
-                <!-- Js_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="js_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Libraries Field. Type: Libraries. (custom)-->
-                <field type="libraries"
-                       name="libraries"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
-                       class="list_class"
-                       multiple="true"
-                       default="0"
-                       required="false"
-                       button="true" />
                 <!-- Css Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="css"
@@ -170,6 +149,16 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_HINT"
                        required="true" />
+                <!-- Libraries Field. Type: Libraries. (custom)-->
+                <field type="libraries"
+                       name="libraries"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
+                       class="list_class"
+                       multiple="true"
+                       default="0"
+                       required="false"
+                       button="true" />
                 <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_add_language_string"
@@ -177,6 +166,17 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
                        heading="h4"
                        class="note_add_language_string" />
+                <!-- Js_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="js_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_HINT"
+                       required="true" />
                 <!-- Add_php_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_php_document"
@@ -188,6 +188,12 @@
                         <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                 </field>
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
                 <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
                 <field type="note"
                        name="note_libraries_selection"
@@ -195,17 +201,12 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
                        heading="h4"
                        class="alert alert-info note_libraries_selection" />
-                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="radio"
+                <field type="note"
-                       name="add_php_jview_display"
+                       name="note_snippet_usage"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL"
-                       class="btn-group btn-group-yesno"
+                       heading="h4"
-                       default="0"
+                       class="snippet-usage note_snippet_usage" />
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
                 <!-- Css_document Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="css_document"
@@ -217,12 +218,16 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_HINT"
                        required="true" />
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Default Field. Type: Textarea. (joomla)-->
-                <field type="note"
+                <field type="textarea"
-                       name="note_uikit_snippet"
+                       name="default"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_LABEL"
-                       heading="h4"
+                       rows="20"
-                       class="snippet-code note_uikit_snippet" />
+                       cols="15"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT"
+                       required="true" />
                 <!-- Php_ajaxmethod Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_ajaxmethod"
@@ -234,12 +239,17 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_HINT"
                        required="true" />
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
-                <field type="note"
+                <field type="radio"
-                       name="note_snippet_usage"
+                       name="add_php_jview_display"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
-                       heading="h4"
+                       class="btn-group btn-group-yesno"
-                       class="snippet-usage note_snippet_usage" />
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
                 <!-- Add_php_view Field. Type: Radio. (joomla)-->
                 <field type="radio"
                        name="add_php_view"
@@ -251,15 +261,16 @@
                         <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                         <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                 </field>
-                <!-- Default Field. Type: Textarea. (joomla)-->
+                <!-- Javascript_file Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
-                       name="default"
+                       name="javascript_file"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL"
-                       rows="20"
+                       rows="30"
                        cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
                        class="text_area span12"
                        filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_HINT"
                        required="true" />
                 <!-- Add_php_jview Field. Type: Radio. (joomla)-->
                 <field type="radio"
@@ -283,25 +294,15 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_HINT"
                        required="false" />
-                <!-- Php_controller Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_controller"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_HINT"
-                       required="false" />
                 <!-- Not_required Field. Type: Hidden. (joomla)-->
                 <field type="hidden"
                        name="not_required"
                        default="[]" />
-                <!-- Add_js_document Field. Type: Radio. (joomla)-->
+                <!-- Add_javascript_file Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_js_document"
+                       name="add_javascript_file"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -315,10 +316,10 @@
                        label="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_LABEL"
                        description="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_DESCRIPTION"
                        multiple="true" />
-                <!-- Add_css_document Field. Type: Radio. (joomla)-->
+                <!-- Add_js_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_css_document"
+                       name="add_js_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -334,10 +335,10 @@
                        multiple="false"
                        required="true"
                        button="true" />
-                <!-- Add_css Field. Type: Radio. (joomla)-->
+                <!-- Add_css_document Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_css"
+                       name="add_css_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_DOCUMENT_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -352,10 +353,10 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_DESCRIPTION"
                        multiple="false"
                        required="false" />
-                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
+                <!-- Add_css Field. Type: Radio. (joomla)-->
                 <field type="radio"
-                       name="add_php_ajax"
+                       name="add_css"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL"
                        class="btn-group btn-group-yesno"
                        default="0"
                        required="true">
@@ -370,6 +371,28 @@
                        description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_DESCRIPTION"
                        heading="h4"
                        class="dynamic_values" />
+                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_ajax"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_AJAX_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
+                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_custom_button"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
                 <!-- Ajax_input Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="ajax_input"
@@ -477,28 +500,6 @@
                                        class="inputbox" />
                         </form>
                 </field>
-                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_custom_button"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Php_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT"
-                       required="true" />
                 <!-- Button_position Field. Type: List. (joomla)-->
                 <field type="list"
                        name="button_position"
@@ -517,6 +518,24 @@
                         <option value="4">COM_COMPONENTBUILDER_SITE_VIEW_BOTTOM_LEFT</option>
                         <option value="5">COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM</option>
                 </field>
+                <!-- Php_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Note_custom_toolbar_placeholder Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_custom_toolbar_placeholder"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION"
+                       heading="h4"
+                       class="note_custom_toolbar_placeholder"
+                       showon="button_position:5" />
                 <!-- Php_view Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_view"
@@ -528,24 +547,6 @@
                        filter="raw"
                        hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_HINT"
                        required="true" />
-                <!-- Note_custom_toolbar_placeholder Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_custom_toolbar_placeholder"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION"
-                       heading="h4"
-                       class="note_custom_toolbar_placeholder"
-                       showon="button_position:5" />
-                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_jview_display"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
-                       required="true" />
                 <!-- Custom_button Field. Type: Subform. (joomla)-->
                 <field type="subform"
                        name="custom_button"
@@ -833,6 +834,28 @@
                                 </field>
                         </form>
                 </field>
+                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview_display"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
+                       required="true" />
+                <!-- Php_controller Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_controller"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_HINT"
+                       required="false" />
                 <!-- Php_jview Field. Type: Textarea. (joomla)-->
                 <field type="textarea"
                        name="php_jview"

admin/models/forms/template.js

@@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/
 
 // Some Global Values
-jform_vvvvvysvyo_required = false;
+jform_vvvvvyuvyq_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyu = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	vvvvvyu(add_php_view_vvvvvyu);
 });
 
-// the vvvvvys function
+// the vvvvvyu function
-function vvvvvys(add_php_view_vvvvvys)
+function vvvvvyu(add_php_view_vvvvvyu)
 {
 	// set the function logic
-	if (add_php_view_vvvvvys == 1)
+	if (add_php_view_vvvvvyu == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvysvyo_required)
+		if (jform_vvvvvyuvyq_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvysvyo_required = false;
+			jform_vvvvvyuvyq_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvysvyo_required)
+		if (!jform_vvvvvyuvyq_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvysvyo_required = true;
+			jform_vvvvvyuvyq_required = true;
 		}
 	}
 }

admin/models/ftp.php

@@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVzxlinked_components()
+	public function getVzzlinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();

admin/models/site_view.php

@@ -127,48 +127,48 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}
 
-			if (!empty($item->js_document))
-			{
-				// base64 Decode js_document.
-				$item->js_document = base64_decode($item->js_document);
-			}
-
 			if (!empty($item->css))
 			{
 				// base64 Decode css.
 				$item->css = base64_decode($item->css);
 			}
 
+			if (!empty($item->js_document))
+			{
+				// base64 Decode js_document.
+				$item->js_document = base64_decode($item->js_document);
+			}
+
 			if (!empty($item->css_document))
 			{
 				// base64 Decode css_document.
 				$item->css_document = base64_decode($item->css_document);
 			}
 
-			if (!empty($item->php_ajaxmethod))
-			{
-				// base64 Decode php_ajaxmethod.
-				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-			}
-
 			if (!empty($item->default))
 			{
 				// base64 Decode default.
 				$item->default = base64_decode($item->default);
 			}
 
+			if (!empty($item->php_ajaxmethod))
+			{
+				// base64 Decode php_ajaxmethod.
+				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+			}
+
+			if (!empty($item->javascript_file))
+			{
+				// base64 Decode javascript_file.
+				$item->javascript_file = base64_decode($item->javascript_file);
+			}
+
 			if (!empty($item->php_model))
 			{
 				// base64 Decode php_model.
 				$item->php_model = base64_decode($item->php_model);
 			}
 
-			if (!empty($item->php_controller))
-			{
-				// base64 Decode php_controller.
-				$item->php_controller = base64_decode($item->php_controller);
-			}
-
 			if (!empty($item->php_document))
 			{
 				// base64 Decode php_document.
@@ -187,6 +187,12 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->php_jview_display = base64_decode($item->php_jview_display);
 			}
 
+			if (!empty($item->php_controller))
+			{
+				// base64 Decode php_controller.
+				$item->php_controller = base64_decode($item->php_controller);
+			}
+
 			if (!empty($item->php_jview))
 			{
 				// base64 Decode php_jview.
@@ -1010,48 +1016,48 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}
 
-		// Set the js_document string to base64 string.
-		if (isset($data['js_document']))
-		{
-			$data['js_document'] = base64_encode($data['js_document']);
-		}
-
 		// Set the css string to base64 string.
 		if (isset($data['css']))
 		{
 			$data['css'] = base64_encode($data['css']);
 		}
 
+		// Set the js_document string to base64 string.
+		if (isset($data['js_document']))
+		{
+			$data['js_document'] = base64_encode($data['js_document']);
+		}
+
 		// Set the css_document string to base64 string.
 		if (isset($data['css_document']))
 		{
 			$data['css_document'] = base64_encode($data['css_document']);
 		}
 
-		// Set the php_ajaxmethod string to base64 string.
-		if (isset($data['php_ajaxmethod']))
-		{
-			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
-		}
-
 		// Set the default string to base64 string.
 		if (isset($data['default']))
 		{
 			$data['default'] = base64_encode($data['default']);
 		}
 
+		// Set the php_ajaxmethod string to base64 string.
+		if (isset($data['php_ajaxmethod']))
+		{
+			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
+		}
+
+		// Set the javascript_file string to base64 string.
+		if (isset($data['javascript_file']))
+		{
+			$data['javascript_file'] = base64_encode($data['javascript_file']);
+		}
+
 		// Set the php_model string to base64 string.
 		if (isset($data['php_model']))
 		{
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
-		// Set the php_controller string to base64 string.
-		if (isset($data['php_controller']))
-		{
-			$data['php_controller'] = base64_encode($data['php_controller']);
-		}
-
 		// Set the php_document string to base64 string.
 		if (isset($data['php_document']))
 		{
@@ -1070,6 +1076,12 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
 		}
 
+		// Set the php_controller string to base64 string.
+		if (isset($data['php_controller']))
+		{
+			$data['php_controller'] = base64_encode($data['php_controller']);
+		}
+
 		// Set the php_jview string to base64 string.
 		if (isset($data['php_jview']))
 		{

admin/models/site_views.php

@@ -266,26 +266,28 @@ class ComponentbuilderModelSite_views extends JModelList
 							continue;
 						}
 
-						// decode js_document
-						$item->js_document = base64_decode($item->js_document);
 						// decode css
 						$item->css = base64_decode($item->css);
+						// decode js_document
+						$item->js_document = base64_decode($item->js_document);
 						// decode css_document
 						$item->css_document = base64_decode($item->css_document);
-						// decode php_ajaxmethod
-						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 						// decode default
 						$item->default = base64_decode($item->default);
+						// decode php_ajaxmethod
+						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode javascript_file
+						$item->javascript_file = base64_decode($item->javascript_file);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
-						// decode php_controller
-						$item->php_controller = base64_decode($item->php_controller);
 						// decode php_document
 						$item->php_document = base64_decode($item->php_document);
 						// decode php_view
 						$item->php_view = base64_decode($item->php_view);
 						// decode php_jview_display
 						$item->php_jview_display = base64_decode($item->php_jview_display);
+						// decode php_controller
+						$item->php_controller = base64_decode($item->php_controller);
 						// decode php_jview
 						$item->php_jview = base64_decode($item->php_jview);
 						// unset the values we don't want exported.

admin/sql/install.mysql.utf8.sql

@@ -257,6 +257,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`add_css` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_css_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_custom_button` INT(1) NOT NULL DEFAULT 0,
+	`add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_js_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_jview` TINYINT(1) NOT NULL DEFAULT 0,
@@ -271,6 +272,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`icon` CHAR(64) NOT NULL DEFAULT '',
+	`javascript_file` TEXT NOT NULL,
 	`js_document` TEXT NOT NULL,
 	`libraries` TEXT NOT NULL,
 	`main_get` INT(11) NOT NULL DEFAULT 0,
@@ -304,13 +306,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name` (`name`),
 	KEY `idx_codename` (`codename`),
-	KEY `idx_add_php_jview` (`add_php_jview`),
 	KEY `idx_add_css_document` (`add_css_document`),
+	KEY `idx_add_js_document` (`add_js_document`),
 	KEY `idx_add_php_document` (`add_php_document`),
 	KEY `idx_add_php_jview_display` (`add_php_jview_display`),
-	KEY `idx_add_js_document` (`add_js_document`),
 	KEY `idx_add_css` (`add_css`),
 	KEY `idx_add_php_view` (`add_php_view`),
+	KEY `idx_add_php_jview` (`add_php_jview`),
+	KEY `idx_add_javascript_file` (`add_javascript_file`),
 	KEY `idx_main_get` (`main_get`),
 	KEY `idx_dynamic_get` (`dynamic_get`),
 	KEY `idx_add_custom_button` (`add_custom_button`)
@@ -322,6 +325,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`add_css` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_css_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_custom_button` INT(1) NOT NULL DEFAULT 0,
+	`add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_js_document` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
@@ -338,6 +342,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`default` TEXT NOT NULL,
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
 	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
+	`javascript_file` TEXT NOT NULL,
 	`js_document` TEXT NOT NULL,
 	`libraries` TEXT NOT NULL,
 	`main_get` INT(11) NOT NULL DEFAULT 0,
@@ -376,11 +381,12 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	KEY `idx_add_php_jview_display` (`add_php_jview_display`),
 	KEY `idx_add_php_view` (`add_php_view`),
 	KEY `idx_add_php_jview` (`add_php_jview`),
+	KEY `idx_add_javascript_file` (`add_javascript_file`),
 	KEY `idx_add_js_document` (`add_js_document`),
-	KEY `idx_add_css_document` (`add_css_document`),
 	KEY `idx_main_get` (`main_get`),
-	KEY `idx_add_css` (`add_css`),
+	KEY `idx_add_css_document` (`add_css_document`),
 	KEY `idx_dynamic_get` (`dynamic_get`),
+	KEY `idx_add_css` (`add_css`),
 	KEY `idx_add_php_ajax` (`add_php_ajax`),
 	KEY `idx_add_custom_button` (`add_custom_button`),
 	KEY `idx_button_position` (`button_position`)
@@ -1254,7 +1260,7 @@ INSERT INTO `#__componentbuilder_dynamic_get` (`id`, `add_php_after_getitem`, `a
 
 INSERT INTO `#__componentbuilder_library` (`id`, `addconditions`, `description`, `type`, `how`, `name`, `php_setdocument`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
 (1, '', '', 1, '', 'No Library', '', 1, '2017-11-11 22:08:33', '2017-12-08 15:51:34', 4, '', 1),
-(2, '', '', 1, 1, 'Bootstrap v4', '', 1, '2017-11-12 02:08:39', '2017-12-10 15:09:48', 14, '', 2),
+(2, '', '', 1, 1, 'Bootstrap v4', '', 1, '2017-11-12 02:08:39', '2017-12-17 09:04:10', 18, '', 2),
 (3, '', '', 1, 1, 'Uikit v3', '', 1, '2017-11-11 22:08:45', '2017-12-10 15:55:35', 18, '', 3),
 (4, '', '', 1, 4, 'Uikit v2', '', 1, '2017-11-11 22:08:51', '2017-12-10 15:53:17', 5, '', 4),
 (5, '', '', 1, 4, 'FooTable v2', '', 1, '2017-11-11 22:08:57', '2017-12-11 20:07:32', 9, '', 5),
@@ -1465,7 +1471,7 @@ INSERT INTO `#__componentbuilder_snippet_type` (`id`, `name`, `description`, `pa
 --
 
 INSERT INTO `#__componentbuilder_library_config` (`id`, `addconfig`, `library`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
-(1, '', 2, '', 1, '2017-11-25 02:59:38', '2017-11-26 20:48:15', 10, '', 1),
+(1, '', 2, '', 1, '2017-11-25 02:59:38', '2017-12-17 09:04:04', 12, '', 1),
 (2, '', 3, '', 1, '2017-11-25 21:51:25', '2017-12-10 15:08:32', 6, '', 2);
 
 --
@@ -1474,10 +1480,10 @@ INSERT INTO `#__componentbuilder_library_config` (`id`, `addconfig`, `library`,
 
 INSERT INTO `#__componentbuilder_library_files_folders_urls` (`id`, `addfiles`, `addfolders`, `addurls`, `library`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`) VALUES
 (1, '', '{\"addfolders0\":{\"folder\":\"uikit-v2\",\"path\":\"\\/media\\/\"}}', '', 4, '', 1, '2017-11-25 00:09:15', '2017-12-10 15:10:31', 8, '', 1),
-(2, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/js\\/bootstrap.min.js\",\"type\":\"1\"},\"addurls1\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/css\\/bootstrap.min.css\",\"type\":\"1\"}}', 2, '', 1, '2017-11-25 16:17:36', '2017-11-26 20:48:33', 6, '', 2),
+(2, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/js\\/bootstrap.min.js\",\"type\":\"2\"},\"addurls1\":{\"url\":\"https:\\/\\/maxcdn.bootstrapcdn.com\\/bootstrap\\/4.0.0-alpha.6\\/css\\/bootstrap.min.css\",\"type\":\"2\"}}', 2, '', 1, '2017-11-25 16:17:36', '2017-12-15 11:53:43', 9, '', 2),
 (3, '', '', '{\"addurls0\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit.min.js\",\"type\":\"2\"},\"addurls1\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/js\\/uikit-icons.min.js\",\"type\":\"2\"},\"addurls2\":{\"url\":\"https:\\/\\/cdnjs.cloudflare.com\\/ajax\\/libs\\/uikit\\/3.0.0-beta.35\\/css\\/uikit.min.css\",\"type\":\"2\"}}', 3, '', 1, '2017-11-25 21:47:40', '2017-12-10 15:09:17', 7, '', 3),
 (4, '', '', '', 5, '', 1, '2017-11-25 22:00:43', '2017-12-10 15:53:54', 3, '', 4),
-(5, '', '', '', 6, '', 1, '2017-11-25 22:12:42', '2017-12-10 15:54:36', 2, '', 5);
+(5, '', '', '', 6, '', 1, '2017-11-25 22:12:42', '2017-12-15 11:37:37', 4, '', 5);
 
 
 

admin/sql/updates/mysql/2.6.6.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_custom_button`;
+
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `javascript_file` TEXT NOT NULL AFTER `icon`;
+
+ALTER TABLE `#__componentbuilder_site_view` ADD `add_javascript_file` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_custom_button`;
+
+ALTER TABLE `#__componentbuilder_site_view` ADD `javascript_file` TEXT NOT NULL AFTER `dynamic_get`;

admin/views/custom_admin_view/tmpl/edit.php

@@ -93,12 +93,22 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'custom_script', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CUSTOM_SCRIPT', true)); ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'javascript_css', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_CSS', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">
 		</div>
 		<div class="row-fluid form-horizontal-desktop">
 			<div class="span12">
-				<?php echo JLayoutHelper::render('custom_admin_view.custom_script_fullwidth', $this); ?>
+				<?php echo JLayoutHelper::render('custom_admin_view.javascript_css_fullwidth', $this); ?>
+			</div>
+		</div>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+
+	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'php', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+		</div>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span12">
+				<?php echo JLayoutHelper::render('custom_admin_view.php_fullwidth', $this); ?>
 			</div>
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
@@ -228,48 +238,63 @@ jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyf function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyf function
+jQuery('#jform_add_javascript_file').on('keyup',function()
+{
+	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyf(add_javascript_file_vvvvvyf);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
+{
+	e.preventDefault();
+	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyf(add_javascript_file_vvvvvyf);
+
+});
+
+// #jform_add_js_document listeners for add_js_document_vvvvvyg function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyf = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyf(add_js_document_vvvvvyf);
+	vvvvvyg(add_js_document_vvvvvyg);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyf = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyf(add_js_document_vvvvvyf);
+	vvvvvyg(add_js_document_vvvvvyg);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyg function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyh function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	vvvvvyh(add_custom_button_vvvvvyh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyg = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyg(add_custom_button_vvvvvyg);
+	vvvvvyh(add_custom_button_vvvvvyh);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyh function
+// #jform_add_css listeners for add_css_vvvvvyi function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyh = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyh(add_css_vvvvvyh);
+	vvvvvyi(add_css_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyh = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyh(add_css_vvvvvyh);
+	vvvvvyi(add_css_vvvvvyi);
 
 });
 

admin/views/custom_code/tmpl/edit.php

@@ -127,101 +127,101 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvvzq function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzq = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzq(target_vvvvvzq);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzq = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzq(target_vvvvvzq);
-
-});
-
-// #jform_target listeners for target_vvvvvzr function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzr = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzr(target_vvvvvzr);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzr = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzr(target_vvvvvzr);
-
-});
-
 // #jform_target listeners for target_vvvvvzs function
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzs(target_vvvvvzs);
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzs(target_vvvvvzs);
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
-
-});
-
-// #jform_type listeners for type_vvvvvzs function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzs = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzs(target_vvvvvzs,type_vvvvvzs);
-
-});
-
-// #jform_type listeners for type_vvvvvzt function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
 
 });
 
 // #jform_target listeners for target_vvvvvzt function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
+	vvvvvzt(target_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvvzt = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(type_vvvvvzt,target_vvvvvzt);
+	vvvvvzt(target_vvvvvzt);
+
+});
+
+// #jform_target listeners for target_vvvvvzu function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+});
+
+// #jform_type listeners for type_vvvvvzu function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+
+});
+
+// #jform_type listeners for type_vvvvvzv function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+
+});
+
+// #jform_target listeners for target_vvvvvzv function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
 
 });
 

admin/views/dynamic_get/tmpl/edit.php

@@ -167,48 +167,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvvyu function
+// #jform_gettype listeners for gettype_vvvvvyw function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvyu = jQuery("#jform_gettype").val();
+	var gettype_vvvvvyw = jQuery("#jform_gettype").val();
-	vvvvvyu(gettype_vvvvvyu);
+	vvvvvyw(gettype_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvyu = jQuery("#jform_gettype").val();
+	var gettype_vvvvvyw = jQuery("#jform_gettype").val();
-	vvvvvyu(gettype_vvvvvyu);
+	vvvvvyw(gettype_vvvvvyw);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvyv function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvyv = jQuery("#jform_main_source").val();
-	vvvvvyv(main_source_vvvvvyv);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvyv = jQuery("#jform_main_source").val();
-	vvvvvyv(main_source_vvvvvyv);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvyw function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvyw = jQuery("#jform_main_source").val();
-	vvvvvyw(main_source_vvvvvyw);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvyw = jQuery("#jform_main_source").val();
-	vvvvvyw(main_source_vvvvvyw);
 
 });
 
@@ -242,52 +212,33 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvyz function
+// #jform_main_source listeners for main_source_vvvvvyz function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvyz = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvyz = jQuery("#jform_main_source").val();
-	vvvvvyz(addcalculation_vvvvvyz);
+	vvvvvyz(main_source_vvvvvyz);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvyz = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvyz = jQuery("#jform_main_source").val();
-	vvvvvyz(addcalculation_vvvvvyz);
+	vvvvvyz(main_source_vvvvvyz);
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvza function
+// #jform_main_source listeners for main_source_vvvvvza function
-jQuery('#jform_addcalculation').on('keyup',function()
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvza = jQuery("#jform_main_source").val();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
+	vvvvvza(main_source_vvvvvza);
-	vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var main_source_vvvvvza = jQuery("#jform_main_source").val();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
+	vvvvvza(main_source_vvvvvza);
-	vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvza function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
-	vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvza = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvza = jQuery("#jform_gettype").val();
-	vvvvvza(addcalculation_vvvvvza,gettype_vvvvvza);
 
 });
 
@@ -295,278 +246,327 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	vvvvvzb(addcalculation_vvvvvzb);
-	vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	vvvvvzb(addcalculation_vvvvvzb);
-	vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzb function
+// #jform_addcalculation listeners for addcalculation_vvvvvzc function
+jQuery('#jform_addcalculation').on('keyup',function()
+{
+	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
+	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
+
+});
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
+	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzc function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb);
+	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzb = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzb(addcalculation_vvvvvzb,gettype_vvvvvzb);
+	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvze function
+// #jform_addcalculation listeners for addcalculation_vvvvvzd function
+jQuery('#jform_addcalculation').on('keyup',function()
+{
+	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+
+});
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzd function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+
+});
+
+// #jform_main_source listeners for main_source_vvvvvzg function
 jQuery('#jform_main_source').on('keyup',function()
 {
-	var main_source_vvvvvze = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvze(main_source_vvvvvze);
+	vvvvvzg(main_source_vvvvvzg);
 
 });
 jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvze = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvze(main_source_vvvvvze);
+	vvvvvzg(main_source_vvvvvzg);
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzf function
+// #jform_main_source listeners for main_source_vvvvvzh function
 jQuery('#jform_main_source').on('keyup',function()
 {
-	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
-	vvvvvzf(main_source_vvvvvzf);
+	vvvvvzh(main_source_vvvvvzh);
 
 });
 jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzf = jQuery("#jform_main_source").val();
+	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
-	vvvvvzf(main_source_vvvvvzf);
+	vvvvvzh(main_source_vvvvvzh);
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzg function
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzi function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzg function
+// #jform_gettype listeners for gettype_vvvvvzi function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzg = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzg = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzg(add_php_before_getitem_vvvvvzg,gettype_vvvvvzg);
+	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
 
 });
 
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzh function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzj function
 jQuery('#jform_add_php_after_getitem').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh);
+	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh);
+	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzh function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
-	vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzh = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzh = jQuery("#jform_gettype").val();
-	vvvvvzh(add_php_after_getitem_vvvvvzh,gettype_vvvvvzh);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzj function
 jQuery('#jform_gettype').on('keyup',function()
 {
+	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzj(gettype_vvvvvzj);
+	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
+	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzj(gettype_vvvvvzj);
+	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzk function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzk function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzk = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
-	vvvvvzk(add_php_getlistquery_vvvvvzk,gettype_vvvvvzk);
-
-});
-
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzl function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
-{
-	var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
-	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzl function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzl(gettype_vvvvvzl);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzl = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(add_php_before_getitems_vvvvvzl,gettype_vvvvvzl);
+	vvvvvzl(gettype_vvvvvzl);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzm function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzm function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzm function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzm = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_after_getitems_vvvvvzm,gettype_vvvvvzm);
+	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
+
+});
+
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzn function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
+{
+	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzn function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
+	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+
+});
+
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzo function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
+	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzo function
 jQuery('#jform_gettype').on('keyup',function()
 {
+	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(gettype_vvvvvzo);
+	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
+	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(gettype_vvvvvzo);
+	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzp function
+// #jform_gettype listeners for gettype_vvvvvzq function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzp(gettype_vvvvvzp);
+	vvvvvzq(gettype_vvvvvzq);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzp(gettype_vvvvvzp);
+	vvvvvzq(gettype_vvvvvzq);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzr function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
+	vvvvvzr(gettype_vvvvvzr);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
+	vvvvvzr(gettype_vvvvvzr);
 
 });
 

admin/views/field/tmpl/edit.php

@@ -137,157 +137,157 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwac function
+// #jform_datalenght listeners for datalenght_vvvvwae function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwac = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwac(datalenght_vvvvwac);
+	vvvvwae(datalenght_vvvvwae);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwac = jQuery("#jform_datalenght").val();
+	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwac(datalenght_vvvvwac);
+	vvvvwae(datalenght_vvvvwae);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwad function
+// #jform_datadefault listeners for datadefault_vvvvwaf function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwad = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwad(datadefault_vvvvwad);
+	vvvvwaf(datadefault_vvvvwaf);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwad = jQuery("#jform_datadefault").val();
+	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwad(datadefault_vvvvwad);
+	vvvvwaf(datadefault_vvvvwaf);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwae function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwae = jQuery("#jform_datatype").val();
-	vvvvwae(datatype_vvvvwae);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwae = jQuery("#jform_datatype").val();
-	vvvvwae(datatype_vvvvwae);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwaf function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwaf = jQuery("#jform_datatype").val();
-	vvvvwaf(datatype_vvvvwaf);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwaf = jQuery("#jform_datatype").val();
-	vvvvwaf(datatype_vvvvwaf);
-
-});
-
-// #jform_store listeners for store_vvvvwag function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwag = jQuery("#jform_store").val();
-	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwag = jQuery("#jform_store").val();
-	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
 
 });
 
 // #jform_datatype listeners for datatype_vvvvwag function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwag = jQuery("#jform_store").val();
 	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
+	vvvvwag(datatype_vvvvwag);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwag = jQuery("#jform_store").val();
 	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(store_vvvvwag,datatype_vvvvwag);
+	vvvvwag(datatype_vvvvwag);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwai function
+// #jform_datatype listeners for datatype_vvvvwah function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwah = jQuery("#jform_datatype").val();
+	vvvvwah(datatype_vvvvwah);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwah = jQuery("#jform_datatype").val();
+	vvvvwah(datatype_vvvvwah);
+
+});
+
+// #jform_store listeners for store_vvvvwai function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwai = jQuery("#jform_store").val();
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwai = jQuery("#jform_store").val();
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwai function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwai = jQuery("#jform_store").val();
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwai = jQuery("#jform_store").val();
+	var datatype_vvvvwai = jQuery("#jform_datatype").val();
+	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwak function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwai = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwai(add_css_view_vvvvwai);
+	vvvvwak(add_css_view_vvvvwak);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwai = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwai(add_css_view_vvvvwai);
+	vvvvwak(add_css_view_vvvvwak);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwaj function
+// #jform_add_css_views listeners for add_css_views_vvvvwal function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwaj = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaj(add_css_views_vvvvwaj);
+	vvvvwal(add_css_views_vvvvwal);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwaj = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwaj(add_css_views_vvvvwaj);
+	vvvvwal(add_css_views_vvvvwal);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwak function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwam function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwak = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwak(add_javascript_view_footer_vvvvwak);
+	vvvvwam(add_javascript_view_footer_vvvvwam);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwak = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwak(add_javascript_view_footer_vvvvwak);
+	vvvvwam(add_javascript_view_footer_vvvvwam);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwal function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwan function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwal = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwal(add_javascript_views_footer_vvvvwal);
+	vvvvwan(add_javascript_views_footer_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwal = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwal(add_javascript_views_footer_vvvvwal);
+	vvvvwan(add_javascript_views_footer_vvvvwan);
 
 });
 

admin/views/fieldtype/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->vzwfields		= $this->get('Vzwfields');
+		$this->vzyfields = $this->get('Vzyfields');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/ftp/view.html.php

@@ -64,7 +64,7 @@ class ComponentbuilderViewFtp extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->vzxlinked_components		= $this->get('Vzxlinked_components');
+		$this->vzzlinked_components = $this->get('Vzzlinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();

admin/views/get_snippets/view.html.php

@@ -80,6 +80,9 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
 		// Initialize the header checker.
 		$HeaderCheck = new componentbuilderHeaderCheck;
 
+		// Add View JavaScript File
+		$this->document->addScript(JURI::root(true) . "/administrator/components/com_componentbuilder/assets/js/get_snippets.js"); 
+
 		// Load uikit options.
 		$uikit = $this->params->get('uikit_load');
 		// Set script size.
@@ -189,38 +192,38 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
 		// set an error message if needed
 		$this->document->addScriptDeclaration("var returnError = '<div class=\"uk-alert uk-alert-warning\"><h1>".JText::_('COM_COMPONENTBUILDER_AN_ERROR_HAS_OCCURRED')."!</h1><p>".JText::_('COM_COMPONENTBUILDER_PLEASE_TRY_AGAIN_LATER').".</p></div>';");
 		// need to add some language strings
-		$this->document->addScriptDeclaration("var lang_Community_Snippets = '".JText::_('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS')."';");
+		JText::script('COM_COMPONENTBUILDER_JCB_COMMUNITY_SNIPPETS');
-		$this->document->addScriptDeclaration("var lang_Snippets = '".JText::_('COM_COMPONENTBUILDER_SNIPPETS')."';");
+		JText::script('COM_COMPONENTBUILDER_SNIPPETS');
-		$this->document->addScriptDeclaration("var lang_Snippet = '".JText::_('COM_COMPONENTBUILDER_SNIPPET')."';");
+		JText::script('COM_COMPONENTBUILDER_SNIPPET');
-		$this->document->addScriptDeclaration("var lang_Snippet_Tooltip = '".JText::_('COM_COMPONENTBUILDER_VIEW_SNIPPET_OF_COMMUNITY_VERSION')."';");
+		JText::script('COM_COMPONENTBUILDER_VIEW_SNIPPET_OF_COMMUNITY_VERSION');
-		$this->document->addScriptDeclaration("var lang_Get_Snippet = '".JText::_('COM_COMPONENTBUILDER_GET_SNIPPET')."';");
+		JText::script('COM_COMPONENTBUILDER_GET_SNIPPET');
-		$this->document->addScriptDeclaration("var lang_Dont_Get_Snippet = '".JText::_('COM_COMPONENTBUILDER_LOCAL_SNIPPET')."';");
+		JText::script('COM_COMPONENTBUILDER_LOCAL_SNIPPET');
-		$this->document->addScriptDeclaration("var lang_Get_Snippet_Tooltip = '".JText::_('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_UPDATE_THE_LOCAL_VERSION')."';");
+		JText::script('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_UPDATE_THE_LOCAL_VERSION');
-		$this->document->addScriptDeclaration("var lang_Get_Snippet_New_Tooltip = '".JText::_('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY')."';");
+		JText::script('COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY');
-		$this->document->addScriptDeclaration("var lang_Get_Snippet_Dont_Tooltip = '".JText::_('COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION')."';");
+		JText::script('COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION');
-		$this->document->addScriptDeclaration("var lang_Usage = '".JText::_('COM_COMPONENTBUILDER_USAGE')."';");
+		JText::script('COM_COMPONENTBUILDER_USAGE');
-		$this->document->addScriptDeclaration("var lang_Usage_Tooltip = '".JText::_('COM_COMPONENTBUILDER_VIEW_USAGE_OF_COMMUNITY_VERSION')."';");
+		JText::script('COM_COMPONENTBUILDER_VIEW_USAGE_OF_COMMUNITY_VERSION');
-		$this->document->addScriptDeclaration("var lang_Description = '".JText::_('COM_COMPONENTBUILDER_DESCRIPTION')."';");
+		JText::script('COM_COMPONENTBUILDER_DESCRIPTION');
-		$this->document->addScriptDeclaration("var lang_Description_Tooltip = '".JText::_('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION')."';");
+		JText::script('COM_COMPONENTBUILDER_VIEW_DESCRIPTION_OF_COMMUNITY_VERSION');
-		$this->document->addScriptDeclaration("var lang_View_Blame = '".JText::_('COM_COMPONENTBUILDER_VIEW_BLAME')."';");
+		JText::script('COM_COMPONENTBUILDER_VIEW_BLAME');
-		$this->document->addScriptDeclaration("var lang_View_Blame_Tooltip = '".JText::_('COM_COMPONENTBUILDER_VIEW_WHO_CONTRIBUTED_TO_THIS_SNIPPET')."';");
+		JText::script('COM_COMPONENTBUILDER_VIEW_WHO_CONTRIBUTED_TO_THIS_SNIPPET');
-		$this->document->addScriptDeclaration("var lang_URL_Tooltip = '".JText::_('COM_COMPONENTBUILDER_VIEW_SNIPPET_REFERENCE_URL')."';");
+		JText::script('COM_COMPONENTBUILDER_VIEW_SNIPPET_REFERENCE_URL');
-		$this->document->addScriptDeclaration("var lang_Update_Error_Tooltip = '".JText::_('COM_COMPONENTBUILDER_SNIPPET_COULD_NOT_BE_UPDATEDSAVED')."';");
+		JText::script('COM_COMPONENTBUILDER_SNIPPET_COULD_NOT_BE_UPDATEDSAVED');
-		$this->document->addScriptDeclaration("var lang_Updates_Error_Tooltip = '".JText::_('COM_COMPONENTBUILDER_SNIPPETS_COULD_NOT_BE_UPDATEDSAVED')."';");
+		JText::script('COM_COMPONENTBUILDER_SNIPPETS_COULD_NOT_BE_UPDATEDSAVED');
-		$this->document->addScriptDeclaration("var lang_Contributor_URL_Tooltip = '".JText::_('COM_COMPONENTBUILDER_LINK_TO_THE_CONTRIBUTOR')."';");
+		JText::script('COM_COMPONENTBUILDER_LINK_TO_THE_CONTRIBUTOR');
-		$this->document->addScriptDeclaration("var lang_Contributor_Modal_Tooltip = '".JText::_('COM_COMPONENTBUILDER_VIEW_THE_CONTRIBUTOR_DETAILS')."';");
+		JText::script('COM_COMPONENTBUILDER_VIEW_THE_CONTRIBUTOR_DETAILS');
-		$this->document->addScriptDeclaration("var lang_JCB_Community = '".JText::_('COM_COMPONENTBUILDER_JCB_COMMUNITY')."';");
+		JText::script('COM_COMPONENTBUILDER_JCB_COMMUNITY');
-		$this->document->addScriptDeclaration("var lang_Company_Name = '".JText::_('COM_COMPONENTBUILDER_COMPANY_NAME')."';");
+		JText::script('COM_COMPONENTBUILDER_COMPANY_NAME');
-		$this->document->addScriptDeclaration("var lang_Author_Name = '".JText::_('COM_COMPONENTBUILDER_AUTHOR_NAME')."';");
+		JText::script('COM_COMPONENTBUILDER_AUTHOR_NAME');
-		$this->document->addScriptDeclaration("var lang_Author_Email = '".JText::_('COM_COMPONENTBUILDER_AUTHOR_EMAIL')."';");
+		JText::script('COM_COMPONENTBUILDER_AUTHOR_EMAIL');
-		$this->document->addScriptDeclaration("var lang_Author_Website = '".JText::_('COM_COMPONENTBUILDER_AUTHOR_WEBSITE')."';");
+		JText::script('COM_COMPONENTBUILDER_AUTHOR_WEBSITE');
-		$this->document->addScriptDeclaration("var lang_Get_Snippets_New_Tooltip = '".JText::_('COM_COMPONENTBUILDER_THERE_ARE_NO_NEW_SNIPPETS_AT_THIS_TIME')."';");
+		JText::script('COM_COMPONENTBUILDER_THERE_ARE_NO_NEW_SNIPPETS_AT_THIS_TIME');
-		$this->document->addScriptDeclaration("var lang_Get_Snippets_Diverged_Tooltip = '".JText::_('COM_COMPONENTBUILDER_THERE_ARE_NO_DIVERGED_SNIPPETS_AT_THIS_TIME')."';");
+		JText::script('COM_COMPONENTBUILDER_THERE_ARE_NO_DIVERGED_SNIPPETS_AT_THIS_TIME');
-		$this->document->addScriptDeclaration("var lang_Get_Snippets_Ahead_Tooltip = '".JText::_('COM_COMPONENTBUILDER_THERE_ARE_NO_AHEAD_SNIPPETS_AT_THIS_TIME')."';");
+		JText::script('COM_COMPONENTBUILDER_THERE_ARE_NO_AHEAD_SNIPPETS_AT_THIS_TIME');
-		$this->document->addScriptDeclaration("var lang_Get_Snippets_Behind_Tooltip = '".JText::_('COM_COMPONENTBUILDER_THERE_ARE_NO_OUT_OF_DATE_SNIPPETS_AT_THIS_TIME')."';");
+		JText::script('COM_COMPONENTBUILDER_THERE_ARE_NO_OUT_OF_DATE_SNIPPETS_AT_THIS_TIME');
-		$this->document->addScriptDeclaration("var lang_Get_Snippets_All_Tooltip = '".JText::_('COM_COMPONENTBUILDER_THERE_ARE_NO_SNIPPETS_TO_UPDATE_AT_THIS_TIME')."';");
+		JText::script('COM_COMPONENTBUILDER_THERE_ARE_NO_SNIPPETS_TO_UPDATE_AT_THIS_TIME');
-		$this->document->addScriptDeclaration("var lang_Available_Libraries = '".JText::_('COM_COMPONENTBUILDER_AVAILABLE_LIBRARIES')."';");
+		JText::script('COM_COMPONENTBUILDER_AVAILABLE_LIBRARIES');
-		$this->document->addScriptDeclaration("var lang_Open_Lib_Snippets = '".JText::_('COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS')."';");
+		JText::script('COM_COMPONENTBUILDER_OPEN_LIBRARY_SNIPPETS');
 		// add some lang verfy messages
 		$this->document->addScriptDeclaration("
 			// set the snippet from gitHub
@@ -254,526 +257,6 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
 		}
 		// add the document default css file
 		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/get_snippets.css'); 
-		// Set the Custom JS script to view
-		$this->document->addScriptDeclaration("
-			// start the moment the document is ready
-			jQuery(document).ready(function () {
-				// just get the available libraries
-				getLibraries(snippetsPath);
-			});
-			
-			// add an ajax call tracker
-			var ajaxcall = null;
-			var fromLocal = false;
-			
-			jQuery(document).ready(function(){
-				jQuery('body').on('click','.getreaction',function(){
-					// Ajax request
-					var btn = jQuery(this);
-					btn.prop('disabled', true);
-					setTimeout(function(){
-						btn.prop('disabled', false);
-					}, 3000);
-					var type = btn.data('type');
-					if ('getLibraries' === type) {
-						getLibraries(snippetsPath);
-					} else if ('getSnippets' === type) {
-						var name = btn.data('name');
-						getSnippets(snippetsPath, name);
-					} else if ('all' === type) {
-						var status = btn.data('status');
-						bulkSnippetGithub(status);
-					} else if ('bulk' === type) {
-						checkBulkSnippetGithub();
-					} else if ('get' === type) {
-						var path = btn.data('path');
-						var status = btn.data('status');
-						setSnippetGithub(path, status);
-					} else {
-						var path = btn.data('path');
-						getSnippetModal(path, type);
-					}
-				});
-			});
-			
-			// load every thing once ready
-			jQuery(document).ajaxStop(function () {
-				if (0 === jQuery.active) {
-					//do something special
-					if ('snippets' === ajaxcall) {
-						setTimeout( function() {
-							jQuery('#snippets-github').html('<h1>'+lang_Community_Snippets+'</h1>');
-							jQuery('#snippets-display').show();
-							jQuery('#snippets-grid').trigger('display.uk.check');
-							jQuery('#loading').hide();
-						}, 1000);
-					} 
-				}
-			});
-			
-			// get the libraries
-			function getLibraries(path) {
-				var _paths = jQuery.jStorage.get('JCB-Snippets-Paths', null);
-				// always hide the snippets display
-				jQuery('#snippets-display').hide();
-				// always reset the grid
-				jQuery('#libraries-grid').html('');
-				// set the ajax scope
-				ajaxcall = 'libraries';
-				if (_paths) {
-					buildLibraries(_paths);
-				} else {
-					jQuery.get(path)
-					.success(function(paths) {
-						// load only this library paths
-						jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
-						buildLibraries(paths);
-					})
-					.error(function(jqXHR, textStatus, errorThrown) { 
-						jQuery('#snippets-github').html(returnError);
-					});
-				}
-			}
-			
-			// build the ibraries object
-			function buildLibraries(paths) {
-				var _temp = jQuery.jStorage.get('JCB-Libraries', null);
-				if (_temp) {
-					setLibraries(_temp);
-				} else {
-					var temp = {};
-					jQuery.each(paths.tree, function(key,value) {
-						if (value.path.match(\".json$\")) {
-							var libName = value.path.split(/ -(.+)/)[0];
-							libName = libName.trim()
-							temp[libName] = libName;
-						}
-					});
-					// load only this library paths
-					jQuery.jStorage.set('JCB-Libraries', temp, {TTL: expire});
-					setLibraries(temp);
-				}
-			}
-			
-			// set the libraries
-			function setLibraries(names) {
-				// now load the lib buttons
-				jQuery.each(names, function(value) {
-					setLibrary(value);
-				});
-				setTimeout( function() {
-					jQuery('#snippets-github').html('<h1>'+lang_Available_Libraries+'</h1>');
-					jQuery('#libraries-display').show();
-					jQuery('#libraries-grid').trigger('display.uk.check');
-				}, 1000);
-			}
-			
-			// set the snippets
-			function setLibrary(name) {
-				// get useful ID
-				var keyID = getKeyID(name);
-				// build the library display
-				var html = '<div id=\"'+keyID+'-panel\" class=\"uk-panel\">';
-				html += '<div class=\"uk-panel uk-panel-box uk-width-1-1\">';
-				html += '<h3 class=\"uk-panel-title\">' + name + '</h3>';
-				html += '<hr />';
-				// set the data buttons
-				html += setLibButtons(name);
-				// close the box panel
-				html += '</div>';
-				html += '</div>';
-				// now we have the library
-				jQuery('#libraries-grid').append(html);
-			}
-			
-			function setLibButtons(name) {
-				return  '<button class=\"uk-button uk-button-small uk-button-success uk-width-1-1 getreaction\" data-name=\"'+name+'\" data-type=\"getSnippets\" title=\"'+lang_Description_Tooltip+'\"><i class=\"uk-icon-thumb-tack\"></i><span class=\"uk-hidden-small\"> '+lang_Open_Lib_Snippets+'</span></button>';
-			}
-			
-			// get the snippets
-			function getSnippets(path, libraryName) {
-				jQuery('#loading').show();
-				// get local values if set
-				var _paths = jQuery.jStorage.get('JCB-Snippets-Paths', null);
-				// always reset the grid
-				jQuery('#snippets-grid').html('');
-				// always hide libraries
-				jQuery('#libraries-display').hide();
-				// set the ajax scope
-				ajaxcall = 'snippets';
-				fromLocal = false;
-				if (_paths) {
-					setSnippets(_paths, libraryName);
-					jQuery('#snippets-github').html('<h1>'+lang_Community_Snippets+'</h1>');
-				} else {
-					jQuery.get(path)
-					.success(function(paths) {
-						// load only this library paths
-						jQuery.jStorage.set('JCB-Snippets-Paths', paths, {TTL: expire});
-						setSnippets(paths, libraryName);
-					})
-					.error(function(jqXHR, textStatus, errorThrown) { 
-						jQuery('#snippets-github').html(returnError);
-					});
-				}
-				// only use if loading localy
-				if (fromLocal) {
-					jQuery('#snippets-display').show();
-					jQuery('#snippets-grid').trigger('display.uk.check');
-					jQuery('#loading').hide();
-				}
-			}
-			
-			// set the snippets
-			function setSnippets(paths, libraryName) {
-				// set the ajax scope
-				ajaxcall = 'snippets';
-				jQuery.each(paths.tree, function(key,value) {
-					if (value.path.match(\".json$\") && value.path.match(\"^\"+libraryName)) {
-						var _snippet = jQuery.jStorage.get(value.path, null);
-						if (_snippet) {
-							setSnippet(_snippet, value.path);
-							fromLocal = true;
-						} else {
-							jQuery.get(snippetPath+value.path)
-							.success(function(snippet) {
-								// convert the string to json.object
-								snippet = jQuery.parseJSON(snippet);
-								jQuery.jStorage.set(value.path, snippet, {TTL: expire});
-								setSnippet(snippet, value.path);
-							})
-							.error(function(jqXHR, textStatus, errorThrown) { 
-								// we could do more
-							});
-						}
-					}
-				});
-			}
-			
-			// set the snippets
-			function setSnippet(snippet, key) {
-				// get useful ID
-				var keyID = getKeyID(key);
-				// get the status
-				var status = getSnippetStatus(snippet, key);
-				// add to bulk updater
-				if ('equal' !== status) {
-					bulkItems[status].push(key);
-				}
-				// build the snippet display
-				var html = '<div id=\"'+keyID+'-panel\" class=\"uk-panel\" data-uk-filter=\"'+status+'\" data-snippet-libraries=\"'+snippet.library+'\" data-snippet-types=\"'+snippet.type+'\" data-snippet-name=\"'+snippet.name+'\">';
-				html += '<div class=\"uk-panel uk-panel-box uk-width-1-1\">';
-				html += '<div class=\"uk-panel-badge uk-badge\" ><a id=\"'+keyID+'-badge\" href=\"#'+status+'-meaning\" data-uk-offcanvas class=\"uk-text-uppercase uk-text-contrast\"><i class=\"uk-icon-info\"></i> '+status+'</a></div><br />';
-				html += '<h3 class=\"uk-panel-title\">' + snippet.library+ ' - (' + snippet.type + ') ' + snippet.name + '</h3>';
-				html += snippet.heading + '<hr />';
-				// set the data buttons
-				html += setDataButtons(snippet, key, status);
-				// set the snippet ref button
-				html += setRefButtons(snippet, key, status, keyID);
-				// set the contributor buttons
-				html += setContributorButtons(snippet, key);
-				// close the box panel
-				html += '</div>';
-				html += '</div>';
-				// now we have the snippet
-				jQuery('#snippets-grid').append(html);
-			}
-			
-			// set the snippet status
-			function getSnippetStatus(snippet, key) {
-				// check if JCB already has this snippet
-				if(local_snippets.hasOwnProperty(key)){
-					// first get local time stamp
-					var local_created = strtotime(local_snippets[key].created);
-					var local_modified = strtotime(local_snippets[key].modified);
-					// now get github time stamps					
-					var created = strtotime(snippet.created);
-					var modified = strtotime(snippet.modified);
-					// work out the status
-					if (local_created == created) {
-						if (local_modified == modified) {
-							return 'equal';
-						} else if (local_modified > modified) {
-							return 'ahead';
-						} else if (local_modified < modified) {
-							return 'behind';
-						}
-					}
-					return 'diverged';
-				}
-				return 'new';
-			}
-			
-			function setDataButtons(snippet, key, status) {
-				var html = '<div class=\"uk-button-group uk-width-1-1 uk-margin-small-bottom\">';
-				html += '<button class=\"uk-button uk-button-small uk-button-success uk-width-1-3 getreaction\" data-status=\"'+status+'\" data-path=\"'+key+'\" data-type=\"usage\" title=\"'+lang_Usage_Tooltip+'\"><i class=\"uk-icon-info\"></i><span class=\"uk-hidden-small\"> '+lang_Usage+'</span></button>';
-				html += '<button class=\"uk-button uk-button-small uk-button-success uk-width-1-3 getreaction\" data-status=\"'+status+'\" data-path=\"'+key+'\" data-type=\"description\" title=\"'+lang_Description_Tooltip+'\"><i class=\"uk-icon-sticky-note-o\"></i><span class=\"uk-hidden-small\"> '+lang_Description+'</span></button>';
-				html += '<button class=\"uk-button uk-button-small uk-button-success uk-width-1-3 getreaction\" data-status=\"'+status+'\" data-path=\"'+key+'\" data-type=\"snippet\" title=\"'+lang_Snippet_Tooltip+'\"><i class=\"uk-icon-code\"></i><span class=\"uk-hidden-small\"> '+lang_Snippet+'</span></button>';
-				html += '</div>';
-				// return data buttons
-				return html;
-			}
-			
-			function setRefButtons(snippet, key, status, keyID) {
-				var html = '<div><a class=\"uk-button uk-button-mini uk-button-success uk-margin-small-bottom uk-width-1-1\" href=\"'+snippet.url+'\" target=\"_blank\" title=\"'+lang_URL_Tooltip+'\"><i class=\"uk-icon-external-link\"></i> ' + snippet.name + '</a></div>';
-				// set the update button	
-				html += '<div>';
-				if ('equal' !== status) {
-					if ('new' === status) {
-						var tooltip = lang_Get_Snippet_New_Tooltip;
-					} else {
-						var tooltip = lang_Get_Snippet_Tooltip;
-					}
-					html += '<button id=\"'+keyID+'-getbutton\" class=\"uk-button uk-button-small uk-button-primary uk-width-1-1 uk-margin-small-bottom getreaction\" data-status=\"'+status+'\" data-path=\"'+key+'\" data-type=\"get\"  title=\"'+tooltip+'\"><i class=\"uk-icon-cloud-download\"></i> '+lang_Get_Snippet+'</button>';
-				} else {
-					html += '<button class=\"uk-button uk-button-small uk-width-1-1 uk-margin-small-bottom\" type=\"button\" disabled title=\"'+lang_Get_Snippet_Dont_Tooltip+'\"><i class=\"uk-icon-check-square-o\"></i> '+lang_Dont_Get_Snippet+'</button>';
-				}
-				html += '</div>';
-				// return data buttons
-				return html;
-			}
-			
-			function setContributorButtons(snippet, key) {
-				// set the contributor name
-				if (snippet.contributor_company) {
-					var contributor_name = snippet.contributor_company;
-				} else if (snippet.contributor_name) {
-					var contributor_name = snippet.contributor_name;
-				} else {
-					var contributor_name = lang_JCB_Community;
-				}
-				// set the contributor url
-				if (snippet.contributor_website) {
-					var contributor_url = snippet.contributor_website;
-				} else if (snippet.contributor_email) {
-					var contributor_url = 'mailto:'+snippet.contributor_email;
-				} else {
-					var contributor_url = 'https://github.com/vdm-io/Joomla-Component-Builder-Snippets';
-				}
-				var html = '<div class=\"uk-button-group uk-width-1-1\">';
-				html += '<button class=\"uk-button uk-button-primary uk-width-1-10 uk-button-mini getreaction\" data-type=\"contributor\" data-path=\"'+key+'\" title=\"'+lang_Contributor_Modal_Tooltip+'\"><i class=\"uk-icon-user\"></i></button>';
-				html += '<a  class=\"uk-button uk-button-primary uk-width-5-10 uk-button-mini\" href=\"'+contributor_url+'\" target=\"_blank\"  title=\"'+lang_Contributor_URL_Tooltip+'\"><i class=\"uk-icon-external-link\"></i> ' + contributor_name + '</a>';
-				html += '<a class=\"uk-button uk-button-primary uk-width-4-10 uk-button-mini\" href=\"https://github.com/vdm-io/Joomla-Component-Builder-Snippets/blame/master/'+key+'\" target=\"_blank\" title=\"'+lang_View_Blame_Tooltip+'\"><i class=\"uk-icon-external-link\"></i> '+lang_View_Blame+'</a>';
-				html += '</div>';
-				// return contributor buttons
-				return html;
-			}
-			
-			// do a bulk update
-			function checkBulkSnippetGithub() {
-				// check if there is new items
-				if (bulkItems.new.length === 0) {
-					jQuery('#bulk-button-new').prop('disabled', true);
-					jQuery('#bulk-button-new').attr('title', lang_Get_Snippets_New_Tooltip);
-					jQuery('#bulk-notice-new').show();
-				}
-				// check if there is diverged items
-				if (bulkItems.diverged.length === 0) {
-					jQuery('#bulk-button-diverged').prop('disabled', true);
-					jQuery('#bulk-button-diverged').attr('title', lang_Get_Snippets_Diverged_Tooltip);
-					jQuery('#bulk-notice-diverged').show();
-				}
-				// check if there is ahead items
-				if (bulkItems.ahead.length === 0) {
-					jQuery('#bulk-button-ahead').prop('disabled', true);
-					jQuery('#bulk-button-ahead').attr('title', lang_Get_Snippets_Ahead_Tooltip);
-					jQuery('#bulk-notice-ahead').show();
-				}
-				// check if there is behind items
-				if (bulkItems.behind.length === 0) {
-					jQuery('#bulk-button-behind').prop('disabled', true);
-					jQuery('#bulk-button-behind').attr('title', lang_Get_Snippets_Behind_Tooltip);
-					jQuery('#bulk-notice-behind').show();
-				}
-				// check if all we should close the all button
-				if (bulkItems.behind.length === 0 && bulkItems.new.length === 0 && bulkItems.ahead.length === 0 && bulkItems.diverged.length === 0) {
-					jQuery('#bulk-button-all').prop('disabled', true);
-					jQuery('#bulk-button-all').attr('title', lang_Get_Snippets_All_Tooltip);
-					jQuery('#bulk-notice-all').show();
-				}
-			}
-			
-			// do a bulk update
-			function bulkSnippetGithub(status) {
-				// if all then trigger those with values
-				if ('all' === status) {
-					bulkSnippetGithub('behind');
-					bulkSnippetGithub('new');
-					bulkSnippetGithub('ahead');
-					bulkSnippetGithub('diverged');
-				} else if (bulkItems[status].length > 0) {
-					jQuery.each(bulkItems[status], function(i, key){
-						setTimeout(function(){
-							doBulkUpdate_server(key, status).done(function(result) {
-								if (result.message) {
-									// only show errors
-									if ('error' === result.status || 'warning' === result.status) {
-										UIkit.notify(result.message, {status: result.status});
-									}
-									// update local items
-									if ('success' === result.status) {
-										// get key ID
-										var keyID = getKeyID(key);
-										// update snippet if we can
-										updateSnippetDisplay(keyID, 'equal');
-									}
-								} else {
-									UIkit.notify(lang_Update_Error_Tooltip, {status:'danger'});
-								}
-							});
-						}, 200);
-					});
-					// reset array
-					bulkItems[status].length = 0;
-					// update the buttons (since we only do the bulk update once)
-					checkBulkSnippetGithub();
-				}
-			}
-			
-			function doBulkUpdate_server(path, status) {
-				// set the ajax scope
-				ajaxcall = null;
-				var getUrl = \"index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json\";
-				if (token.length > 0 && path.length > 0 && status.length > 0) {
-					var request = 'token='+token+'&path='+path+'&status='+status;
-				}
-				return jQuery.ajax({
-					type: 'POST',
-					url: getUrl,
-					dataType: 'jsonp',
-					data: request,
-					jsonp: 'callback'
-				});
-			}
-			
-			// set the snippet from gitHub
-			function setSnippetGithub(key, status) {
-				var message = getConfirmUpdate(status);
-				UIkit.modal.confirm(message, function(){
-					// will be executed on confirm.
-					setSnippetGithub_server(key, status).done(function(result) {
-						if (result.message) {
-							UIkit.notify(result.message, {status: result.status});
-							if ('success' === result.status) {
-								// get key ID
-								var keyID = getKeyID(key);
-								// update snippet if we can
-								updateSnippetDisplay(keyID, 'equal');
-							}
-						} else {
-							UIkit.notify(lang_Update_Error_Tooltip, {status:'danger'});
-						}
-					});
-				});
-			}
-			
-			function setSnippetGithub_server(path, status) {
-				// set the ajax scope
-				ajaxcall = null;
-				var getUrl = \"index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json\";
-				if (token.length > 0 && path.length > 0 && status.length > 0) {
-					var request = 'token='+token+'&path='+path+'&status='+status;
-				}
-				return jQuery.ajax({
-					type: 'POST',
-					url: getUrl,
-					dataType: 'jsonp',
-					data: request,
-					jsonp: 'callback'
-				});
-			}
-			
-			// update the snippet display
-			function updateSnippetDisplay(keyID, status) {
-				// update badge
-				jQuery('#'+keyID+'-badge').html('<i class=\"uk-icon-info\"></i> ' +status);
-				jQuery('#'+keyID+'-badge').attr('href' , '#'+status+'-meaning');
-				// update button
-				if ('equal' === status) {
-					// update notice
-					jQuery('#'+keyID+'-getbutton').attr('title', lang_Get_Snippet_Dont_Tooltip);
-					jQuery('#'+keyID+'-getbutton').prop('disabled', true);
-					jQuery('#'+keyID+'-getbutton').html('<i class=\"uk-icon-check-square-o\"></i> ' + lang_Dont_Get_Snippet);
-					// counter delay just incase
-					setTimeout(function(){
-						jQuery('#'+keyID+'-getbutton').prop('disabled', true);
-					}, 2000);
-				}
-				// update the data filter
-				jQuery('#'+keyID+'-panel').attr('data-uk-filter', status);
-				// tell the grid to update
-				jQuery('#snippets-grid').trigger('display.uk.check');
-			}
-			
-			// set the modal
-			function getSnippetModal(key, type) {
-				// set the ajax scope
-				ajaxcall = 'snippets';
-				var _snippet = jQuery.jStorage.get(key, null);
-				if (_snippet) {
-					// show modal
-					showSnippetModal(_snippet, type);
-				} else {
-					jQuery.get('https://raw.githubusercontent.com/vdm-io/Joomla-Component-Builder-Snippets/master/'+key)
-					.success(function(snippet) {
-						// convert the string to json.object
-						snippet = jQuery.parseJSON(snippet);
-						jQuery.jStorage.set(key, snippet, {TTL: expire});
-						// show modal
-						showSnippetModal(snippet, type);
-					})
-					.error(function(jqXHR, textStatus, errorThrown) { 
-						// we could do more
-					});
-				}
-			}
-			
-			// show the modal
-			function showSnippetModal(snippet, type) {
-				var html = '<div class=\"uk-modal-dialog uk-modal-dialog-lightbox\">';
-				html += '<a href=\"\" class=\"uk-modal-close uk-close uk-close-alt\"></a>';
-				html += '<h3>' + snippet.library + ' - (' + snippet.type + ') ' + snippet.name + '</h3>';
-				if ('contributor' === type) {
-					html += '<dl class=\"uk-description-list-line\">';
-					html += '<dt><i class=\"uk-icon-institution\"></i> '+lang_Company_Name+'</dt>';
-					html += '<dd>'+snippet.contributor_company+'</dd>';
-					html += '<dt><i class=\"uk-icon-user\"></i> '+lang_Author_Name+'</dt>';
-					html += '<dd>'+snippet.contributor_name+'</dd>';
-					html += '<dt><i class=\"uk-icon-envelope-o\"></i> '+lang_Author_Email+'</dt>';
-					html += '<dd>'+snippet.contributor_email+'</dd>';
-					html += '<dt><i class=\"uk-icon-laptop\"></i> '+lang_Author_Website+'</dt>';
-					html += '<dd>'+snippet.contributor_website+'</dd>';
-					html += '</dl>';
-				} else {
-					html += '<br /><textarea class=\"uk-width-1-1\" rows=\"15\" readonly>'+snippet[type]+'</textarea>';
-				}
-				html += '<br /><small>C: ' + snippet.created + ' | M: ' + snippet.modified + '</small>';
-				html += '</div>';
-				// get current page position
-				var scroll = jQuery(window).scrollTop();
-				// add html to modal
-				var modal = UIkit.modal.blockUI(html, {center:true, bgclose:true}).on({
-					'hide.uk.modal': function(){
-						// scroll fix since the modal pops to the top of the page
-						jQuery(window).scrollTop(scroll);
-					}
-				});
-				// show modal
-				modal.show();
-			}
-			
-			// get key ID
-			function getKeyID(key) {
-				// get useful ID
-				var keyID = key.replace('-', '');
-				keyID = keyID.replace('.json', '');
-				keyID = keyID.replace(/\s+/ig, '-');
-				keyID = keyID.replace(/\(/g, '');
-				keyID = keyID.replace(/\)/g, '');
-				// return the id build
-				return keyID;
-			}
-		");
 	}
 
 	/**

admin/views/help_document/tmpl/edit.php

@@ -127,63 +127,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwam function
+// #jform_location listeners for location_vvvvwao function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwam = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwao = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwam(location_vvvvwam);
+	vvvvwao(location_vvvvwao);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwam = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwao = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwam(location_vvvvwam);
+	vvvvwao(location_vvvvwao);
 
 });
 
-// #jform_location listeners for location_vvvvwan function
+// #jform_location listeners for location_vvvvwap function
 jQuery('#jform_location').on('keyup',function()
 {
-	var location_vvvvwan = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwap = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwan(location_vvvvwan);
+	vvvvwap(location_vvvvwap);
 
 });
 jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var location_vvvvwan = jQuery("#jform_location input[type='radio']:checked").val();
+	var location_vvvvwap = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwan(location_vvvvwan);
+	vvvvwap(location_vvvvwap);
-
-});
-
-// #jform_type listeners for type_vvvvwao function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwao = jQuery("#jform_type").val();
-	vvvvwao(type_vvvvwao);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwao = jQuery("#jform_type").val();
-	vvvvwao(type_vvvvwao);
-
-});
-
-// #jform_type listeners for type_vvvvwap function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwap = jQuery("#jform_type").val();
-	vvvvwap(type_vvvvwap);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwap = jQuery("#jform_type").val();
-	vvvvwap(type_vvvvwap);
 
 });
 
@@ -202,18 +172,48 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwar function
+// #jform_type listeners for type_vvvvwar function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwar = jQuery("#jform_type").val();
+	vvvvwar(type_vvvvwar);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwar = jQuery("#jform_type").val();
+	vvvvwar(type_vvvvwar);
+
+});
+
+// #jform_type listeners for type_vvvvwas function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwas = jQuery("#jform_type").val();
+	vvvvwas(type_vvvvwas);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwas = jQuery("#jform_type").val();
+	vvvvwas(type_vvvvwas);
+
+});
+
+// #jform_target listeners for target_vvvvwat function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwar = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwat = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwar(target_vvvvwar);
+	vvvvwat(target_vvvvwat);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwar = jQuery("#jform_target input[type='radio']:checked").val();
+	var target_vvvvwat = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwar(target_vvvvwar);
+	vvvvwat(target_vvvvwat);
 
 });
 

admin/views/import_joomla_components/tmpl/default.php

@@ -159,7 +159,7 @@ jQuery(document).ready(function($) {
 	<?php if ($this->hasPackage && ComponentbuilderHelper::checkArray($this->headerList) && ComponentbuilderHelper::checkArray($this->headers)) : ?>
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => $this->activeTab)); ?>
 
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'basic', JText::_('Basic Method', true)); ?>
+		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'basic', JText::_('COM_COMPONENTBUILDER_BASIC_METHOD', true)); ?>
 		<fieldset class="uploadform">
 			<legend><?php echo JText::_('COM_COMPONENTBUILDER_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'); ?></legend>
 			<div class="control-group">

admin/views/layout/tmpl/edit.php

@@ -139,18 +139,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyt function
+// #jform_add_php_view listeners for add_php_view_vvvvvyv function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyv = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyt(add_php_view_vvvvvyt);
+	vvvvvyv(add_php_view_vvvvvyv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyt = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyv = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyt(add_php_view_vvvvvyt);
+	vvvvvyv(add_php_view_vvvvvyv);
 
 });
 

admin/views/library/tmpl/edit.php

@@ -147,36 +147,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvvzu function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvvzu = jQuery("#jform_how").val();
-	vvvvvzu(how_vvvvvzu);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvvzu = jQuery("#jform_how").val();
-	vvvvvzu(how_vvvvvzu);
-
-});
-
-// #jform_how listeners for how_vvvvvzv function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvvzv = jQuery("#jform_how").val();
-	vvvvvzv(how_vvvvvzv);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvvzv = jQuery("#jform_how").val();
-	vvvvvzv(how_vvvvvzv);
-
-});
-
 // #jform_how listeners for how_vvvvvzw function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -252,18 +222,48 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwab function
+// #jform_how listeners for how_vvvvwab function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwab = jQuery("#jform_how").val();
+	vvvvwab(how_vvvvwab);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwab = jQuery("#jform_how").val();
+	vvvvwab(how_vvvvwab);
+
+});
+
+// #jform_how listeners for how_vvvvwac function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwac = jQuery("#jform_how").val();
+	vvvvwac(how_vvvvwac);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwac = jQuery("#jform_how").val();
+	vvvvwac(how_vvvvwac);
+
+});
+
+// #jform_type listeners for type_vvvvwad function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(type_vvvvwab);
+	vvvvwad(type_vvvvwad);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwab = jQuery("#jform_type input[type='radio']:checked").val();
+	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwab(type_vvvvwab);
+	vvvvwad(type_vvvvwad);
 
 });
 

admin/views/site_view/tmpl/edit.php

@@ -166,153 +166,168 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyi function
+// #jform_add_php_view listeners for add_php_view_vvvvvyj function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyi = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyi(add_php_view_vvvvvyi);
+	vvvvvyj(add_php_view_vvvvvyj);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyj function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyk function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyj = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyj(add_php_jview_display_vvvvvyj);
+	vvvvvyk(add_php_jview_display_vvvvvyk);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyk function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyl function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyk = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_vvvvvyk);
+	vvvvvyl(add_php_jview_vvvvvyl);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyl function
+// #jform_add_php_document listeners for add_php_document_vvvvvym function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyl = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyl(add_php_document_vvvvvyl);
+	vvvvvym(add_php_document_vvvvvym);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvym function
+// #jform_add_css_document listeners for add_css_document_vvvvvyn function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvym = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvym(add_css_document_vvvvvym);
+	vvvvvyn(add_css_document_vvvvvyn);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyn function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyo function
+jQuery('#jform_add_javascript_file').on('keyup',function()
+{
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyo(add_javascript_file_vvvvvyo);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
+{
+	e.preventDefault();
+	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyo(add_javascript_file_vvvvvyo);
+
+});
+
+// #jform_add_js_document listeners for add_js_document_vvvvvyp function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	vvvvvyp(add_js_document_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyn = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyn(add_js_document_vvvvvyn);
+	vvvvvyp(add_js_document_vvvvvyp);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyo function
+// #jform_add_css listeners for add_css_vvvvvyq function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyo(add_css_vvvvvyo);
+	vvvvvyq(add_css_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyo(add_css_vvvvvyo);
+	vvvvvyq(add_css_vvvvvyq);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyp function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyr function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyp(add_php_ajax_vvvvvyp);
+	vvvvvyr(add_php_ajax_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyp(add_php_ajax_vvvvvyp);
+	vvvvvyr(add_php_ajax_vvvvvyr);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyq function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvys function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyq(add_custom_button_vvvvvyq);
+	vvvvvys(add_custom_button_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyq = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyq(add_custom_button_vvvvvyq);
+	vvvvvys(add_custom_button_vvvvvys);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvvyr function
+// #jform_button_position listeners for button_position_vvvvvyt function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvyr = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyt = jQuery("#jform_button_position").val();
-	vvvvvyr(button_position_vvvvvyr);
+	vvvvvyt(button_position_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvyr = jQuery("#jform_button_position").val();
+	var button_position_vvvvvyt = jQuery("#jform_button_position").val();
-	vvvvvyr(button_position_vvvvvyr);
+	vvvvvyt(button_position_vvvvvyt);
 
 });
 

admin/views/template/tmpl/edit.php

@@ -139,18 +139,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvys function
+// #jform_add_php_view listeners for add_php_view_vvvvvyu function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyu = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	vvvvvyu(add_php_view_vvvvvyu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvys = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	var add_php_view_vvvvvyu = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvys(add_php_view_vvvvvys);
+	vvvvvyu(add_php_view_vvvvvyu);
 
 });
 

componentbuilder.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>12th December, 2017</creationDate>
+	<creationDate>17th December, 2017</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>http://vdm.bz/component-builder</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.6.6</version>
+	<version>2.6.7</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.6.6)</h1>
+		<h1>Component Builder (v.2.6.7)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 

componentbuilder_update_server.xml

@@ -271,4 +271,21 @@
 		<maintainerurl>http://vdm.bz/component-builder</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.6.7</version>
+		<infourl title="Component Builder!">http://vdm.bz/component-builder</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.7/JCB_v2.6.7.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://vdm.bz/component-builder</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>

script.php

@@ -3230,9 +3230,9 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","icon":"icon","add_php_jview":"add_php_jview","add_css_document":"add_css_document","add_php_document":"add_php_document","libraries":"libraries","add_php_jview_display":"add_php_jview_display","php_controller":"php_controller","add_js_document":"add_js_document","add_css":"add_css","default":"default","php_model":"php_model","add_php_view":"add_php_view","php_document":"php_document","not_required":"not_required","php_view":"php_view","custom_get":"custom_get","php_jview_display":"php_jview_display","main_get":"main_get","php_jview":"php_jview","dynamic_get":"dynamic_get","js_document":"js_document","css_document":"css_document","add_custom_button":"add_custom_button","css":"css"}}';
+			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_css_document":"add_css_document","icon":"icon","add_js_document":"add_js_document","add_php_document":"add_php_document","add_php_jview_display":"add_php_jview_display","libraries":"libraries","add_css":"add_css","add_php_view":"add_php_view","php_controller":"php_controller","add_php_jview":"add_php_jview","default":"default","php_model":"php_model","add_javascript_file":"add_javascript_file","js_document":"js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","css_document":"css_document","main_get":"main_get","css":"css","dynamic_get":"dynamic_get","php_document":"php_document","php_view":"php_view","add_custom_button":"add_custom_button","php_jview_display":"php_jview_display","php_jview":"php_jview"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
-			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_jview","add_css_document","add_php_document","add_php_jview_display","add_js_document","add_css","add_php_view","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_css_document","add_js_document","add_php_document","add_php_jview_display","add_css","add_php_view","add_php_jview","add_javascript_file","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$custom_admin_view_Inserted = $db->insertObject('#__content_types', $custom_admin_view);
@@ -3242,9 +3242,9 @@ class com_componentbuilderInstallerScript
 			$site_view->type_title = 'Componentbuilder Site_view';
 			$site_view->type_alias = 'com_componentbuilder.site_view';
 			$site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","js_document":"js_document","libraries":"libraries","css":"css","add_php_document":"add_php_document","add_php_jview_display":"add_php_jview_display","css_document":"css_document","php_ajaxmethod":"php_ajaxmethod","add_php_view":"add_php_view","default":"default","add_php_jview":"add_php_jview","php_model":"php_model","php_controller":"php_controller","not_required":"not_required","add_js_document":"add_js_document","custom_get":"custom_get","add_css_document":"add_css_document","main_get":"main_get","add_css":"add_css","dynamic_get":"dynamic_get","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","php_document":"php_document","button_position":"button_position","php_view":"php_view","php_jview_display":"php_jview_display","php_jview":"php_jview"}}';
+			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","libraries":"libraries","js_document":"js_document","add_php_document":"add_php_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","javascript_file":"javascript_file","add_php_jview":"add_php_jview","php_model":"php_model","not_required":"not_required","add_javascript_file":"add_javascript_file","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","button_position":"button_position","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}';
 			$site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute';
-			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","add_css_document","main_get","add_css","dynamic_get","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_javascript_file","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$site_view_Inserted = $db->insertObject('#__content_types', $site_view);
@@ -3674,9 +3674,9 @@ class com_componentbuilderInstallerScript
 			$custom_admin_view->type_title = 'Componentbuilder Custom_admin_view';
 			$custom_admin_view->type_alias = 'com_componentbuilder.custom_admin_view';
 			$custom_admin_view->table = '{"special": {"dbtable": "#__componentbuilder_custom_admin_view","key": "id","type": "Custom_admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","icon":"icon","add_php_jview":"add_php_jview","add_css_document":"add_css_document","add_php_document":"add_php_document","libraries":"libraries","add_php_jview_display":"add_php_jview_display","php_controller":"php_controller","add_js_document":"add_js_document","add_css":"add_css","default":"default","php_model":"php_model","add_php_view":"add_php_view","php_document":"php_document","not_required":"not_required","php_view":"php_view","custom_get":"custom_get","php_jview_display":"php_jview_display","main_get":"main_get","php_jview":"php_jview","dynamic_get":"dynamic_get","js_document":"js_document","css_document":"css_document","add_custom_button":"add_custom_button","css":"css"}}';
+			$custom_admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","add_css_document":"add_css_document","icon":"icon","add_js_document":"add_js_document","add_php_document":"add_php_document","add_php_jview_display":"add_php_jview_display","libraries":"libraries","add_css":"add_css","add_php_view":"add_php_view","php_controller":"php_controller","add_php_jview":"add_php_jview","default":"default","php_model":"php_model","add_javascript_file":"add_javascript_file","js_document":"js_document","not_required":"not_required","javascript_file":"javascript_file","custom_get":"custom_get","css_document":"css_document","main_get":"main_get","css":"css","dynamic_get":"dynamic_get","php_document":"php_document","php_view":"php_view","add_custom_button":"add_custom_button","php_jview_display":"php_jview_display","php_jview":"php_jview"}}';
 			$custom_admin_view->router = 'ComponentbuilderHelperRoute::getCustom_admin_viewRoute';
-			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_jview","add_css_document","add_php_document","add_php_jview_display","add_js_document","add_css","add_php_view","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$custom_admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/custom_admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_css_document","add_js_document","add_php_document","add_php_jview_display","add_css","add_php_view","add_php_jview","add_javascript_file","not_required","main_get","dynamic_get","add_custom_button"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if custom_admin_view type is already in content_type DB.
 			$custom_admin_view_id = null;
@@ -3703,9 +3703,9 @@ class com_componentbuilderInstallerScript
 			$site_view->type_title = 'Componentbuilder Site_view';
 			$site_view->type_alias = 'com_componentbuilder.site_view';
 			$site_view->table = '{"special": {"dbtable": "#__componentbuilder_site_view","key": "id","type": "Site_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","js_document":"js_document","libraries":"libraries","css":"css","add_php_document":"add_php_document","add_php_jview_display":"add_php_jview_display","css_document":"css_document","php_ajaxmethod":"php_ajaxmethod","add_php_view":"add_php_view","default":"default","add_php_jview":"add_php_jview","php_model":"php_model","php_controller":"php_controller","not_required":"not_required","add_js_document":"add_js_document","custom_get":"custom_get","add_css_document":"add_css_document","main_get":"main_get","add_css":"add_css","dynamic_get":"dynamic_get","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","php_document":"php_document","button_position":"button_position","php_view":"php_view","php_jview_display":"php_jview_display","php_jview":"php_jview"}}';
+			$site_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name":"name","codename":"codename","description":"description","snippet":"snippet","css":"css","libraries":"libraries","js_document":"js_document","add_php_document":"add_php_document","css_document":"css_document","default":"default","php_ajaxmethod":"php_ajaxmethod","add_php_jview_display":"add_php_jview_display","add_php_view":"add_php_view","javascript_file":"javascript_file","add_php_jview":"add_php_jview","php_model":"php_model","not_required":"not_required","add_javascript_file":"add_javascript_file","custom_get":"custom_get","add_js_document":"add_js_document","main_get":"main_get","add_css_document":"add_css_document","dynamic_get":"dynamic_get","add_css":"add_css","add_php_ajax":"add_php_ajax","add_custom_button":"add_custom_button","button_position":"button_position","php_document":"php_document","php_view":"php_view","php_jview_display":"php_jview_display","php_controller":"php_controller","php_jview":"php_jview"}}';
 			$site_view->router = 'ComponentbuilderHelperRoute::getSite_viewRoute';
-			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_js_document","add_css_document","main_get","add_css","dynamic_get","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
+			$site_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/site_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","snippet","add_php_document","add_php_jview_display","add_php_view","add_php_jview","not_required","add_javascript_file","add_js_document","main_get","add_css_document","dynamic_get","add_css","add_php_ajax","add_custom_button","button_position"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "libraries","targetTable": "#__componentbuilder_library","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "custom_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "main_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if site_view type is already in content_type DB.
 			$site_view_id = null;
@@ -4739,7 +4739,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://vdm.bz/component-builder" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.6.6 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.6.7 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 }

site/controller.php

@@ -67,7 +67,6 @@ class ComponentbuilderController extends JControllerLegacy
 				}
 				elseif (ComponentbuilderHelper::checkString($ref))
 				{
-
 					// redirect to ref
 					 $this->setRedirect(JRoute::_('index.php?option=com_componentbuilder&view='.(string)$ref, false));
 				}

site/controllers/help.php

@@ -48,7 +48,8 @@ class ComponentbuilderControllerHelp extends JControllerLegacy
 		// Check Token!
 		$token 		= JSession::getFormToken();
 		$call_token	= $jinput->get('token', 0, 'ALNUM');
-		if($token == $call_token){
+		if($token == $call_token)
+		{
 			$task = $this->getTask();
 			switch($task){
 				case 'getText':

site/helpers/componentbuilder.php

@@ -178,12 +178,16 @@ abstract class ComponentbuilderHelper
 								// load document script
 								$files[md5($url['path'])] =  '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LOCAL');
 							}
+							// check if link must be added
+							if (isset($url['url']) && ((isset($url['type']) && $url['type'] == 1) || (isset($url['type']) && $url['type'] == 3) || !isset($url['type'])))
+							{
 								// load url also if not building document
 								$files[md5($url['url'])] = '(' . JText::_('URL') . ') ' . basename($url['url']) . ' - ' . JText::_('COM_COMPONENTBUILDER_LINK');
 							}
 						}
 					}
 				}
+			}
 			// load the local files
 			if (self::checkJson($result->addfiles))
 			{
@@ -262,7 +266,7 @@ abstract class ComponentbuilderHelper
 							// load per path
 							foreach($paths as $path)
 							{
-								$files[md5($root.'/'.trim($path, '/'))] = '(' . JText::_('COM_COMPONENTBUILDER_FOLDER') . ') ' . basename($path);
+								$files[md5($root.'/'.trim($path, '/'))] = '(' . JText::_('COM_COMPONENTBUILDER_FOLDER') . ') ' . basename($path) . ' - ' . basename($root);
 							}
 						}
 					}