Add getFieldsetXML and getFieldXMLString method to build fields in compiler gh-378. Refactoring the compiler to use camelcase for view code names.

README.md

@@ -10,7 +10,7 @@ This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder
 
 The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
-Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
+Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
 You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.7) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 21st November, 2020
++ *Last Build*: 24th November, 2020
 + *Version*: 2.11.7
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **284083**
++ *Line count*: **283833**
 + *Field count*: **1537**
 + *File count*: **1799**
 + *Folder count*: **304**

admin/README.txt

@@ -10,7 +10,7 @@ This is a [Joomla 3.x](https://extensions.joomla.org/extension/component-builder
 
 The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
-Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
+Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
 You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.11.7) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 21st November, 2020
++ *Last Build*: 24th November, 2020
 + *Version*: 2.11.7
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **284083**
++ *Line count*: **283833**
 + *Field count*: **1537**
 + *File count*: **1799**
 + *Folder count*: **304**

admin/compiler/joomla_3/JViewLegacy_list.php

@@ -39,7 +39,7 @@ class ###Component###View###Views### extends JViewLegacy
 		$this->pagination = $this->get('Pagination');
 		$this->state = $this->get('State');
 		$this->user = JFactory::getUser();###ADMIN_DIPLAY_METHOD###
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions

admin/controllers/joomla_components.php

@@ -391,7 +391,7 @@ class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 						$subject = JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY');
 						// email the message
 						componentbuilderEmail::send($email, $subject, componentbuilderEmail::setTableBody($message, $subject), $plainText, 1);
-						$backupNotice[] = JText::_('COM_COMPONENTBUILDER_EMAIL_WITH_THE_NEW_KEY_WAS_SEND');
+						$backupNotice[] = JText::_('COM_COMPONENTBUILDER_EMAIL_WITH_THE_NEW_KEY_WAS_SENT');
 					}
 					else
 					{

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

@@ -4805,7 +4805,7 @@ COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC="Allows users in this group to edit vers
 COM_COMPONENTBUILDER_EDIT_VIEW="Edit View"
 COM_COMPONENTBUILDER_EMAIL="Email"
 COM_COMPONENTBUILDER_EMAIL_S="Email %s"
-COM_COMPONENTBUILDER_EMAIL_WITH_THE_NEW_KEY_WAS_SEND="Email with the new key was send"
+COM_COMPONENTBUILDER_EMAIL_WITH_THE_NEW_KEY_WAS_SENT="Email with the new key was sent"
 COM_COMPONENTBUILDER_EMCOMPANYEM_BSB="<em>Company:</em> <b>%s</b>"
 COM_COMPONENTBUILDER_EMCOPYRIGHTEM_BSB="<em>Copyright:</em> <b>%s</b>"
 COM_COMPONENTBUILDER_EMEMAILEM_BSB="<em>Email:</em> <b>%s</b>"

admin/views/admin_views/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=admin_views&task=admin_view.
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('admin_view.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/admin_views/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>
@@ -30,17 +30,17 @@ defined('_JEXEC') or die('Restricted access');
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEWS_NAMES', 'a.name_single', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEWS_NAMES', 'a.name_single', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEWS_DETAILS', 'a.short_description', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEWS_DETAILS', 'a.short_description', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
-			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_STATUS', 'a.published', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_STATUS', 'a.published', $this->listDirn, $this->listOrder); ?>
 		</th>
 	<?php else: ?>
 		<th width="10" class="nowrap center" >
@@ -48,6 +48,6 @@ defined('_JEXEC') or die('Restricted access');
 		</th>
 	<?php endif; ?>
 	<th width="5" class="nowrap center hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_ADMIN_VIEW_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
 	</th>
 </tr>

admin/views/admin_views/view.html.php

@@ -34,10 +34,14 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 		$this->pagination = $this->get('Pagination');
 		$this->state = $this->get('State');
 		$this->user = JFactory::getUser();
+		// Load the filter form from xml.
+		$this->filterForm = $this->get('FilterForm');
+		// Load the active filters.
+		$this->activeFilters = $this->get('ActiveFilters');
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -190,156 +194,6 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 				'batch[access]',
 				JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text')
 			);
-		}
-
-		// Set Add Fadein Selection
-		$this->add_fadeinOptions = $this->getTheAdd_fadeinSelections();
-		// We do some sanitation for Add Fadein filter
-		if (ComponentbuilderHelper::checkArray($this->add_fadeinOptions) &&
-			isset($this->add_fadeinOptions[0]->value) &&
-			!ComponentbuilderHelper::checkString($this->add_fadeinOptions[0]->value))
-		{
-			unset($this->add_fadeinOptions[0]);
-		}
-		// Only load Add Fadein filter if it has values
-		if (ComponentbuilderHelper::checkArray($this->add_fadeinOptions))
-		{
-			// Add Fadein Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL').' -',
-				'filter_add_fadein',
-				JHtml::_('select.options', $this->add_fadeinOptions, 'value', 'text', $this->state->get('filter.add_fadein'))
-			);
-
-			if ($this->canBatch && $this->canCreate && $this->canEdit)
-			{
-				// Add Fadein Batch Selection
-				JHtmlBatch_::addListSelection(
-					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_FADEIN_LABEL').' -',
-					'batch[add_fadein]',
-					JHtml::_('select.options', $this->add_fadeinOptions, 'value', 'text')
-				);
-			}
-		}
-
-		// Set Type Selection
-		$this->typeOptions = $this->getTheTypeSelections();
-		// We do some sanitation for Type filter
-		if (ComponentbuilderHelper::checkArray($this->typeOptions) &&
-			isset($this->typeOptions[0]->value) &&
-			!ComponentbuilderHelper::checkString($this->typeOptions[0]->value))
-		{
-			unset($this->typeOptions[0]);
-		}
-		// Only load Type filter if it has values
-		if (ComponentbuilderHelper::checkArray($this->typeOptions))
-		{
-			// Type Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
-				'filter_type',
-				JHtml::_('select.options', $this->typeOptions, 'value', 'text', $this->state->get('filter.type'))
-			);
-
-			if ($this->canBatch && $this->canCreate && $this->canEdit)
-			{
-				// Type Batch Selection
-				JHtmlBatch_::addListSelection(
-					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL').' -',
-					'batch[type]',
-					JHtml::_('select.options', $this->typeOptions, 'value', 'text')
-				);
-			}
-		}
-
-		// Set Add Custom Button Selection
-		$this->add_custom_buttonOptions = $this->getTheAdd_custom_buttonSelections();
-		// We do some sanitation for Add Custom Button filter
-		if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions) &&
-			isset($this->add_custom_buttonOptions[0]->value) &&
-			!ComponentbuilderHelper::checkString($this->add_custom_buttonOptions[0]->value))
-		{
-			unset($this->add_custom_buttonOptions[0]);
-		}
-		// Only load Add Custom Button filter if it has values
-		if (ComponentbuilderHelper::checkArray($this->add_custom_buttonOptions))
-		{
-			// Add Custom Button Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
-				'filter_add_custom_button',
-				JHtml::_('select.options', $this->add_custom_buttonOptions, 'value', 'text', $this->state->get('filter.add_custom_button'))
-			);
-
-			if ($this->canBatch && $this->canCreate && $this->canEdit)
-			{
-				// Add Custom Button Batch Selection
-				JHtmlBatch_::addListSelection(
-					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_BUTTON_LABEL').' -',
-					'batch[add_custom_button]',
-					JHtml::_('select.options', $this->add_custom_buttonOptions, 'value', 'text')
-				);
-			}
-		}
-
-		// Set Add Php Ajax Selection
-		$this->add_php_ajaxOptions = $this->getTheAdd_php_ajaxSelections();
-		// We do some sanitation for Add Php Ajax filter
-		if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions) &&
-			isset($this->add_php_ajaxOptions[0]->value) &&
-			!ComponentbuilderHelper::checkString($this->add_php_ajaxOptions[0]->value))
-		{
-			unset($this->add_php_ajaxOptions[0]);
-		}
-		// Only load Add Php Ajax filter if it has values
-		if (ComponentbuilderHelper::checkArray($this->add_php_ajaxOptions))
-		{
-			// Add Php Ajax Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -',
-				'filter_add_php_ajax',
-				JHtml::_('select.options', $this->add_php_ajaxOptions, 'value', 'text', $this->state->get('filter.add_php_ajax'))
-			);
-
-			if ($this->canBatch && $this->canCreate && $this->canEdit)
-			{
-				// Add Php Ajax Batch Selection
-				JHtmlBatch_::addListSelection(
-					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL').' -',
-					'batch[add_php_ajax]',
-					JHtml::_('select.options', $this->add_php_ajaxOptions, 'value', 'text')
-				);
-			}
-		}
-
-		// Set Add Custom Import Selection
-		$this->add_custom_importOptions = $this->getTheAdd_custom_importSelections();
-		// We do some sanitation for Add Custom Import filter
-		if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions) &&
-			isset($this->add_custom_importOptions[0]->value) &&
-			!ComponentbuilderHelper::checkString($this->add_custom_importOptions[0]->value))
-		{
-			unset($this->add_custom_importOptions[0]);
-		}
-		// Only load Add Custom Import filter if it has values
-		if (ComponentbuilderHelper::checkArray($this->add_custom_importOptions))
-		{
-			// Add Custom Import Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
-				'filter_add_custom_import',
-				JHtml::_('select.options', $this->add_custom_importOptions, 'value', 'text', $this->state->get('filter.add_custom_import'))
-			);
-
-			if ($this->canBatch && $this->canCreate && $this->canEdit)
-			{
-				// Add Custom Import Batch Selection
-				JHtmlBatch_::addListSelection(
-					'- Keep Original '.JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL').' -',
-					'batch[add_custom_import]',
-					JHtml::_('select.options', $this->add_custom_importOptions, 'value', 'text')
-				);
-			}
 		}
 	}
 
@@ -384,7 +238,7 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.system_name' => JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_SYSTEM_NAME_LABEL'),
 			'a.name_single' => JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_SINGLE_LABEL'),

admin/views/admins_custom_tabs/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/admins_custom_tabs/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=admins_custom_tabs&task=admi
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('admin_custom_tabs.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/admins_custom_tabs/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/admins_custom_tabs/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewAdmins_custom_tabs extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewAdmins_custom_tabs extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/admins_fields/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/admins_fields/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('admin_fields.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/admins_fields/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/admins_fields/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/admins_fields_conditions/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/admins_fields_conditions/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('admin_fields_conditions.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/admins_fields_conditions/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/admins_fields_conditions/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/admins_fields_relations/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/admins_fields_relations/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_relations&task
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('admin_fields_relations.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/admins_fields_relations/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/admins_fields_relations/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewAdmins_fields_relations extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewAdmins_fields_relations extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/class_extendings/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/class_extendings/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=class_extendings&task=class_
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('class_extends.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/class_extendings/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/class_extendings/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewClass_extendings extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -249,7 +249,7 @@ class ComponentbuilderViewClass_extendings extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.name' => JText::_('COM_COMPONENTBUILDER_CLASS_EXTENDS_NAME_LABEL'),
 			'a.extension_type' => JText::_('COM_COMPONENTBUILDER_CLASS_EXTENDS_EXTENSION_TYPE_LABEL'),

admin/views/class_methods/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/class_methods/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('class_method.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/class_methods/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/class_methods/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewClass_methods extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -289,7 +289,7 @@ class ComponentbuilderViewClass_methods extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.name' => JText::_('COM_COMPONENTBUILDER_CLASS_METHOD_NAME_LABEL'),
 			'a.visibility' => JText::_('COM_COMPONENTBUILDER_CLASS_METHOD_VISIBILITY_LABEL'),

admin/views/class_properties/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/class_properties/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=class_properties&task=class_
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('class_property.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/class_properties/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/class_properties/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewClass_properties extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -289,7 +289,7 @@ class ComponentbuilderViewClass_properties extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.name' => JText::_('COM_COMPONENTBUILDER_CLASS_PROPERTY_NAME_LABEL'),
 			'a.visibility' => JText::_('COM_COMPONENTBUILDER_CLASS_PROPERTY_VISIBILITY_LABEL'),

admin/views/components_admin_views/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_admin_views/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_admin_views&task=
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_admin_views.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_admin_views/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_admin_views/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_config/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_config/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_config&task=compo
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_config.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_config/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_config/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_config extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_config extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_custom_admin_menus/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_custom_admin_menus/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_custom_admin_menu
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_custom_admin_menus.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_custom_admin_menus/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_custom_admin_menus/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_custom_admin_views/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_custom_admin_views/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_custom_admin_view
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_custom_admin_views.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_custom_admin_views/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_custom_admin_views/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_dashboard/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_dashboard/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_dashboard&task=co
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_dashboard.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_dashboard/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_dashboard/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_files_folders/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_files_folders/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_files_folders&tas
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_files_folders.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_files_folders/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_files_folders/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_modules/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_modules/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_modules&task=comp
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_modules.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_modules/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_modules/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_modules extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_modules extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_mysql_tweaks/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_mysql_tweaks/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_mysql_tweaks&task
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_mysql_tweaks.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_mysql_tweaks/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_mysql_tweaks/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_placeholders/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_placeholders/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_placeholders&task
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_placeholders.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_placeholders/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_placeholders/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_placeholders extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_placeholders extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_plugins/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_plugins/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_plugins&task=comp
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_plugins.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_plugins/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_plugins/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_plugins extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_plugins extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_site_views/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_site_views/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_site_views&task=c
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_site_views.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_site_views/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_site_views/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/components_updates/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/components_updates/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_updates&task=comp
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('component_updates.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/components_updates/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/components_updates/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'asc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -219,7 +219,7 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);

admin/views/custom_admin_views/tmpl/default.php

@@ -82,4 +82,5 @@ if ($this->saveOrder)
 <?php endif; ?>
 <input type="hidden" name="task" value="" />
 <?php echo JHtml::_('form.token'); ?>
-</form>
+</form>
+<script type="text/javascript"></script>

admin/views/custom_admin_views/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=custom_admin_views&task=cust
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('core.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/custom_admin_views/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/custom_admin_views/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -324,7 +324,7 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.system_name' => JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SYSTEM_NAME_LABEL'),
 			'a.name' => JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME_LABEL'),

admin/views/custom_codes/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('custom_code.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/custom_codes/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/custom_codes/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -354,7 +354,7 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'g.system_name' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_COMPONENT_LABEL'),
 			'a.path' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODE_PATH_LABEL'),

admin/views/dynamic_gets/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_ge
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('dynamic_get.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/dynamic_gets/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>

admin/views/dynamic_gets/view.html.php

@@ -37,7 +37,7 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
-		$this->saveOrder = $this->listOrder == 'ordering';
+		$this->saveOrder = $this->listOrder == 'a.ordering';
 		// set the return here value
 		$this->return_here = urlencode(base64_encode((string) JUri::getInstance()));
 		// get global action permissions
@@ -294,7 +294,7 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
 	protected function getSortFields()
 	{
 		return array(
-			'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+			'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
 			'a.published' => JText::_('JSTATUS'),
 			'a.name' => JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_LABEL'),
 			'a.main_source' => JText::_('COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL'),

admin/views/fields/tmpl/default_body.php

@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
 		<td class="order nowrap center hidden-phone">
 		<?php if ($canDo->get('field.edit.state')): ?>
 			<?php
-				if ($this->saveOrder)
+				$iconClass = '';
-				{
+				if (!$this->saveOrder)
-					$iconClass = ' inactive';
-				}
-				else
 				{
 					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
 				}

admin/views/fields/tmpl/default_head.php

@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>