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

2017-02-14 01:24:38 +02:00
parent de008d5907
commit 290a51dd5a
247 changed files with 2394 additions and 1513 deletions
--- a/admin/models/forms/component.js
+++ b/admin/models/forms/component.js
@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		@update number 81 of this MVC
-	@build			3rd February, 2017
+	@build			13th February, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		component.js
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 35 of this MVC
-	@build			10th February, 2017
+	@version		@update number 55 of this MVC
+	@build			13th February, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.js
@ -23,9 +23,10 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvzpvzk_required = false;
+jform_vvvvvzovzk_required = false;
 jform_vvvvvzpvzl_required = false;
 jform_vvvvvzpvzm_required = false;
+jform_vvvvvzpvzn_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -51,11 +52,30 @@ function vvvvvzo(target_vvvvvzo)
 	// set the function logic
 	if (target_vvvvvzo == 2)
 	{
+		jQuery('#jform_function_name').closest('.control-group').show();
+		if (jform_vvvvvzovzk_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_vvvvvzovzk_required = false;
+		}
+
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
 		jQuery('#jform_system_name').closest('.control-group').show();
 	}
 	else
 	{
+		jQuery('#jform_function_name').closest('.control-group').hide();
+		if (!jform_vvvvvzovzk_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_vvvvvzovzk_required = true;
+		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
@ -68,70 +88,70 @@ function vvvvvzp(target_vvvvvzp)
 	if (target_vvvvvzp == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvzpvzk_required)
+		if (jform_vvvvvzpvzl_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvzpvzk_required = false;
+			jform_vvvvvzpvzl_required = false;
 		}

 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvzpvzl_required)
+		if (jform_vvvvvzpvzm_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvzpvzl_required = false;
+			jform_vvvvvzpvzm_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_vvvvvzpvzm_required)
+		if (jform_vvvvvzpvzn_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvzpvzm_required = false;
+			jform_vvvvvzpvzn_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvzpvzk_required)
+		if (!jform_vvvvvzpvzl_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvzpvzk_required = true;
+			jform_vvvvvzpvzl_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvzpvzl_required)
+		if (!jform_vvvvvzpvzm_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvzpvzl_required = true;
+			jform_vvvvvzpvzm_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_vvvvvzpvzm_required)
+		if (!jform_vvvvvzpvzn_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvzpvzm_required = true;
+			jform_vvvvvzpvzn_required = true;
 		}
 	}
 }
@ -202,4 +222,103 @@ function isSet(val)
 		return true;
 	}
 	return false;
+}
+
+jQuery(document).ready(function()
+{
+	var target = jQuery("#jform_target input[type='radio']:checked").val();
+	if (target == 2) {
+		var functioName = jQuery('#jform_function_name').val();
+		// check if this function name is taken
+		checkFunctionName(functioName);
+	}
+});
+function setCustomCodePlaceholder() {
+	var ide = jQuery('#jform_id').val();
+	var functioName = jQuery('#jform_function_name').val();
+	if (ide > 0 && functioName.length > 2) {
+		jQuery('#jcb-placeholder').html('<code>[CUSTO'+'MCODE='+ide+']</code> or <code>[CUSTO'+'MCODE='+functioName+']</code>');
+		jQuery('#jcb-placeholder-arg').html('<code>[CUSTO'+'MCODE='+ide+'&#43;value1,value2]</code>  or <code>[CUSTO'+'MCODE='+functioName+'&#43;value1,value2]</code>');
+	} else if (ide > 0){
+		jQuery('#jcb-placeholder').html('<code>[CUSTO'+'MCODE='+ide+']</code> or <code>[not ready]</code>');
+		jQuery('#jcb-placeholder-arg').html('<code>[CUSTO'+'MCODE='+ide+'&#43;value1,value2]</code>  or <code>[not ready]</code>');
+	} else if (functioName.length > 2) {
+		jQuery('#jcb-placeholder').html('<code>[save to see]</code> or <code>[CUSTO'+'MCODE='+functioName+']</code>');
+		jQuery('#jcb-placeholder-arg').html('<code>[save to see]</code>  or <code>[CUSTO'+'MCODE='+functioName+'&#43;value1,value2]</code>');
+	} else {
+		jQuery('#jcb-placeholder').html('<code>[save to see]</code>');
+		jQuery('#jcb-placeholder-arg').html('<code>[save to see]</code>');
+	}
+	// update the notes
+	if (ide > 0) {
+		jQuery('.placeholder-key-id').text(ide);
+	}
+}
+function checkFunctionName(functioName) {
+	if (functioName.length > 2) {
+		var ide = jQuery('#jform_id').val();
+		if (ide == 0) {
+			ide = -1;
+		}
+		checkFunctionName_server(functioName, ide).done(function(result) {
+			if(result.name && result.message){
+				// show notice that functioName is okay
+				jQuery.UIkit.notify({message: result.message, timeout: 5000, status: result.status, pos: 'top-right'});
+				jQuery('#jform_function_name').val(result.name);
+				// now start search for where the function is used
+				usedin(result.name, ide);
+			} else if(result.message){
+				// show notice that functioName is not okay
+				jQuery.UIkit.notify({message: result.message, timeout: 5000, status: result.status, pos: 'top-right'});
+				jQuery('#jform_function_name').val('');
+			} else {
+				// set an error that message was not send
+				jQuery.UIkit.notify({message: 'Function name already taken, please try again.', timeout: 5000, status: 'danger', pos: 'top-right'});
+				jQuery('#jform_function_name').val('');
+			}
+			// set custom code placeholder
+			setCustomCodePlaceholder();
+		});
+	} else {
+		// set an error that message was not send
+		jQuery.UIkit.notify({message: 'You must add an unique function name.', timeout: 5000, status: 'danger', pos: 'top-right'});
+		jQuery('#jform_function_name').val('');
+		// set custom code placeholder
+		setCustomCodePlaceholder();
+	}
+}
+// check Function Name
+function checkFunctionName_server(functioName, ide){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.checkFunctionName&format=json";
+	if(token.length > 0){
+		var request = 'token='+token+'&functioName='+functioName+'&id='+ide;
+	}
+	return jQuery.ajax({
+		type: 'POST',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+// check where this Function is used
+function usedin(functioName, ide) {
+	usedin_server(functioName, ide).done(function(used) {
+		if (used.in) {
+			jQuery('#usedin').html(used.in);
+		}
+	});
+}
+function usedin_server(functioName, ide){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.usedin&format=json";
+	if(token.length > 0){
+		var request = 'token='+token+'&functioName='+functioName+'&id='+ide;
+	}
+	return jQuery.ajax({
+		type: 'POST',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
 } 
--- a/admin/models/forms/custom_code.xml
+++ b/admin/models/forms/custom_code.xml
@ -123,12 +123,12 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL"
 			description="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_DESCRIPTION"
 			class="btn-group btn-group-yesno"
-			default="1">
+			default="2">
 			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION</option>
 			<option value="2">
 				COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL</option>
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION</option>
 		</field>
 		<!-- Type Field. Type: Radio. (joomla) -->
 		<field
@ -144,45 +144,34 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_CUSTOM_CODE_INSERTION</option>
 		</field>
-		<!-- Code Field. Type: Textarea. (joomla) -->
+		<!-- Comment_type Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
-			name="code"
-			label="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT"
-			required="true"
-		/>
-		<!-- To_line Field. Type: Text. (joomla) -->
+			type="radio"
+			name="comment_type"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_CUSTOM_CODE_HTML</option>
+		</field>
+		<!-- Hashendtarget Field. Type: Text. (joomla) -->
 		<field
 			type="text"
-			name="to_line"
-			label="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_LABEL"
-			size="10"
-			maxlength="50"
-			description="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_DESCRIPTION"
-			class="text_area"
-			filter="FLOAT"
-			message="Error! Please add line number here."
-			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT"
-			onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};"
-		/>
-		<!-- System_name Field. Type: Text. (joomla) -->
-		<field
-			type="text"
-			name="system_name"
-			label="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL"
-			size="10"
-			maxlength="50"
-			description="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION"
+			name="hashendtarget"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_LABEL"
+			size="50"
+			maxlength="150"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION"
 			class="text_area"
+			readonly="true"
 			filter="STRING"
 			message="Error! Please add some text here."
-			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT"
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT"
 		/>
 		<!-- Hashtarget Field. Type: Text. (joomla) -->
 		<field
@ -198,21 +187,59 @@
 			message="Error! Please add some text here."
 			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT"
 		/>
-		<!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_jcb_placeholder" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION" heading="h4" class="span12 note_jcb_placeholder" />
-		<!-- Hashendtarget Field. Type: Text. (joomla) -->
+		<!-- Function_name Field. Type: Text. (joomla) -->
 		<field
 			type="text"
-			name="hashendtarget"
-			label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_LABEL"
-			size="50"
-			maxlength="150"
-			description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION"
+			name="function_name"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_LABEL"
+			size="40"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_DESCRIPTION"
+			class="input-large-text"
+			required="true"
+		/>
+		<!-- Note_placeholders_explained Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_placeholders_explained" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION" heading="h4" class="note_placeholders_explained" />
+		<!-- System_name Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="system_name"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL"
+			size="10"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION"
 			class="text_area"
-			readonly="true"
 			filter="STRING"
 			message="Error! Please add some text here."
-			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT"
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT"
+		/>
+		<!-- To_line Field. Type: Text. (joomla) -->
+		<field
+			type="text"
+			name="to_line"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_LABEL"
+			size="10"
+			maxlength="50"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_DESCRIPTION"
+			class="text_area"
+			filter="FLOAT"
+			message="Error! Please add line number here."
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT"
+			onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};"
+		/>
+		<!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_jcb_placeholder" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION" heading="h4" class="span12 note_jcb_placeholder" />
+		<!-- Code Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="code"
+			label="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT"
+			required="true"
 		/>
 		<!-- From_line Field. Type: Text. (joomla) -->
 		<field
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@ -23,14 +23,14 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvzsvzn_required = false;
-jform_vvvvvztvzo_required = false;
-jform_vvvvvzuvzp_required = false;
-jform_vvvvvzvvzq_required = false;
-jform_vvvvvzyvzr_required = false;
-jform_vvvvvzzvzs_required = false;
-jform_vvvvwaavzt_required = false;
-jform_vvvvwabvzu_required = false;
+jform_vvvvvzsvzo_required = false;
+jform_vvvvvztvzp_required = false;
+jform_vvvvvzuvzq_required = false;
+jform_vvvvvzvvzr_required = false;
+jform_vvvvvzyvzs_required = false;
+jform_vvvvvzzvzt_required = false;
+jform_vvvvwaavzu_required = false;
+jform_vvvvwabvzv_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -84,26 +84,26 @@ function vvvvvzs(datalenght_vvvvvzs)
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvvzsvzn_required)
+		if (jform_vvvvvzsvzo_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_vvvvvzsvzn_required = false;
+			jform_vvvvvzsvzo_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzn_required)
+		if (!jform_vvvvvzsvzo_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_vvvvvzsvzn_required = true;
+			jform_vvvvvzsvzo_required = true;
 		}
 	}
 }
@ -139,26 +139,26 @@ function vvvvvzt(datadefault_vvvvvzt)
 	if (datadefault)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvvztvzo_required)
+		if (jform_vvvvvztvzp_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_vvvvvztvzo_required = false;
+			jform_vvvvvztvzp_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvvztvzo_required)
+		if (!jform_vvvvvztvzp_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_vvvvvztvzo_required = true;
+			jform_vvvvvztvzp_required = true;
 		}
 	}
 }
@ -196,13 +196,13 @@ function vvvvvzu(datatype_vvvvvzu)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvvzuvzp_required)
+		if (jform_vvvvvzuvzq_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvvzuvzp_required = false;
+			jform_vvvvvzuvzq_required = false;
 		}

 	}
@ -211,13 +211,13 @@ function vvvvvzu(datatype_vvvvvzu)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
-		if (!jform_vvvvvzuvzp_required)
+		if (!jform_vvvvvzuvzq_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvvzuvzp_required = true;
+			jform_vvvvvzuvzq_required = true;
 		}
 	}
 }
@ -253,26 +253,26 @@ function vvvvvzv(datatype_vvvvvzv)
 	if (datatype)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
-		if (jform_vvvvvzvvzq_required)
+		if (jform_vvvvvzvvzr_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvvzvvzq_required = false;
+			jform_vvvvvzvvzr_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
-		if (!jform_vvvvvzvvzq_required)
+		if (!jform_vvvvvzvvzr_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvvzvvzq_required = true;
+			jform_vvvvvzvvzr_required = true;
 		}
 	}
 }
@ -356,26 +356,26 @@ function vvvvvzy(add_css_view_vvvvvzy)
 	if (add_css_view_vvvvvzy == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvvzyvzr_required)
+		if (jform_vvvvvzyvzs_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_vvvvvzyvzr_required = false;
+			jform_vvvvvzyvzs_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvvzyvzr_required)
+		if (!jform_vvvvvzyvzs_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_vvvvvzyvzr_required = true;
+			jform_vvvvvzyvzs_required = true;
 		}
 	}
 }
@ -387,26 +387,26 @@ function vvvvvzz(add_css_views_vvvvvzz)
 	if (add_css_views_vvvvvzz == 1)
 	{
 		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvvzzvzs_required)
+		if (jform_vvvvvzzvzt_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_vvvvvzzvzs_required = false;
+			jform_vvvvvzzvzt_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvvzzvzs_required)
+		if (!jform_vvvvvzzvzt_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_vvvvvzzvzs_required = true;
+			jform_vvvvvzzvzt_required = true;
 		}
 	}
 }
@ -418,26 +418,26 @@ function vvvvwaa(add_javascript_view_footer_vvvvwaa)
 	if (add_javascript_view_footer_vvvvwaa == 1)
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwaavzt_required)
+		if (jform_vvvvwaavzu_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_vvvvwaavzt_required = false;
+			jform_vvvvwaavzu_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
-		if (!jform_vvvvwaavzt_required)
+		if (!jform_vvvvwaavzu_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_vvvvwaavzt_required = true;
+			jform_vvvvwaavzu_required = true;
 		}
 	}
 }
@ -449,26 +449,26 @@ function vvvvwab(add_javascript_views_footer_vvvvwab)
 	if (add_javascript_views_footer_vvvvwab == 1)
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
-		if (jform_vvvvwabvzu_required)
+		if (jform_vvvvwabvzv_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_vvvvwabvzu_required = false;
+			jform_vvvvwabvzv_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
-		if (!jform_vvvvwabvzu_required)
+		if (!jform_vvvvwabvzv_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_vvvvwabvzu_required = true;
+			jform_vvvvwabvzv_required = true;
 		}
 	}
 }
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@ -23,12 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvwacvzx_required = false;
-jform_vvvvwadvzy_required = false;
-jform_vvvvwaevzz_required = false;
-jform_vvvvwafwaa_required = false;
-jform_vvvvwagwab_required = false;
-jform_vvvvwahwac_required = false;
+jform_vvvvwacvzy_required = false;
+jform_vvvvwadvzz_required = false;
+jform_vvvvwaewaa_required = false;
+jform_vvvvwafwab_required = false;
+jform_vvvvwagwac_required = false;
+jform_vvvvwahwad_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -59,26 +59,26 @@ function vvvvwac(location_vvvvwac)
 	if (location_vvvvwac == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwacvzx_required)
+		if (jform_vvvvwacvzy_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_vvvvwacvzx_required = false;
+			jform_vvvvwacvzy_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwacvzx_required)
+		if (!jform_vvvvwacvzy_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_vvvvwacvzx_required = true;
+			jform_vvvvwacvzy_required = true;
 		}
 	}
 }
@ -90,26 +90,26 @@ function vvvvwad(location_vvvvwad)
 	if (location_vvvvwad == 2)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwadvzy_required)
+		if (jform_vvvvwadvzz_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_vvvvwadvzy_required = false;
+			jform_vvvvwadvzz_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwadvzy_required)
+		if (!jform_vvvvwadvzz_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_vvvvwadvzy_required = true;
+			jform_vvvvwadvzz_required = true;
 		}
 	}
 }
@ -134,26 +134,26 @@ function vvvvwae(type_vvvvwae)
 	if (type)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwaevzz_required)
+		if (jform_vvvvwaewaa_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwaevzz_required = false;
+			jform_vvvvwaewaa_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwaevzz_required)
+		if (!jform_vvvvwaewaa_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwaevzz_required = true;
+			jform_vvvvwaewaa_required = true;
 		}
 	}
 }
@ -189,26 +189,26 @@ function vvvvwaf(type_vvvvwaf)
 	if (type)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
-		if (jform_vvvvwafwaa_required)
+		if (jform_vvvvwafwab_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwafwaa_required = false;
+			jform_vvvvwafwab_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
-		if (!jform_vvvvwafwaa_required)
+		if (!jform_vvvvwafwab_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwafwaa_required = true;
+			jform_vvvvwafwab_required = true;
 		}
 	}
 }
@ -244,26 +244,26 @@ function vvvvwag(type_vvvvwag)
 	if (type)
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').show();
-		if (jform_vvvvwagwab_required)
+		if (jform_vvvvwagwac_required)
 		{
 			updateFieldRequired('content',0);
 			jQuery('#jform_content').prop('required','required');
 			jQuery('#jform_content').attr('aria-required',true);
 			jQuery('#jform_content').addClass('required');
-			jform_vvvvwagwab_required = false;
+			jform_vvvvwagwac_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_content-lbl').closest('.control-group').hide();
-		if (!jform_vvvvwagwab_required)
+		if (!jform_vvvvwagwac_required)
 		{
 			updateFieldRequired('content',1);
 			jQuery('#jform_content').removeAttr('required');
 			jQuery('#jform_content').removeAttr('aria-required');
 			jQuery('#jform_content').removeClass('required');
-			jform_vvvvwagwab_required = true;
+			jform_vvvvwagwac_required = true;
 		}
 	}
 }
@ -286,26 +286,26 @@ function vvvvwah(target_vvvvwah)
 	if (target_vvvvwah == 1)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
-		if (jform_vvvvwahwac_required)
+		if (jform_vvvvwahwad_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwahwac_required = false;
+			jform_vvvvwahwad_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
-		if (!jform_vvvvwahwac_required)
+		if (!jform_vvvvwahwad_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwahwac_required = true;
+			jform_vvvvwahwad_required = true;
 		}
 	}
 }
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@ -9,8 +9,8 @@
                                                        |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/

-	@version		@update number 66 of this MVC
-	@build			3rd February, 2017
+	@version		@update number 67 of this MVC
+	@build			11th February, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.js