Release of v5.1.1-alpha5

Refactor initialization flow to accommodate future scalability and integration with all designated areas. Refactor the Creator Builders class. Refactor the FieldString and FieldXML classes.

admin/tmpl/admin_custom_tabs/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/admin_fields/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show
@@ -120,10 +120,10 @@ function checkAdminBehaviour(field) {
 	if (2 == value) {
 		// no database
 		if (target[2] == 'list') {
-			jQuery.UIkit.notify({message: Joomla.JText._('COM_COMPONENTBUILDER_ONLY_USE_THE_BNONE_DBB_OPTION_IF_YOU_ARE_PLANNING_ON_TARGETING_THIS_FIELD_WITH_JAVASCRIPTCUSTOM_PHP_TO_MOVE_ITS_VALUE_INTO_ANOTHER_FIELD_THAT_DOES_GET_SAVED_TO_THE_DATABASE'), timeout: 10000, status: 'warning', pos: 'top-right'});
-			jQuery.UIkit.notify({message: Joomla.JText._('COM_COMPONENTBUILDER_THE_BNONE_DBB_OPTION_WILL_REMOVE_THIS_FIELD_FROM_BEING_SAVED_IN_THE_DATABASE'), timeout: 5000, status: 'primary', pos: 'top-right'});
+			jQuery.UIkit.notify({message: Joomla.Text._('COM_COMPONENTBUILDER_ONLY_USE_THE_BNONE_DBB_OPTION_IF_YOU_ARE_PLANNING_ON_TARGETING_THIS_FIELD_WITH_JAVASCRIPTCUSTOM_PHP_TO_MOVE_ITS_VALUE_INTO_ANOTHER_FIELD_THAT_DOES_GET_SAVED_TO_THE_DATABASE'), timeout: 10000, status: 'warning', pos: 'top-right'});
+			jQuery.UIkit.notify({message: Joomla.Text._('COM_COMPONENTBUILDER_THE_BNONE_DBB_OPTION_WILL_REMOVE_THIS_FIELD_FROM_BEING_SAVED_IN_THE_DATABASE'), timeout: 5000, status: 'primary', pos: 'top-right'});
 		} else {
-			jQuery.UIkit.notify({message: Joomla.JText._('COM_COMPONENTBUILDER_THESE_OPTIONS_ARE_NOT_AVAILABLE_TO_THE_FIELD_IF_BNONE_DBB_OPTION_IS_SELECTED'), timeout: 7000, status: 'warning', pos: 'top-right'});
+			jQuery.UIkit.notify({message: Joomla.Text._('COM_COMPONENTBUILDER_THESE_OPTIONS_ARE_NOT_AVAILABLE_TO_THE_FIELD_IF_BNONE_DBB_OPTION_IS_SELECTED'), timeout: 7000, status: 'warning', pos: 'top-right'});
 		}
 		// do some house cleaning
 		jQuery('#'+subID+'__order_list').val(0).trigger('liszt:updated');
@@ -139,11 +139,11 @@ function checkAdminBehaviour(field) {
 		// show in list view
 		if (target[2] == 'list') {
 			if (1 == value) {
-				jQuery.UIkit.notify({message: Joomla.JText._('COM_COMPONENTBUILDER_THE_BSHOW_IN_ALL_LIST_VIEWSB_OPTION_WILL_ADD_THIS_FIELD_TO_ALL_LIST_VIEWS_ADMIN_AMP_LINKED'), timeout: 5000, status: 'primary', pos: 'top-right'});
+				jQuery.UIkit.notify({message: Joomla.Text._('COM_COMPONENTBUILDER_THE_BSHOW_IN_ALL_LIST_VIEWSB_OPTION_WILL_ADD_THIS_FIELD_TO_ALL_LIST_VIEWS_ADMIN_AMP_LINKED'), timeout: 5000, status: 'primary', pos: 'top-right'});
 			} else if (3 == value) {
-				jQuery.UIkit.notify({message: Joomla.JText._('COM_COMPONENTBUILDER_THE_BONLY_IN_ADMIN_LIST_VIEWB_OPTION_WILL_ONLY_ADD_THIS_FIELD_TO_THE_ADMIN_LIST_VIEW_NOT_TO_ANY_LINKED_VIEWS'), timeout: 5000, status: 'primary', pos: 'top-right'});
+				jQuery.UIkit.notify({message: Joomla.Text._('COM_COMPONENTBUILDER_THE_BONLY_IN_ADMIN_LIST_VIEWB_OPTION_WILL_ONLY_ADD_THIS_FIELD_TO_THE_ADMIN_LIST_VIEW_NOT_TO_ANY_LINKED_VIEWS'), timeout: 5000, status: 'primary', pos: 'top-right'});
 			} else if (4 == value) {
-				jQuery.UIkit.notify({message: Joomla.JText._('COM_COMPONENTBUILDER_THE_BONLY_IN_LINKED_LIST_VIEWSB_OPTION_WILL_ONLY_ADD_THIS_FIELD_TO_THE_LINKED_LIST_VIEW_IF_THIS_VIEW_GETS_LINKED_TO_OTHER_VIEW_NOT_TO_THIS_ADMIN_LIST_VIEW'), timeout: 5000, status: 'primary', pos: 'top-right'});
+				jQuery.UIkit.notify({message: Joomla.Text._('COM_COMPONENTBUILDER_THE_BONLY_IN_LINKED_LIST_VIEWSB_OPTION_WILL_ONLY_ADD_THIS_FIELD_TO_THE_LINKED_LIST_VIEW_IF_THIS_VIEW_GETS_LINKED_TO_OTHER_VIEW_NOT_TO_THIS_ADMIN_LIST_VIEW'), timeout: 5000, status: 'primary', pos: 'top-right'});
 			}
 		}
 		// check if the order list already has a value

admin/tmpl/admin_fields_conditions/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/admin_fields_relations/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/admin_view/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/admin_views/default.php

@@ -60,7 +60,7 @@ if ($this->saveOrder)
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/admin_views/modal.php

@@ -72,7 +72,7 @@ $wa->useScript('core')
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/class_extends/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/class_method/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/class_property/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/compiler/default.php

@@ -101,7 +101,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/component_admin_views/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_config/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_custom_admin_menus/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_custom_admin_views/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_dashboard/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_files_folders/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_modules/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_mysql_tweaks/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_placeholders/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_plugins/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_router/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_site_views/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/component_updates/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/custom_admin_view/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/custom_code/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/custom_codes/default.php

@@ -60,7 +60,7 @@ if ($this->saveOrder)
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/custom_codes/modal.php

@@ -72,7 +72,7 @@ $wa->useScript('core')
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/dynamic_get/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show
@@ -643,10 +643,10 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 
 
 <?php $fieldNrs = range(0, 50, 1); ?>
-<?php $fieldNames = array('db' => 'Db', 'view' => 'View'); ?>
+<?php $fieldNames = ['db' => ['function_name' => 'Db', 'key' => 'table_main'], 'view' => ['function_name' => 'View', 'key' => 'table_main_id']]; ?>
 // for the vlaues already set
 document.addEventListener('DOMContentLoaded', function() {
-    <?php foreach($fieldNames as $fieldName => $funcName): ?>
+    <?php foreach($fieldNames as $fieldName => $details): ?>
         <?php foreach($fieldNrs as $fieldNr): ?>
             updateSubItems('<?php echo $fieldName ?>', <?php echo $fieldNr ?>, '_', '_');
         <?php endforeach; ?>
@@ -663,11 +663,15 @@ document.addEventListener('DOMContentLoaded', function() {
     });
 });
 
-<?php foreach($fieldNames as $fieldName => $funcName): ?>
+<?php foreach($fieldNames as $fieldName => $details): ?>
 document.getElementById('adminForm').addEventListener('change', function(e) {
-    if (e.target && e.target.id === 'jform_<?php echo $fieldName ?>_table_main') {
-        let value_<?php echo $fieldName ?> = e.target.options[e.target.selectedIndex].value;
-        get<?php echo $funcName; ?>TableColumns(value_<?php echo $fieldName ?>, 'a', '<?php echo $fieldName ?>', 3, true, '', '');
+    if (e.target && e.target.id === 'jform_<?php echo $fieldName ?>_<?php echo $details['key']; ?>') {
+        <?php if ($fieldName === 'view'): ?>
+            let value_<?php echo $fieldName ?> = e.target.value;
+        <?php else: ?>
+            let value_<?php echo $fieldName ?> = e.target.options[e.target.selectedIndex].value;
+        <?php endif; ?>
+        get<?php echo $details['function_name']; ?>TableColumns(value_<?php echo $fieldName ?>, 'a', '<?php echo $fieldName ?>', 3, true, '', '');
     }
 });
 <?php endforeach; ?>

admin/tmpl/field/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/fields/default.php

@@ -60,7 +60,7 @@ if ($this->saveOrder)
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/fields/modal.php

@@ -72,7 +72,7 @@ $wa->useScript('core')
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/fieldtype/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/get_snippets/default.php

@@ -1,262 +0,0 @@
-<?php
-/**
- * @package    Joomla.Component.Builder
- *
- * @created    30th April, 2015
- * @author     Llewellyn van der Merwe <https://dev.vdm.io>
- * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
- * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\HTML\HTMLHelper as Html;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Router\Route;
-use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use Joomla\CMS\Uri\Uri;
-
-/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->getDocument()->getWebAssetManager();
-$wa->useScript('keepalive')->useScript('form.validate');
-Html::_('bootstrap.tooltip');
-
-// No direct access to this file
-defined('_JEXEC') or die;
-
-?>
-<?php if ($this->canDo->get('get_snippets.access')): ?>
-<script type="text/javascript">
-	Joomla.submitbutton = function(task) {
-		if (task === 'get_snippets.back') {
-			parent.history.back();
-			return false;
-		} else {
-			var form = document.getElementById('adminForm');
-			form.task.value = task;
-			form.submit();
-		}
-	}
-</script>
-
-<form action="<?php echo Route::_('index.php?option=com_componentbuilder'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
-	<input type="hidden" name="task" value="" />
-	<?php echo Html::_('form.token'); ?>
-</form>
-
-<div id="snippets-github" class="bulk-updater-toggler">
-	<br /><br /><br />
-	<center><h1> <?php echo Text::_('COM_COMPONENTBUILDER_GETTING_AVAILABLE_LIBRARIES'); ?> <br /><?php echo Text::_('COM_COMPONENTBUILDER_LOADING'); ?>.<span class="loading-dots">.</span></h1></center>
-</div>
-<div id="libraries-display" style="display: none;">
-	<div id="libraries-grid" class="uk-grid uk-grid-preserve uk-grid-width-small-1-1 uk-grid-width-medium-1-3 uk-grid-width-large-1-4" data-uk-grid="{gutter:10}" data-uk-check-display>
-	</div>
-</div>
-<div class="bulk-updater-toggler uk-hidden">
-	<h1><?php echo Text::_('COM_COMPONENTBUILDER_BULK_TOOLS'); ?></h1>
-</div>
-<div id="snippets-display" style="display: none;">
-	<div class="uk-hidden-small">
-		<nav class="uk-navbar uk-width-1-1">
-			<a href="https://github.com/vdm-io/Joomla-Component-Builder-Snippets" class="uk-navbar-brand uk-hidden-medium" target="_blank"><i class="uk-icon-github"></i> gitHub</a>
-			<ul class="uk-navbar-nav snippets-menu bulk-updater-toggler">
-				<li data-uk-filter="" class="uk-active"><a href=""><i class="uk-icon-asterisk"></i><span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_ALL'); ?></span></a></li>
-				<li data-uk-filter="equal"><a href=""><i class="uk-icon-chain"></i><span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_IN_SYNC'); ?></span></a></li>
-				<li data-uk-filter="behind"><a href=""><i class="uk-icon-chain-broken"></i><span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_OUT_OF_DATE'); ?></span></a></li>
-				<li data-uk-filter="new"><a href=""><i class="uk-icon-coffee"></i><span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_NEW'); ?></span></a></li>
-				<li data-uk-filter="diverged"><a href=""><i class="uk-icon-code-fork"></i><span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_DIVERGED'); ?></span></a></li>
-				<li data-uk-filter="ahead"><a href=""><i class="uk-icon-joomla"></i><span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_AHEAD'); ?></span></a></li>
-				<li data-uk-sort="snippet-name">
-					<a href="">
-						<i class="uk-icon-sort-amount-asc"></i>
-						<span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_NAME_ASC'); ?></span>
-						<span class="uk-visible-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_NAME'); ?></span>
-					</a>
-				</li>
-				<li data-uk-sort="snippet-name:desc">
-					<a href="">
-						<i class="uk-icon-sort-amount-desc"></i>
-						<span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_NAME_DESC'); ?></span>
-						<span class="uk-visible-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_NAME'); ?></span>
-					</a>
-				</li>
-				<li data-uk-sort="snippet-types">
-					<a href="">
-						<i class="uk-icon-sort-amount-asc"></i>
-						<span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_TYPE_ASC'); ?></span>
-						<span class="uk-visible-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_TYPE'); ?></span>
-					</a>
-				</li>
-				<li data-uk-sort="snippet-types:desc">
-					<a href="">
-						<i class="uk-icon-sort-amount-desc"></i>
-						<span class="uk-hidden-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_TYPE_DESC'); ?></span>
-						<span class="uk-visible-medium"> <?php echo Text::_('COM_COMPONENTBUILDER_TYPE'); ?></span>
-					</a>
-				</li>
-			</ul>
-			<div class="uk-navbar-flip">
-				<ul class="uk-navbar-nav">
-					<li class="bulk-updater-toggler">
-						<a class="getreaction" data-type="getLibraries" title="<?php echo Text::_('COM_COMPONENTBUILDER_BACK_TO_LIBRARIES'); ?>">
-							<i class="uk-icon-puzzle-piece"></i>
-							<span class="uk-hidden-medium"><?php echo Text::_('COM_COMPONENTBUILDER_LIBRARIES'); ?></span>
-						</a>
-					</li>
-					<li>
-						<a class="getreaction" data-uk-toggle="{target:'.bulk-updater-toggler', animation:'uk-animation-slide-bottom, uk-animation-slide-bottom'}" data-type="bulk" title="<?php echo Text::_('COM_COMPONENTBUILDER_ACCESS_BULK_TOOLS'); ?>">
-							<i class="uk-icon-cog"></i>
-							<span class="uk-hidden-medium"><?php echo Text::_('COM_COMPONENTBUILDER_BULK'); ?></span>
-						</a>
-					</li>
-				</ul>
-			</div>
-		</nav>
-	</div>
-	<div class="uk-visible-small">
-		<nav class="uk-navbar uk-width-1-1">
-			<ul class="uk-navbar-nav snippets-menu">
-				<li data-uk-filter="" class="uk-active"><a href=""><i class="uk-icon-asterisk"></i></a></li>
-				<li data-uk-filter="equal"><a href=""><i class="uk-icon-chain"></i></a></li>
-				<li data-uk-filter="behind"><a href=""><i class="uk-icon-chain-broken"></i></a></li>
-				<li data-uk-filter="new"><a href=""><i class="uk-icon-coffee"></i></a></li>
-				<li data-uk-filter="diverged"><a href=""><i class="uk-icon-code-fork"></i></a></li>
-				<li data-uk-filter="ahead"><a href=""><i class="uk-icon-joomla"></i></a></li>
-				<li class="bulk-updater-toggler"><a class="getreaction" data-type="getLibraries" title="<?php echo Text::_('COM_COMPONENTBUILDER_BACK_TO_LIBRARIES'); ?>"><i class="uk-icon-puzzle-piece"></i></a></li>
-				<li><a class="getreaction" data-uk-toggle="{target:'.bulk-updater-toggler', animation:'uk-animation-slide-bottom, uk-animation-slide-bottom'}" data-type="bulk" title="<?php echo Text::_('COM_COMPONENTBUILDER_ACCESS_BULK_TOOLS'); ?>"><i class="uk-icon-cog"></i></a></li>
-			</ul>
-		</nav>
-	</div>
-	<div class="bulk-updater-toggler uk-hidden">
-		<br />
-		<div class="uk-grid" data-uk-grid-match="{target:'.uk-panel'}">
-			<div class="uk-width-medium-1-4">
-				<div class="uk-panel uk-panel-box uk-panel-box-primary">
-					<div class="uk-badge uk-panel-badge uk-badge-notification"><a href="#behind-meaning" data-uk-offcanvas class="uk-text-contrast"><i class="uk-icon-info"></i></a></div>
-					<h3 class="uk-panel-title"><i class="uk-icon-chain-broken"></i> <?php echo Text::_('COM_COMPONENTBUILDER_OUT_OF_DATE'); ?></h3>
-					<div id="bulk-notice-behind" class="uk-alert uk-alert-warning" style="display: none;"><?php echo Text::_('COM_COMPONENTBUILDER_THERE_ARE_NO_OUT_OF_DATE_SNIPPETS_AT_THIS_TIME'); ?></div>
-					<button id="bulk-button-behind" class="getreaction uk-button uk-button-primary uk-width-1-1" data-status="behind" data-type="all" title="<?php echo Text::_('COM_COMPONENTBUILDER_BULK_UPDATE_ALL_OUT_DATED_SNIPPETS'); ?>">
-						<i class="uk-icon-cloud-download"></i>
-						<?php echo Text::_('COM_COMPONENTBUILDER_UPDATE_ALL_OUT_DATED_SNIPPETS'); ?>
-					</button>
-				</div>
-			</div>
-			<div class="uk-width-medium-1-4">
-				<div class="uk-panel uk-panel-box uk-panel-box-primary">
-					<div class="uk-badge uk-panel-badge uk-badge-notification"><a href="#new-meaning" data-uk-offcanvas class="uk-text-contrast"><i class="uk-icon-info"></i></a></div>
-					<h3 class="uk-panel-title"><i class="uk-icon-coffee"></i> <?php echo Text::_('COM_COMPONENTBUILDER_NEW'); ?></h3>
-					<div id="bulk-notice-new" class="uk-alert uk-alert-warning" style="display: none;"><?php echo Text::_('COM_COMPONENTBUILDER_THERE_ARE_NO_NEW_SNIPPETS_AT_THIS_TIME'); ?></div>
-					<button id="bulk-button-new" class="getreaction uk-button uk-button-primary uk-width-1-1" data-status="new" data-type="all" title="<?php echo Text::_('COM_COMPONENTBUILDER_BULK_GET_ALL_NEW_SNIPPETS'); ?>">
-						<i class="uk-icon-cloud-download"></i>
-						<?php echo Text::_('COM_COMPONENTBUILDER_GET_ALL_NEW_SNIPPETS'); ?>
-					</button>
-				</div>
-			</div>
-			<div class="uk-width-medium-1-4">
-				<div class="uk-panel uk-panel-box uk-panel-box-primary">
-					<div class="uk-badge uk-panel-badge uk-badge-notification"><a href="#diverged-meaning" data-uk-offcanvas class="uk-text-contrast"><i class="uk-icon-info"></i></a></div>
-					<h3 class="uk-panel-title"><i class="uk-icon-code-fork"></i> <?php echo Text::_('COM_COMPONENTBUILDER_DIVERGED'); ?></h3>
-					<div id="bulk-notice-diverged" class="uk-alert uk-alert-warning" style="display: none;"><?php echo Text::_('COM_COMPONENTBUILDER_THERE_ARE_NO_DIVERGED_SNIPPETS_AT_THIS_TIME'); ?></div>
-					<button id="bulk-button-diverged" class="getreaction uk-button uk-button-primary uk-width-1-1" data-status="diverged" data-type="all" title="<?php echo Text::_('COM_COMPONENTBUILDER_BULK_UPDATE_ALL_DIVERGED_SNIPPETS'); ?>">
-						<i class="uk-icon-cloud-download"></i>
-						<?php echo Text::_('COM_COMPONENTBUILDER_UPDATE_ALL_DIVERGED_SNIPPETS'); ?>
-					</button>
-				</div>
-			</div>
-			<div class="uk-width-medium-1-4">
-				<div class="uk-panel uk-panel-box uk-panel-box-primary">
-					<div class="uk-badge uk-panel-badge uk-badge-notification"><a href="#ahead-meaning" data-uk-offcanvas class="uk-text-contrast"><i class="uk-icon-info"></i></a></div>
-					<h3 class="uk-panel-title"><i class="uk-icon-joomla"></i> <?php echo Text::_('COM_COMPONENTBUILDER_AHEAD'); ?></h3>
-					<div id="bulk-notice-ahead" class="uk-alert uk-alert-warning" style="display: none;"><?php echo Text::_('COM_COMPONENTBUILDER_THERE_ARE_NO_AHEAD_SNIPPETS_AT_THIS_TIME'); ?></div>
-					<button id="bulk-button-ahead" class="getreaction uk-button uk-button-primary uk-width-1-1" data-status="ahead" data-type="all" title="<?php echo Text::_('COM_COMPONENTBUILDER_BULK_UPDATE_ALL_AHEAD_SNIPPETS'); ?>">
-						<i class="uk-icon-cloud-download"></i>
-						<?php echo Text::_('COM_COMPONENTBUILDER_REVERT_ALL_AHEAD_SNIPPETS'); ?>
-					</button>
-				</div>
-			</div>
-		</div>
-		<br />
-		<div id="bulk-notice-all" class="uk-alert uk-alert-warning" style="display: none;"><?php echo Text::_('COM_COMPONENTBUILDER_THERE_ARE_NO_SNIPPETS_TO_UPDATE_AT_THIS_TIME'); ?></div>
-		<button id="bulk-button-all" class="getreaction uk-button uk-button-success uk-width-1-1" data-status="all" data-type="all" title="<?php echo Text::_('COM_COMPONENTBUILDER_BULK_UPDATE_ALL_AVAILABLE_SNIPPETS'); ?>">
-			<i class="uk-icon-cloud-download"></i>
-			<?php echo Text::_('COM_COMPONENTBUILDER_JUST_GET_ALL_SNIPPETS'); ?>
-		</button>
-	</div>
-	<br />
-	<div id="snippets-grid" class="bulk-updater-toggler uk-grid uk-grid-preserve uk-grid-width-small-1-1 uk-grid-width-medium-1-3 uk-grid-width-large-1-4" data-uk-grid="{gutter:10, controls: '.snippets-menu'}" data-uk-check-display>
-	</div>
-</div>
-<div id="new-meaning" class="uk-offcanvas">
-	<div class="uk-offcanvas-bar"><br /><br /><br /><div class="uk-panel">
-		<h3><?php echo Text::_('COM_COMPONENTBUILDER_NEW'); ?></h3>
-		<p><?php echo Text::_('COM_COMPONENTBUILDER_NEW_MEANS_THAT_WE_COULD_NOT_FIND_A_LOCAL_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_AND_SO_HAVE_MARKED_THIS_SNIPPET_AS_NEW'); ?></p>
-		<p><?php echo Text::_('COM_COMPONENTBUILDER_THE_SEARCH_FOR_THE_SNIPPETS_ARE_CASE_SENSITIVE_SO_IF_YOU_CHANGED_THE_LOCAL_BNAMESB_OF_EITHER_OR_THE_BSNIPPET_LIBRARY_OR_SNIPPET_TYPESB_IN_ANY_SMALL_WAY_THE_SYSTEM_WILL_NOT_BE_ABLE_TO_CONNECT_YOUR_LOCAL_SNIPPETS_WITH_THOSE_IN_THE_COMMUNITY_REPOSITORY_SO_WE_STRONGLY_ADVICE_TO_BKEEP_TO_THE_COMMUNITY_NAMINGB_TO_AVOID_MISMATCHING_THAT_WILL_IN_TURN_CAUSE_DUPLICATION_SO_IF_YOU_CHANGED_ANY_NAMES_JUST_CHANGE_THEM_BACK_AND_ALL_WILL_AGAIN_WORK_AS_EXPECTED'); ?></p>
-	</div></div>
-</div>
-<div id="equal-meaning" class="uk-offcanvas">
-	<div class="uk-offcanvas-bar"><br /><br /><br /><div class="uk-panel">
-		<h3><?php echo Text::_('COM_COMPONENTBUILDER_EQUAL'); ?></h3>
-		<p><?php echo Text::_('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'); ?></p>
-		<p><?php echo Text::_('COM_COMPONENTBUILDER_WE_DID_NOT_CHECK_THE_SNIPPET_IT_SELF_TO_SEE_IF_IT_CHANGED_WE_ONLY_WORK_ON_DATES'); ?></p>
-	</div></div>
-</div>
-<div id="ahead-meaning" class="uk-offcanvas">
-	<div class="uk-offcanvas-bar"><br /><br /><br /><div class="uk-panel">
-		<h3><?php echo Text::_('COM_COMPONENTBUILDER_AHEAD'); ?></h3>
-		<p><?php echo Text::_('COM_COMPONENTBUILDER_AHEAD_MEANS_YOUR_BLOCAL_SNIPPETB_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_A_BNEWER_MODIFIED_DATEB_THEN_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE'); ?></p>
-		<p><?php echo Text::_('COM_COMPONENTBUILDER_WE_DID_NOT_CHECK_THE_SNIPPET_IT_SELF_TO_SEE_IF_IT_CHANGED_WE_ONLY_WORK_ON_DATES'); ?></p>
-	</div></div>
-</div>
-<div id="behind-meaning" class="uk-offcanvas">
-	<div class="uk-offcanvas-bar"><br /><br /><br /><div class="uk-panel">
-		<h3><?php echo Text::_('COM_COMPONENTBUILDER_BEHIND'); ?></h3>
-		<p><?php echo Text::_('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'); ?></p>
-		<p><?php echo Text::_('COM_COMPONENTBUILDER_WE_DID_NOT_CHECK_THE_SNIPPET_IT_SELF_TO_SEE_IF_IT_CHANGED_WE_ONLY_WORK_ON_DATES'); ?></p>
-	</div></div>
-</div>
-<div id="diverged-meaning" class="uk-offcanvas">
-	<div class="uk-offcanvas-bar"><br /><br /><br /><div class="uk-panel">
-		<h3><?php echo Text::_('COM_COMPONENTBUILDER_DIVERGED'); ?></h3>
-		<p><?php echo Text::_('COM_COMPONENTBUILDER_DIVERGED_MEANS_YOUR_BLOCAL_SNIPPETB_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_HAS_A_BDIVERGEDB_FROM_THE_COMMUNITY_SNIPPET_WITH_THE_SAME_NAME_LIBRARY_AND_TYPE_IN_THAT_IT_DOES_NOT_HAVE_THE_SAME_BCREATIONB_OR_BMODIFIED_DATEB'); ?></p>
-		<p><?php echo Text::_('COM_COMPONENTBUILDER_WE_DID_NOT_CHECK_THE_SNIPPET_IT_SELF_TO_SEE_IF_IT_CHANGED_WE_ONLY_WORK_ON_DATES'); ?></p>
-	</div></div>
-</div>
-<div id="loading" style="display: none;"><br /><h3><?php echo Text::_('COM_COMPONENTBUILDER_PLEASE_WAIT_LOADING'); ?>.<span class="loading-dots">.</span></h3></div>
-<script type="text/javascript">
-
-document.addEventListener("DOMContentLoaded", function() {
-	document.querySelectorAll(".loading-dots").forEach(function(loading_dots) {
-		let x = 0;
-		let intervalId = setInterval(function() {
-			if (!loading_dots.classList.contains("loading-dots")) {
-				clearInterval(intervalId);
-				return;
-			}
-			let dots = ".".repeat(x % 8);
-			loading_dots.textContent = dots;
-			x++;
-		}, 500);
-	});
-});
-
-<?php
-	$app = Factory::getApplication();
-?>
-function JRouter(link) {
-<?php
-	if ($app->isClient('site'))
-	{
-		echo 'var url = "'. Uri::root() . '";';
-	}
-	else
-	{
-		echo 'var url = "";';
-	}
-?>
-	return url+link;
-}
-</script>
-<?php else: ?>
-		<h1><?php echo Text::_('COM_COMPONENTBUILDER_NO_ACCESS_GRANTED'); ?></h1>
-<?php endif; ?>

admin/tmpl/help_document/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/import_joomla_componentsimport/default.php

@@ -150,7 +150,7 @@ jQuery(document).ready(function($) {
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/initialization_selection/default.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('keepalive')->useScript('form.validate');
+Html::_('bootstrap.tooltip');
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+?>
+<?php if ($this->canDo->get('initialization_selection.access')): ?>
+<script type="text/javascript">
+	Joomla.submitbutton = function(task) {
+		if (task === 'initialization_selection.back') {
+			parent.history.back();
+			return false;
+		} else {
+			var form = document.getElementById('adminForm');
+			form.task.value = task;
+			form.submit();
+		}
+	}
+</script>
+<?php $urlId = (isset($this->item->id)) ? '&id='. (int) $this->item->id : ''; ?>
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=initialization_selection' . $urlId); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+
+<?php echo $this->loadTemplate('selectionheader'); ?>
+<?php echo $this->loadTemplate('selectionarea'); ?>
+<input type="hidden" name="task" value="" />
+<?php echo Html::_('form.token'); ?>
+</form>
+<?php else: ?>
+		<h1><?php echo Text::_('COM_COMPONENTBUILDER_NO_ACCESS_GRANTED'); ?></h1>
+<?php endif; ?>

admin/tmpl/initialization_selection/default_selectionarea.php

@@ -0,0 +1,118 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use VDM\Joomla\Utilities\StringHelper;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Session\Session;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+$area = $this->item['area_class'] ?? 'error';
+$area_name = $this->item['area_name'] ?? 'error';
+$headers = $this->item['headers'] ?? [];
+$table_id = StringHelper::random(10);
+$repo_items = $this->item['repos'] ?? [];
+$repos = [];
+foreach ($repo_items as $repo)
+{
+	if (!empty($repo->base) && !empty($repo->path))
+	{
+		$repos[] = LayoutHelper::render('reposelectioncardbody', ['repo' => $repo, 'area' => $area, 'name' => $area_name]);
+	}
+}
+// set the base URL
+$url_base = Uri::base() . 'index.php?option=com_componentbuilder';
+
+?>
+<?php if ($area !== null && !empty($repos) && !empty($headers)): ?>
+<script type="text/javascript">
+
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
+	jQuery.extend( true, jQuery.fn.dataTable.defaults, {
+		"searching": false
+	});
+</script>
+<div id="select-repo-area">
+	<p><?php echo Text::_('COM_COMPONENTBUILDER_SELECT_A_REPOSITORY_TO_FETCH_ITEMS_FOR_INITIALIZATION'); ?>...</p>
+	<div class="uk-child-width-1-2@s uk-child-width-1-3@m" uk-grid>
+	<?php foreach ($repos as $repo): ?>
+		<?php echo $repo; ?>
+	<?php endforeach; ?>
+	</div>
+</div>
+<div id="select-powers-area" style="display: none">
+	<p><?php echo Text::sprintf('COM_COMPONENTBUILDER_SELECT_THE_NEW_S_ITEMS_TO_INITIALIZE', $area_name); ?>...</p>
+	<?php echo LayoutHelper::render('powerselectiontable', ['area' => $area, 'headers' => $headers, 'id' => $table_id]); ?>
+	<div class="subhead">
+		<div class="btn-toolbar d-flex">
+			<joomla-toolbar-button>
+				<button type="button" id="init-selected-powers" class="btn btn-primary" disable><?php echo Text::sprintf('COM_COMPONENTBUILDER_INITIALIZE_SELECTED_S_ITEMS', $area_name); ?></button>
+			</joomla-toolbar-button>
+			<joomla-toolbar-button>
+				<button type="button" id="back-to-select-repo" class="btn btn-info"><?php echo Text::_('COM_COMPONENTBUILDER_BACK_TO_REPOSITORY_SELECTION'); ?></button>
+			</joomla-toolbar-button>
+		</div>
+	</div>
+	<p><?php echo Text::sprintf('COM_COMPONENTBUILDER_ITEMS_SHOWN_IN_GREY_ARE_ALREADY_IN_YOUR_LOCAL_JCB_SYSTEM_AND_CANNOT_BE_INITIALIZED_AGAIN_USE_THE_RESET_OPTION_TO_REPLACE_THEM_OR_THIS_INIT_OPTION_TO_ONLY_PULL_IN_NEW_S_ITEMS', $area_name); ?></p>
+</div>
+<script type="text/javascript">
+// the search Ajax URLs
+const UrlAjax = '<?php echo $url_base; ?>&format=json&raw=true&<?php echo Session::getFormToken(); ?>=1&task=ajax.';
+// fix the night mode scheme
+document.addEventListener("DOMContentLoaded", () => {
+	const html = document.documentElement;
+	const colorScheme = html.getAttribute('data-color-scheme');
+	if (colorScheme === 'dark' || colorScheme === 'light') {
+		// Ensure only one scheme class is active
+		html.classList.remove('light', 'dark');
+		html.classList.add(colorScheme);
+		// Update repo selection cards based on color scheme
+		document.querySelectorAll('.repo-selection-card').forEach(card => {
+			card.classList.remove('uk-light', 'uk-dark', 'uk-background-secondary', 'uk-background-muted');
+			if (colorScheme === 'dark') {
+				card.classList.add('uk-light', 'uk-background-secondary');
+			} else {
+				card.classList.add('uk-dark', 'uk-background-muted');
+			}
+		});
+	}
+});
+</script>
+<?php else: ?>
+	<div class="uk-alert-primary" uk-alert>
+		<?php echo Text::_('COM_COMPONENTBUILDER_NO_ACTIVE_REPOSITORIES_FOUND_FOR_THIS_AREA_YOU_CAN_ADD_REPOSITORIES_IN_THE_REPOSITORIES_SECTION_OF_JCB'); ?>
+	</div>
+<?php endif; ?>

admin/tmpl/initialization_selection/default_selectionheader.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+$headers = [
+	'AdminView' => 'COM_COMPONENTBUILDER_INITIALIZE_ADMIN_VIEWS',
+	'Component' => 'COM_COMPONENTBUILDER_INITIALIZE_COMPONENTS',
+	'CustomAdminView' => 'COM_COMPONENTBUILDER_INITIALIZE_CUSTOM_ADMIN_VIEWS',
+	'CustomCode' => 'COM_COMPONENTBUILDER_INITIALIZE_CUSTOM_CODES',
+	'DynamicGet' => 'COM_COMPONENTBUILDER_INITIALIZE_DYNAMIC_GETS',
+	'Field' => 'COM_COMPONENTBUILDER_INITIALIZE_FIELDS',
+	'Joomla.Fieldtype' => 'COM_COMPONENTBUILDER_INITIALIZE_FIELD_TYPES',
+	'Joomla.Power' => 'COM_COMPONENTBUILDER_INITIALIZE_JOOMLA_POWERS',
+	'Layout' => 'COM_COMPONENTBUILDER_INITIALIZE_LAYOUTS',
+	'Library' => 'COM_COMPONENTBUILDER_INITIALIZE_LIBRARIES',
+	'Module' => 'COM_COMPONENTBUILDER_INITIALIZE_MODULES',
+	'Power' => 'COM_COMPONENTBUILDER_INITIALIZE_POWERS',
+	'Plugin' => 'COM_COMPONENTBUILDER_INITIALIZE_PLUGINS',
+	'SiteView' => 'COM_COMPONENTBUILDER_INITIALIZE_SITE_VIEWS',
+	'Snippet' => 'COM_COMPONENTBUILDER_INITIALIZE_SNIPPETS',
+	'Template' => 'COM_COMPONENTBUILDER_INITIALIZE_TEMPLATES'
+];
+
+// Fetch and translate header if area is defined and mapped
+$area = $this->item['area_class'] ?? null;
+$header = $area && isset($headers[$area]) ? $headers[$area] : 'COM_COMPONENTBUILDER_SELECTION_FAILED_PLEASE_TRY_AGAIN';
+
+?>
+<h1><?php echo Text::_($header); ?></h1>

admin/tmpl/joomla_component/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/joomla_components/default.php

@@ -60,7 +60,7 @@ if ($this->saveOrder)
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/joomla_components/modal.php

@@ -72,7 +72,7 @@ $wa->useScript('core')
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/joomla_module/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/joomla_module_files_folders_urls/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/joomla_module_updates/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/joomla_modules/default.php

@@ -60,7 +60,7 @@ if ($this->saveOrder)
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/joomla_modules/modal.php

@@ -72,7 +72,7 @@ $wa->useScript('core')
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/joomla_plugin/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/joomla_plugin_files_folders_urls/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/joomla_plugin_group/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/joomla_plugin_updates/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/joomla_plugins/default.php

@@ -60,7 +60,7 @@ if ($this->saveOrder)
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/joomla_plugins/modal.php

@@ -72,7 +72,7 @@ $wa->useScript('core')
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/joomla_power/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/language/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/language_translation/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/languages/default.php

@@ -60,7 +60,7 @@ if ($this->saveOrder)
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/languages/modal.php

@@ -72,7 +72,7 @@ $wa->useScript('core')
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/layout/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/library/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/library/modalreturn.php

@@ -17,7 +17,7 @@ defined('_JEXEC') or die;
 /** @var \VDM\Component\Componentbuilder\Administrator\View\Library\HtmlView $this */
 
 $icon = 'icon-check';
-$title_key = $this->item->id ?? '';
+$title_key = $this->item->guid ?? '';
 $title_column = $this->item->name ?? '';
 $data = [
 	'contentType' => 'com_componentbuilder.library',

admin/tmpl/library_config/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/library_files_folders_urls/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/placeholder/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/power/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/powers/default.php

@@ -60,7 +60,7 @@ if ($this->saveOrder)
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/powers/modal.php

@@ -72,7 +72,7 @@ $wa->useScript('core')
 	loadingDiv.id = 'loading';
 
 	// Set CSS properties individually
-	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat";
 	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
 	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
 	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";

admin/tmpl/repository/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/server/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/site_view/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/snippet_type/default.php

@@ -33,7 +33,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/template/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show

admin/tmpl/validation_rule/default.php

@@ -34,7 +34,7 @@ $tmpl    = $tmpl ? '&tmpl=' . $tmpl : '';
 	var outerDiv = document.querySelector('body');
 	var loadingDiv = document.createElement('div');
 	loadingDiv.id = 'loading';
-	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
+	loadingDiv.style.cssText = "background: rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/ajax.gif') 50% 35% no-repeat; top: " + (outerDiv.getBoundingClientRect().top + window.pageYOffset) + "px; left: " + (outerDiv.getBoundingClientRect().left + window.pageXOffset) + "px; width: " + outerDiv.offsetWidth + "px; height: " + outerDiv.offsetHeight + "px; position: fixed; opacity: 0.80; -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80); filter: alpha(opacity=80); display: none;";
 	outerDiv.appendChild(loadingDiv);
 	loadingDiv.style.display = 'block';
 	// when page is ready remove and show