From d4997abd3751d4b1ccf394ea973cd2da5195e740 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe
Site menu for %s was not build.
', - $viewName_single + $nameSingleCode ), 'Warning' ); } @@ -5092,23 +5093,49 @@ class Interpretation extends Fields return $script . $getItem; } - public function setAdminViewDisplayMethod($viewName_list) + /** + * build code for the admin view display method + * + * @param string $nameListCode The list view name + * + * @return string The php to place in view.html.php + * + */ + public function setAdminViewDisplayMethod($nameListCode) { $script = ''; - if (isset($this->viewsDefaultOrdering[$viewName_list]) - && $this->viewsDefaultOrdering[$viewName_list]['add_admin_ordering'] + // add the the new filter methods for the search toolbar above the list view + if (isset($this->adminFilterType[$nameListCode]) + && $this->adminFilterType[$nameListCode] == 2) + { + $script .= PHP_EOL . $this->_t(2) . "//" + . $this->setLine( + __LINE__ + ) . " Load the filter form from xml."; + $script .= PHP_EOL . $this->_t(2) . "\$this->filterForm " + . "= \$this->get('FilterForm');"; + $script .= PHP_EOL . $this->_t(2) . "//" + . $this->setLine( + __LINE__ + ) . " Load the active filters."; + $script .= PHP_EOL . $this->_t(2) . "\$this->activeFilters " + . "= \$this->get('ActiveFilters');"; + } + // add the custom ordering if set + if (isset($this->viewsDefaultOrdering[$nameListCode]) + && $this->viewsDefaultOrdering[$nameListCode]['add_admin_ordering'] == 1) { // the first is from the state $order_first = true; foreach ( - $this->viewsDefaultOrdering[$viewName_list]['admin_ordering_fields'] + $this->viewsDefaultOrdering[$nameListCode]['admin_ordering_fields'] as $order_field ) { if ($order_first && ($order_field_name = $this->getFieldDatabaseName( - $viewName_list, $order_field['field'] + $nameListCode, $order_field['field'] )) !== false) { // just the first field is based on state @@ -5546,38 +5573,32 @@ class Interpretation extends Fields { if (1 == $type) { - $viewName = $view['settings']->code; + $viewCodeName = $view['settings']->code; } if (2 == $type) { - $viewName = ComponentbuilderHelper::safeString( - $view['settings']->name_single - ); + $viewCodeName = $view['settings']->name_single_code; } // set the custom buttons CUSTOM_BUTTONS_CONTROLLER - $this->fileContentDynamic[$viewName][$this->hhh . $TARGET + $this->fileContentDynamic[$viewCodeName][$this->hhh . $TARGET . '_CUSTOM_BUTTONS_CONTROLLER' . $this->hhh] = ''; // set the custom buttons CUSTOM_BUTTONS_METHOD - $this->fileContentDynamic[$viewName][$this->hhh . $TARGET + $this->fileContentDynamic[$viewCodeName][$this->hhh . $TARGET . '_CUSTOM_BUTTONS_METHOD' . $this->hhh] = ''; } elseif (3 == $type) { // set the names - $viewName = ComponentbuilderHelper::safeString( - $view['settings']->name_single - ); - $viewsName = ComponentbuilderHelper::safeString( - $view['settings']->name_list - ); + $viewCodeName = $view['settings']->name_single_code; + $viewsCodeName = $view['settings']->name_list_code; // set the custom buttons CUSTOM_BUTTONS_CONTROLLER_LIST - $this->fileContentDynamic[$viewsName][$this->hhh . $TARGET + $this->fileContentDynamic[$viewsCodeName][$this->hhh . $TARGET . '_CUSTOM_BUTTONS_CONTROLLER_LIST' . $this->hhh] = ''; // set the custom buttons CUSTOM_BUTTONS_METHOD_LIST - $this->fileContentDynamic[$viewsName][$this->hhh . $TARGET + $this->fileContentDynamic[$viewsCodeName][$this->hhh . $TARGET . '_CUSTOM_BUTTONS_METHOD_LIST' . $this->hhh] = ''; // validate selection @@ -5589,11 +5610,12 @@ class Interpretation extends Fields if ($this->target === 'site') { // set the custom buttons SITE_TOP_BUTTON - $this->fileContentDynamic[$viewName][$this->hhh . 'SITE_TOP_BUTTON' + $this->fileContentDynamic[$viewCodeName][$this->hhh + . 'SITE_TOP_BUTTON' . $this->hhh] = ''; // set the custom buttons SITE_BOTTOM_BUTTON - $this->fileContentDynamic[$viewName][$this->hhh + $this->fileContentDynamic[$viewCodeName][$this->hhh . 'SITE_BOTTOM_BUTTON' . $this->hhh] = ''; // load into place @@ -5601,25 +5623,25 @@ class Interpretation extends Fields { case 1: // set buttons to top right of the view - $this->fileContentDynamic[$viewName][$this->hhh + $this->fileContentDynamic[$viewCodeName][$this->hhh . 'SITE_TOP_BUTTON' . $this->hhh] = '';
@@ -13861,7 +13929,7 @@ class Interpretation extends Fields
}
// add the defaults
- if (!isset($this->fieldsNames[$viewName_single]['id']))
+ if (!isset($this->fieldsNames[$nameSingleCode]['id']))
{
$data_type = (2 == $this->footableVersion)
? 'data-type="numeric"'
@@ -13884,8 +13952,8 @@ class Interpretation extends Fields
}
/**
- * @param $viewName_single
- * @param $viewName_list
+ * @param $nameSingleCode
+ * @param $nameListCode
* @param $functionName
* @param $key
* @param $_key
@@ -13895,16 +13963,16 @@ class Interpretation extends Fields
*
* @return string
*/
- public function setListQueryLinked($viewName_single, $viewName_list,
+ public function setListQueryLinked($nameSingleCode, $nameListCode,
$functionName, $key, $_key, $parentKey, $parent_key, $globalKey
) {
// check if this view has category added
- if (isset($this->categoryBuilder[$viewName_list])
+ if (isset($this->categoryBuilder[$nameListCode])
&& ComponentbuilderHelper::checkArray(
- $this->categoryBuilder[$viewName_list]
+ $this->categoryBuilder[$nameListCode]
))
{
- $categoryCodeName = $this->categoryBuilder[$viewName_list]['code'];
+ $categoryCodeName = $this->categoryBuilder[$nameListCode]['code'];
$addCategory = true;
}
else
@@ -13940,10 +14008,11 @@ class Interpretation extends Fields
}
$query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
__LINE__
- ) . " From the " . $this->componentCodeName . "_" . $viewName_single
+ ) . " From the " . $this->componentCodeName . "_"
+ . $nameSingleCode
. " table";
$query .= PHP_EOL . $this->_t(2) . "\$query->from(\$db->quoteName('#__"
- . $this->componentCodeName . "_" . $viewName_single . "', 'a'));";
+ . $this->componentCodeName . "_" . $nameSingleCode . "', 'a'));";
// add the category
if ($addCategory)
{
@@ -13954,10 +14023,10 @@ class Interpretation extends Fields
}
// add custom filtering php
$query .= $this->getCustomScriptBuilder(
- 'php_getlistquery', $viewName_single, PHP_EOL . PHP_EOL
+ 'php_getlistquery', $nameSingleCode, PHP_EOL . PHP_EOL
);
// add the custom fields query
- $query .= $this->setCustomQuery($viewName_list, $viewName_single);
+ $query .= $this->setCustomQuery($nameListCode, $nameSingleCode);
if (ComponentbuilderHelper::checkString($globalKey) && $key
&& strpos(
$key, '-R>'
@@ -14047,9 +14116,9 @@ class Interpretation extends Fields
$query .= PHP_EOL . $this->_t(2) . "}";
}
}
- if (isset($this->accessBuilder[$viewName_single])
+ if (isset($this->accessBuilder[$nameSingleCode])
&& ComponentbuilderHelper::checkString(
- $this->accessBuilder[$viewName_single]
+ $this->accessBuilder[$nameSingleCode]
))
{
$query .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
@@ -14080,17 +14149,17 @@ class Interpretation extends Fields
$query .= PHP_EOL . $this->_t(2) . "}";
}
// add dynamic ordering (Linked view)
- if (isset($this->viewsDefaultOrdering[$viewName_list])
- && $this->viewsDefaultOrdering[$viewName_list]['add_linked_ordering']
+ if (isset($this->viewsDefaultOrdering[$nameListCode])
+ && $this->viewsDefaultOrdering[$nameListCode]['add_linked_ordering']
== 1)
{
foreach (
- $this->viewsDefaultOrdering[$viewName_list]['linked_ordering_fields']
+ $this->viewsDefaultOrdering[$nameListCode]['linked_ordering_fields']
as $order_field
)
{
if (($order_field_name = $this->getFieldDatabaseName(
- $viewName_list, $order_field['field']
+ $nameListCode, $order_field['field']
// We Removed This 'listJoinBuilder' as targetArea
// we will keep an eye on this
)) !== false)
@@ -14128,13 +14197,13 @@ class Interpretation extends Fields
$query .= PHP_EOL . $this->_t(3) . "\$items = \$db->loadObjectList();";
// add the fixing strings method
$query .= $this->setGetItemsMethodStringFix(
- $viewName_single, $viewName_list,
+ $nameSingleCode, $nameListCode,
$this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
$this->_t(1)
);
// add translations
$query .= $this->setSelectionTranslationFix(
- $viewName_list,
+ $nameListCode,
$this->fileContentStatic[$this->hhh . 'Component' . $this->hhh],
$this->_t(1)
);
@@ -14364,7 +14433,7 @@ class Interpretation extends Fields
}
// add custom php to getitems method after all
$query .= $this->getCustomScriptBuilder(
- 'php_getitems_after_all', $viewName_single,
+ 'php_getitems_after_all', $nameSingleCode,
PHP_EOL . PHP_EOL . $this->_t(1)
);
@@ -14374,7 +14443,7 @@ class Interpretation extends Fields
$query .= PHP_EOL . $this->_t(1) . "}";
// SELECTIONTRANSLATIONFIXFUNC<<
get('admin_view.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php
index 621a037fd..67725fabb 100644
--- a/admin/views/admin_views/tmpl/default_head.php
+++ b/admin/views/admin_views/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
|
@@ -30,17 +30,17 @@ defined('_JEXEC') or die('Restricted access');
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
canState): ?>
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
@@ -48,6 +48,6 @@ defined('_JEXEC') or die('Restricted access');
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
get('admin_custom_tabs.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/admins_custom_tabs/tmpl/default_head.php b/admin/views/admins_custom_tabs/tmpl/default_head.php
index aa849a813..dd912b16f 100644
--- a/admin/views/admins_custom_tabs/tmpl/default_head.php
+++ b/admin/views/admins_custom_tabs/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/admins_custom_tabs/view.html.php b/admin/views/admins_custom_tabs/view.html.php
index 826f01f50..7225c0e97 100644
--- a/admin/views/admins_custom_tabs/view.html.php
+++ b/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')
);
diff --git a/admin/views/admins_fields/tmpl/default.php b/admin/views/admins_fields/tmpl/default.php
index 61a8b37dd..7dccc39d3 100644
--- a/admin/views/admins_fields/tmpl/default.php
+++ b/admin/views/admins_fields/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/admins_fields/tmpl/default_body.php b/admin/views/admins_fields/tmpl/default_body.php
index 50cab67ab..b1e5aba8f 100644
--- a/admin/views/admins_fields/tmpl/default_body.php
+++ b/admin/views/admins_fields/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields&task=admin_fie
|
get('admin_fields.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/admins_fields/tmpl/default_head.php b/admin/views/admins_fields/tmpl/default_head.php
index 087352029..721e4daf0 100644
--- a/admin/views/admins_fields/tmpl/default_head.php
+++ b/admin/views/admins_fields/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php
index 602d3b89d..307295363 100644
--- a/admin/views/admins_fields/view.html.php
+++ b/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')
);
diff --git a/admin/views/admins_fields_conditions/tmpl/default.php b/admin/views/admins_fields_conditions/tmpl/default.php
index b04fdb62a..3ab5688cc 100644
--- a/admin/views/admins_fields_conditions/tmpl/default.php
+++ b/admin/views/admins_fields_conditions/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/admins_fields_conditions/tmpl/default_body.php b/admin/views/admins_fields_conditions/tmpl/default_body.php
index 3b28f7d3d..20bfe6ec5 100644
--- a/admin/views/admins_fields_conditions/tmpl/default_body.php
+++ b/admin/views/admins_fields_conditions/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_conditions&tas
|
get('admin_fields_conditions.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/admins_fields_conditions/tmpl/default_head.php b/admin/views/admins_fields_conditions/tmpl/default_head.php
index 9b77e90aa..5293adc66 100644
--- a/admin/views/admins_fields_conditions/tmpl/default_head.php
+++ b/admin/views/admins_fields_conditions/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php
index 76e25b0c3..ed507b146 100644
--- a/admin/views/admins_fields_conditions/view.html.php
+++ b/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')
);
diff --git a/admin/views/admins_fields_relations/tmpl/default.php b/admin/views/admins_fields_relations/tmpl/default.php
index 457b13264..78be3e631 100644
--- a/admin/views/admins_fields_relations/tmpl/default.php
+++ b/admin/views/admins_fields_relations/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/admins_fields_relations/tmpl/default_body.php b/admin/views/admins_fields_relations/tmpl/default_body.php
index 0b49c1189..91e2953e3 100644
--- a/admin/views/admins_fields_relations/tmpl/default_body.php
+++ b/admin/views/admins_fields_relations/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=admins_fields_relations&task
|
get('admin_fields_relations.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/admins_fields_relations/tmpl/default_head.php b/admin/views/admins_fields_relations/tmpl/default_head.php
index 7ed86a441..a205db3c1 100644
--- a/admin/views/admins_fields_relations/tmpl/default_head.php
+++ b/admin/views/admins_fields_relations/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/admins_fields_relations/view.html.php b/admin/views/admins_fields_relations/view.html.php
index 836528945..9e7e4b5c4 100644
--- a/admin/views/admins_fields_relations/view.html.php
+++ b/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')
);
diff --git a/admin/views/class_extendings/tmpl/default.php b/admin/views/class_extendings/tmpl/default.php
index cf196e3d1..8bcf84882 100644
--- a/admin/views/class_extendings/tmpl/default.php
+++ b/admin/views/class_extendings/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/class_extendings/tmpl/default_body.php b/admin/views/class_extendings/tmpl/default_body.php
index 41e8bacc1..63c61ea8c 100644
--- a/admin/views/class_extendings/tmpl/default_body.php
+++ b/admin/views/class_extendings/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=class_extendings&task=class_
|
get('class_extends.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/class_extendings/tmpl/default_head.php b/admin/views/class_extendings/tmpl/default_head.php
index a0eb35c71..2a48fce9b 100644
--- a/admin/views/class_extendings/tmpl/default_head.php
+++ b/admin/views/class_extendings/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/class_extendings/view.html.php b/admin/views/class_extendings/view.html.php
index 280e3a8a4..2190bff01 100644
--- a/admin/views/class_extendings/view.html.php
+++ b/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'),
diff --git a/admin/views/class_methods/tmpl/default.php b/admin/views/class_methods/tmpl/default.php
index 95414bd34..f93ca7f7f 100644
--- a/admin/views/class_methods/tmpl/default.php
+++ b/admin/views/class_methods/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/class_methods/tmpl/default_body.php b/admin/views/class_methods/tmpl/default_body.php
index 16356746d..13ab49b99 100644
--- a/admin/views/class_methods/tmpl/default_body.php
+++ b/admin/views/class_methods/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=class_methods&task=class_met
|
get('class_method.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/class_methods/tmpl/default_head.php b/admin/views/class_methods/tmpl/default_head.php
index 929bc3cc1..65d83aa93 100644
--- a/admin/views/class_methods/tmpl/default_head.php
+++ b/admin/views/class_methods/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/class_methods/view.html.php b/admin/views/class_methods/view.html.php
index 4c8fd1d21..d8f433b8b 100644
--- a/admin/views/class_methods/view.html.php
+++ b/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'),
diff --git a/admin/views/class_properties/tmpl/default.php b/admin/views/class_properties/tmpl/default.php
index 42f995783..4cdb2ccd4 100644
--- a/admin/views/class_properties/tmpl/default.php
+++ b/admin/views/class_properties/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/class_properties/tmpl/default_body.php b/admin/views/class_properties/tmpl/default_body.php
index ab07f6591..c7b6256d4 100644
--- a/admin/views/class_properties/tmpl/default_body.php
+++ b/admin/views/class_properties/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=class_properties&task=class_
|
get('class_property.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/class_properties/tmpl/default_head.php b/admin/views/class_properties/tmpl/default_head.php
index 455f8bf58..17263d2a3 100644
--- a/admin/views/class_properties/tmpl/default_head.php
+++ b/admin/views/class_properties/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/class_properties/view.html.php b/admin/views/class_properties/view.html.php
index 23bbe8de1..0920beef9 100644
--- a/admin/views/class_properties/view.html.php
+++ b/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'),
diff --git a/admin/views/components_admin_views/tmpl/default.php b/admin/views/components_admin_views/tmpl/default.php
index 266415998..14bc2391f 100644
--- a/admin/views/components_admin_views/tmpl/default.php
+++ b/admin/views/components_admin_views/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_admin_views/tmpl/default_body.php b/admin/views/components_admin_views/tmpl/default_body.php
index 32ef39896..13c6df719 100644
--- a/admin/views/components_admin_views/tmpl/default_body.php
+++ b/admin/views/components_admin_views/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_admin_views&task=
|
get('component_admin_views.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_admin_views/tmpl/default_head.php b/admin/views/components_admin_views/tmpl/default_head.php
index 32c323caa..6c291c3a4 100644
--- a/admin/views/components_admin_views/tmpl/default_head.php
+++ b/admin/views/components_admin_views/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_admin_views/view.html.php b/admin/views/components_admin_views/view.html.php
index b2451a3b0..8aae9c781 100644
--- a/admin/views/components_admin_views/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_config/tmpl/default.php b/admin/views/components_config/tmpl/default.php
index 8edd52a0c..236784fb6 100644
--- a/admin/views/components_config/tmpl/default.php
+++ b/admin/views/components_config/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_config/tmpl/default_body.php b/admin/views/components_config/tmpl/default_body.php
index 787105352..b0a4e1ffa 100644
--- a/admin/views/components_config/tmpl/default_body.php
+++ b/admin/views/components_config/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_config&task=compo
|
get('component_config.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_config/tmpl/default_head.php b/admin/views/components_config/tmpl/default_head.php
index 19bb34c25..17baaa72c 100644
--- a/admin/views/components_config/tmpl/default_head.php
+++ b/admin/views/components_config/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_config/view.html.php b/admin/views/components_config/view.html.php
index b3193256b..a9085c5bb 100644
--- a/admin/views/components_config/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_custom_admin_menus/tmpl/default.php b/admin/views/components_custom_admin_menus/tmpl/default.php
index ea35f2709..8641f277c 100644
--- a/admin/views/components_custom_admin_menus/tmpl/default.php
+++ b/admin/views/components_custom_admin_menus/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_custom_admin_menus/tmpl/default_body.php b/admin/views/components_custom_admin_menus/tmpl/default_body.php
index 4ac3820d0..7cd7b7644 100644
--- a/admin/views/components_custom_admin_menus/tmpl/default_body.php
+++ b/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
|
get('component_custom_admin_menus.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_custom_admin_menus/tmpl/default_head.php b/admin/views/components_custom_admin_menus/tmpl/default_head.php
index e8cd208bc..342dbb186 100644
--- a/admin/views/components_custom_admin_menus/tmpl/default_head.php
+++ b/admin/views/components_custom_admin_menus/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_custom_admin_menus/view.html.php b/admin/views/components_custom_admin_menus/view.html.php
index 7d3d238e6..8905f5279 100644
--- a/admin/views/components_custom_admin_menus/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_custom_admin_views/tmpl/default.php b/admin/views/components_custom_admin_views/tmpl/default.php
index 0fde9afd2..95658c7ed 100644
--- a/admin/views/components_custom_admin_views/tmpl/default.php
+++ b/admin/views/components_custom_admin_views/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_custom_admin_views/tmpl/default_body.php b/admin/views/components_custom_admin_views/tmpl/default_body.php
index fd6372b92..2951e29b2 100644
--- a/admin/views/components_custom_admin_views/tmpl/default_body.php
+++ b/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
|
get('component_custom_admin_views.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_custom_admin_views/tmpl/default_head.php b/admin/views/components_custom_admin_views/tmpl/default_head.php
index b171bddbc..4283f651e 100644
--- a/admin/views/components_custom_admin_views/tmpl/default_head.php
+++ b/admin/views/components_custom_admin_views/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_custom_admin_views/view.html.php b/admin/views/components_custom_admin_views/view.html.php
index 005aed9c6..1d7173d66 100644
--- a/admin/views/components_custom_admin_views/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_dashboard/tmpl/default.php b/admin/views/components_dashboard/tmpl/default.php
index da24d5cdc..35c258e27 100644
--- a/admin/views/components_dashboard/tmpl/default.php
+++ b/admin/views/components_dashboard/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_dashboard/tmpl/default_body.php b/admin/views/components_dashboard/tmpl/default_body.php
index 0d47839d0..605f361da 100644
--- a/admin/views/components_dashboard/tmpl/default_body.php
+++ b/admin/views/components_dashboard/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_dashboard&task=co
|
get('component_dashboard.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_dashboard/tmpl/default_head.php b/admin/views/components_dashboard/tmpl/default_head.php
index 618ea8dce..e403d6242 100644
--- a/admin/views/components_dashboard/tmpl/default_head.php
+++ b/admin/views/components_dashboard/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_dashboard/view.html.php b/admin/views/components_dashboard/view.html.php
index b5b26ea2b..a9b927e9d 100644
--- a/admin/views/components_dashboard/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_files_folders/tmpl/default.php b/admin/views/components_files_folders/tmpl/default.php
index 1e6cb2418..382ebe1c2 100644
--- a/admin/views/components_files_folders/tmpl/default.php
+++ b/admin/views/components_files_folders/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_files_folders/tmpl/default_body.php b/admin/views/components_files_folders/tmpl/default_body.php
index ccf4b38d4..b86a3e2e5 100644
--- a/admin/views/components_files_folders/tmpl/default_body.php
+++ b/admin/views/components_files_folders/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_files_folders&tas
|
get('component_files_folders.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_files_folders/tmpl/default_head.php b/admin/views/components_files_folders/tmpl/default_head.php
index 1b9c11dca..cefcc65c4 100644
--- a/admin/views/components_files_folders/tmpl/default_head.php
+++ b/admin/views/components_files_folders/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_files_folders/view.html.php b/admin/views/components_files_folders/view.html.php
index 394673df3..9e51c47c9 100644
--- a/admin/views/components_files_folders/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_modules/tmpl/default.php b/admin/views/components_modules/tmpl/default.php
index f048d2109..58c4b9242 100644
--- a/admin/views/components_modules/tmpl/default.php
+++ b/admin/views/components_modules/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_modules/tmpl/default_body.php b/admin/views/components_modules/tmpl/default_body.php
index 6fb3c30d6..e5ccfc157 100644
--- a/admin/views/components_modules/tmpl/default_body.php
+++ b/admin/views/components_modules/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_modules&task=comp
|
get('component_modules.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_modules/tmpl/default_head.php b/admin/views/components_modules/tmpl/default_head.php
index 85913a239..7f756c199 100644
--- a/admin/views/components_modules/tmpl/default_head.php
+++ b/admin/views/components_modules/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_modules/view.html.php b/admin/views/components_modules/view.html.php
index 3fa8ec0e6..0148c7e84 100644
--- a/admin/views/components_modules/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_mysql_tweaks/tmpl/default.php b/admin/views/components_mysql_tweaks/tmpl/default.php
index 62f392248..e8da76ced 100644
--- a/admin/views/components_mysql_tweaks/tmpl/default.php
+++ b/admin/views/components_mysql_tweaks/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_mysql_tweaks/tmpl/default_body.php b/admin/views/components_mysql_tweaks/tmpl/default_body.php
index 01dc7d53b..8cb04f35c 100644
--- a/admin/views/components_mysql_tweaks/tmpl/default_body.php
+++ b/admin/views/components_mysql_tweaks/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_mysql_tweaks&task
|
get('component_mysql_tweaks.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_mysql_tweaks/tmpl/default_head.php b/admin/views/components_mysql_tweaks/tmpl/default_head.php
index aca99e265..66bd7bf1c 100644
--- a/admin/views/components_mysql_tweaks/tmpl/default_head.php
+++ b/admin/views/components_mysql_tweaks/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_mysql_tweaks/view.html.php b/admin/views/components_mysql_tweaks/view.html.php
index 811e24274..e231a83d1 100644
--- a/admin/views/components_mysql_tweaks/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_placeholders/tmpl/default.php b/admin/views/components_placeholders/tmpl/default.php
index 3612ef1b1..3d92b31a4 100644
--- a/admin/views/components_placeholders/tmpl/default.php
+++ b/admin/views/components_placeholders/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_placeholders/tmpl/default_body.php b/admin/views/components_placeholders/tmpl/default_body.php
index 5ca8905e7..193c33613 100644
--- a/admin/views/components_placeholders/tmpl/default_body.php
+++ b/admin/views/components_placeholders/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_placeholders&task
|
get('component_placeholders.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_placeholders/tmpl/default_head.php b/admin/views/components_placeholders/tmpl/default_head.php
index 718c96bd0..e0912ee95 100644
--- a/admin/views/components_placeholders/tmpl/default_head.php
+++ b/admin/views/components_placeholders/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_placeholders/view.html.php b/admin/views/components_placeholders/view.html.php
index 1209ca0fe..54ba49ffe 100644
--- a/admin/views/components_placeholders/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_plugins/tmpl/default.php b/admin/views/components_plugins/tmpl/default.php
index f79c12620..225327979 100644
--- a/admin/views/components_plugins/tmpl/default.php
+++ b/admin/views/components_plugins/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_plugins/tmpl/default_body.php b/admin/views/components_plugins/tmpl/default_body.php
index 0f41263a4..83ee9c3a6 100644
--- a/admin/views/components_plugins/tmpl/default_body.php
+++ b/admin/views/components_plugins/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_plugins&task=comp
|
get('component_plugins.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_plugins/tmpl/default_head.php b/admin/views/components_plugins/tmpl/default_head.php
index a9e46c4fa..9b526bf58 100644
--- a/admin/views/components_plugins/tmpl/default_head.php
+++ b/admin/views/components_plugins/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_plugins/view.html.php b/admin/views/components_plugins/view.html.php
index 8e925e30b..6428de1e7 100644
--- a/admin/views/components_plugins/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_site_views/tmpl/default.php b/admin/views/components_site_views/tmpl/default.php
index f42d87bca..d6114ac29 100644
--- a/admin/views/components_site_views/tmpl/default.php
+++ b/admin/views/components_site_views/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_site_views/tmpl/default_body.php b/admin/views/components_site_views/tmpl/default_body.php
index 8c76f6567..0b9e5acb8 100644
--- a/admin/views/components_site_views/tmpl/default_body.php
+++ b/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
|
get('component_site_views.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_site_views/tmpl/default_head.php b/admin/views/components_site_views/tmpl/default_head.php
index 0dd72a58c..3d6577be6 100644
--- a/admin/views/components_site_views/tmpl/default_head.php
+++ b/admin/views/components_site_views/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_site_views/view.html.php b/admin/views/components_site_views/view.html.php
index 91e959c01..54754509d 100644
--- a/admin/views/components_site_views/view.html.php
+++ b/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')
);
diff --git a/admin/views/components_updates/tmpl/default.php b/admin/views/components_updates/tmpl/default.php
index 193c6b494..c1487633d 100644
--- a/admin/views/components_updates/tmpl/default.php
+++ b/admin/views/components_updates/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/components_updates/tmpl/default_body.php b/admin/views/components_updates/tmpl/default_body.php
index 4c3624291..24bbccd85 100644
--- a/admin/views/components_updates/tmpl/default_body.php
+++ b/admin/views/components_updates/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=components_updates&task=comp
|
get('component_updates.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/components_updates/tmpl/default_head.php b/admin/views/components_updates/tmpl/default_head.php
index d3d0312cb..750421607 100644
--- a/admin/views/components_updates/tmpl/default_head.php
+++ b/admin/views/components_updates/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/components_updates/view.html.php b/admin/views/components_updates/view.html.php
index c6761f65a..51fb1f6a3 100644
--- a/admin/views/components_updates/view.html.php
+++ b/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')
);
diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php
index e20fde714..6559c7b63 100644
--- a/admin/views/custom_admin_views/tmpl/default.php
+++ b/admin/views/custom_admin_views/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/custom_admin_views/tmpl/default_body.php b/admin/views/custom_admin_views/tmpl/default_body.php
index 1f23d8192..d9ef76bb4 100644
--- a/admin/views/custom_admin_views/tmpl/default_body.php
+++ b/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
|
get('core.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/custom_admin_views/tmpl/default_head.php b/admin/views/custom_admin_views/tmpl/default_head.php
index 8a31858da..56f2bf317 100644
--- a/admin/views/custom_admin_views/tmpl/default_head.php
+++ b/admin/views/custom_admin_views/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php
index 381c261c1..1e5067f21 100644
--- a/admin/views/custom_admin_views/view.html.php
+++ b/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'),
diff --git a/admin/views/custom_codes/tmpl/default_body.php b/admin/views/custom_codes/tmpl/default_body.php
index e2a13cda3..5890c4e80 100644
--- a/admin/views/custom_codes/tmpl/default_body.php
+++ b/admin/views/custom_codes/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=custom_codes&task=custom_cod
|
get('custom_code.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/custom_codes/tmpl/default_head.php b/admin/views/custom_codes/tmpl/default_head.php
index c14b79680..ca58c11f3 100644
--- a/admin/views/custom_codes/tmpl/default_head.php
+++ b/admin/views/custom_codes/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php
index 5dd2c29fe..1c82bbeb3 100644
--- a/admin/views/custom_codes/view.html.php
+++ b/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'),
diff --git a/admin/views/dynamic_gets/tmpl/default_body.php b/admin/views/dynamic_gets/tmpl/default_body.php
index 77e81b9bd..ed271eb16 100644
--- a/admin/views/dynamic_gets/tmpl/default_body.php
+++ b/admin/views/dynamic_gets/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=dynamic_gets&task=dynamic_ge
|
get('dynamic_get.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/dynamic_gets/tmpl/default_head.php b/admin/views/dynamic_gets/tmpl/default_head.php
index 933f12540..fe77912fd 100644
--- a/admin/views/dynamic_gets/tmpl/default_head.php
+++ b/admin/views/dynamic_gets/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php
index 14e316411..d6ed85e77 100644
--- a/admin/views/dynamic_gets/view.html.php
+++ b/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'),
diff --git a/admin/views/fields/tmpl/default_body.php b/admin/views/fields/tmpl/default_body.php
index 382ce7d16..721e46fb8 100644
--- a/admin/views/fields/tmpl/default_body.php
+++ b/admin/views/fields/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
|
get('field.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/fields/tmpl/default_head.php b/admin/views/fields/tmpl/default_head.php
index 0b0544523..7deb734ca 100644
--- a/admin/views/fields/tmpl/default_head.php
+++ b/admin/views/fields/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index bfa580282..539c4ebfa 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewFields 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
@@ -401,7 +401,7 @@ class ComponentbuilderViewFields 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_FIELD_NAME_LABEL'),
'g.name' => JText::_('COM_COMPONENTBUILDER_FIELD_FIELDTYPE_LABEL'),
diff --git a/admin/views/fieldtypes/tmpl/default.php b/admin/views/fieldtypes/tmpl/default.php
index 876c961ce..f94f3dfc1 100644
--- a/admin/views/fieldtypes/tmpl/default.php
+++ b/admin/views/fieldtypes/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/fieldtypes/tmpl/default_body.php b/admin/views/fieldtypes/tmpl/default_body.php
index 887e1812f..3a2ca94cd 100644
--- a/admin/views/fieldtypes/tmpl/default_body.php
+++ b/admin/views/fieldtypes/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=fieldtypes&task=fieldtype.ed
|
get('fieldtype.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/fieldtypes/tmpl/default_head.php b/admin/views/fieldtypes/tmpl/default_head.php
index 296445ed8..0328ceb50 100644
--- a/admin/views/fieldtypes/tmpl/default_head.php
+++ b/admin/views/fieldtypes/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php
index fac139380..f7b9060c1 100644
--- a/admin/views/fieldtypes/view.html.php
+++ b/admin/views/fieldtypes/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewFieldtypes 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
@@ -246,7 +246,7 @@ class ComponentbuilderViewFieldtypes 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_FIELDTYPE_NAME_LABEL'),
'a.short_description' => JText::_('COM_COMPONENTBUILDER_FIELDTYPE_SHORT_DESCRIPTION_LABEL'),
diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php
index 9c79c938f..c887f4a1b 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php
index ff8cf72c0..5fc22a00f 100644
--- a/admin/views/help_documents/tmpl/default_body.php
+++ b/admin/views/help_documents/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=help_documents&task=help_doc
|
get('help_document.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php
index b8663587b..9399acfc5 100644
--- a/admin/views/help_documents/tmpl/default_head.php
+++ b/admin/views/help_documents/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index 6ddfa8ba3..d83583dfa 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewHelp_documents 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
@@ -349,7 +349,7 @@ class ComponentbuilderViewHelp_documents extends JViewLegacy
protected function getSortFields()
{
return array(
- 'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+ 'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
'a.published' => JText::_('JSTATUS'),
'a.title' => JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_LABEL'),
'a.type' => JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL'),
diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php
index e683e8291..6df319ced 100644
--- a/admin/views/joomla_components/tmpl/default_body.php
+++ b/admin/views/joomla_components/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=jooml
|
get('joomla_component.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php
index aa3ac05a3..6df7428d6 100644
--- a/admin/views/joomla_components/tmpl/default_head.php
+++ b/admin/views/joomla_components/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php
index e95bc3295..b5c7a5160 100644
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewJoomla_components 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
@@ -319,7 +319,7 @@ class ComponentbuilderViewJoomla_components 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_JOOMLA_COMPONENT_SYSTEM_NAME_LABEL'),
'a.name_code' => JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL'),
diff --git a/admin/views/joomla_modules/tmpl/default_body.php b/admin/views/joomla_modules/tmpl/default_body.php
index 168f2ecfe..7fa1a073b 100644
--- a/admin/views/joomla_modules/tmpl/default_body.php
+++ b/admin/views/joomla_modules/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
|
get('joomla_module.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/joomla_modules/tmpl/default_head.php b/admin/views/joomla_modules/tmpl/default_head.php
index 2b16008a9..342183575 100644
--- a/admin/views/joomla_modules/tmpl/default_head.php
+++ b/admin/views/joomla_modules/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/joomla_modules/view.html.php b/admin/views/joomla_modules/view.html.php
index 3197a6050..c670ec33a 100644
--- a/admin/views/joomla_modules/view.html.php
+++ b/admin/views/joomla_modules/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewJoomla_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', '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
@@ -259,7 +259,7 @@ class ComponentbuilderViewJoomla_modules 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_JOOMLA_MODULE_SYSTEM_NAME_LABEL'),
'a.description' => JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULE_DESCRIPTION_LABEL'),
diff --git a/admin/views/joomla_modules_files_folders_urls/tmpl/default.php b/admin/views/joomla_modules_files_folders_urls/tmpl/default.php
index 76bf426a9..a11d6d717 100644
--- a/admin/views/joomla_modules_files_folders_urls/tmpl/default.php
+++ b/admin/views/joomla_modules_files_folders_urls/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/joomla_modules_files_folders_urls/tmpl/default_body.php b/admin/views/joomla_modules_files_folders_urls/tmpl/default_body.php
index 254c70908..86dce9f7e 100644
--- a/admin/views/joomla_modules_files_folders_urls/tmpl/default_body.php
+++ b/admin/views/joomla_modules_files_folders_urls/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules_files_folders
|
get('joomla_module_files_folders_urls.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/joomla_modules_files_folders_urls/tmpl/default_head.php b/admin/views/joomla_modules_files_folders_urls/tmpl/default_head.php
index 37fcf012e..c222f6c1d 100644
--- a/admin/views/joomla_modules_files_folders_urls/tmpl/default_head.php
+++ b/admin/views/joomla_modules_files_folders_urls/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/joomla_modules_files_folders_urls/view.html.php b/admin/views/joomla_modules_files_folders_urls/view.html.php
index 387682196..e3faa3a52 100644
--- a/admin/views/joomla_modules_files_folders_urls/view.html.php
+++ b/admin/views/joomla_modules_files_folders_urls/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewJoomla_modules_files_folders_urls 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 ComponentbuilderViewJoomla_modules_files_folders_urls 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')
);
diff --git a/admin/views/joomla_modules_updates/tmpl/default.php b/admin/views/joomla_modules_updates/tmpl/default.php
index 6e2d69df4..ce44e137a 100644
--- a/admin/views/joomla_modules_updates/tmpl/default.php
+++ b/admin/views/joomla_modules_updates/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/joomla_modules_updates/tmpl/default_body.php b/admin/views/joomla_modules_updates/tmpl/default_body.php
index 80fabcdb1..e12213e84 100644
--- a/admin/views/joomla_modules_updates/tmpl/default_body.php
+++ b/admin/views/joomla_modules_updates/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules_updates&task=
|
get('joomla_module_updates.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/joomla_modules_updates/tmpl/default_head.php b/admin/views/joomla_modules_updates/tmpl/default_head.php
index d02614aaa..87a478d34 100644
--- a/admin/views/joomla_modules_updates/tmpl/default_head.php
+++ b/admin/views/joomla_modules_updates/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/joomla_modules_updates/view.html.php b/admin/views/joomla_modules_updates/view.html.php
index d5b90296e..41d850efb 100644
--- a/admin/views/joomla_modules_updates/view.html.php
+++ b/admin/views/joomla_modules_updates/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewJoomla_modules_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 ComponentbuilderViewJoomla_modules_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')
);
diff --git a/admin/views/joomla_plugin_groups/tmpl/default.php b/admin/views/joomla_plugin_groups/tmpl/default.php
index cb53414e7..27e28fdc4 100644
--- a/admin/views/joomla_plugin_groups/tmpl/default.php
+++ b/admin/views/joomla_plugin_groups/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/joomla_plugin_groups/tmpl/default_body.php b/admin/views/joomla_plugin_groups/tmpl/default_body.php
index 31cd9d52f..644611690 100644
--- a/admin/views/joomla_plugin_groups/tmpl/default_body.php
+++ b/admin/views/joomla_plugin_groups/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugin_groups&task=jo
|
get('core.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/joomla_plugin_groups/tmpl/default_head.php b/admin/views/joomla_plugin_groups/tmpl/default_head.php
index 6a567fd60..19f70d75e 100644
--- a/admin/views/joomla_plugin_groups/tmpl/default_head.php
+++ b/admin/views/joomla_plugin_groups/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/joomla_plugin_groups/view.html.php b/admin/views/joomla_plugin_groups/view.html.php
index 378fdc96d..fcc094be7 100644
--- a/admin/views/joomla_plugin_groups/view.html.php
+++ b/admin/views/joomla_plugin_groups/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewJoomla_plugin_groups 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 ComponentbuilderViewJoomla_plugin_groups 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_JOOMLA_PLUGIN_GROUP_NAME_LABEL'),
'g.name' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUP_CLASS_EXTENDS_LABEL'),
diff --git a/admin/views/joomla_plugins/tmpl/default_body.php b/admin/views/joomla_plugins/tmpl/default_body.php
index 818aff6aa..7c6882815 100644
--- a/admin/views/joomla_plugins/tmpl/default_body.php
+++ b/admin/views/joomla_plugins/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins&task=joomla_p
|
get('joomla_plugin.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/joomla_plugins/tmpl/default_head.php b/admin/views/joomla_plugins/tmpl/default_head.php
index a7c71047f..5841c34a5 100644
--- a/admin/views/joomla_plugins/tmpl/default_head.php
+++ b/admin/views/joomla_plugins/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/joomla_plugins/view.html.php b/admin/views/joomla_plugins/view.html.php
index f75abb729..4588737c8 100644
--- a/admin/views/joomla_plugins/view.html.php
+++ b/admin/views/joomla_plugins/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewJoomla_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', '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
@@ -299,7 +299,7 @@ class ComponentbuilderViewJoomla_plugins 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_JOOMLA_PLUGIN_SYSTEM_NAME_LABEL'),
'g.name' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_CLASS_EXTENDS_LABEL'),
diff --git a/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php b/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php
index de710474c..63ebb88d9 100644
--- a/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php
+++ b/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/joomla_plugins_files_folders_urls/tmpl/default_body.php b/admin/views/joomla_plugins_files_folders_urls/tmpl/default_body.php
index d58117038..774f10d47 100644
--- a/admin/views/joomla_plugins_files_folders_urls/tmpl/default_body.php
+++ b/admin/views/joomla_plugins_files_folders_urls/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins_files_folders
|
get('joomla_plugin_files_folders_urls.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/joomla_plugins_files_folders_urls/tmpl/default_head.php b/admin/views/joomla_plugins_files_folders_urls/tmpl/default_head.php
index e0e6523ae..912c93ff0 100644
--- a/admin/views/joomla_plugins_files_folders_urls/tmpl/default_head.php
+++ b/admin/views/joomla_plugins_files_folders_urls/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/joomla_plugins_files_folders_urls/view.html.php b/admin/views/joomla_plugins_files_folders_urls/view.html.php
index 1bf5a9ff3..2dbfb0958 100644
--- a/admin/views/joomla_plugins_files_folders_urls/view.html.php
+++ b/admin/views/joomla_plugins_files_folders_urls/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewJoomla_plugins_files_folders_urls 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 ComponentbuilderViewJoomla_plugins_files_folders_urls 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')
);
diff --git a/admin/views/joomla_plugins_updates/tmpl/default.php b/admin/views/joomla_plugins_updates/tmpl/default.php
index 65d63db9b..cc8e175bc 100644
--- a/admin/views/joomla_plugins_updates/tmpl/default.php
+++ b/admin/views/joomla_plugins_updates/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/joomla_plugins_updates/tmpl/default_body.php b/admin/views/joomla_plugins_updates/tmpl/default_body.php
index fa437ba08..528ccba48 100644
--- a/admin/views/joomla_plugins_updates/tmpl/default_body.php
+++ b/admin/views/joomla_plugins_updates/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_plugins_updates&task=
|
get('joomla_plugin_updates.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/joomla_plugins_updates/tmpl/default_head.php b/admin/views/joomla_plugins_updates/tmpl/default_head.php
index 71a9ee727..2b2815f2e 100644
--- a/admin/views/joomla_plugins_updates/tmpl/default_head.php
+++ b/admin/views/joomla_plugins_updates/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/joomla_plugins_updates/view.html.php b/admin/views/joomla_plugins_updates/view.html.php
index 5ed43dc26..a40ea29b5 100644
--- a/admin/views/joomla_plugins_updates/view.html.php
+++ b/admin/views/joomla_plugins_updates/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewJoomla_plugins_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 ComponentbuilderViewJoomla_plugins_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')
);
diff --git a/admin/views/language_translations/tmpl/default.php b/admin/views/language_translations/tmpl/default.php
index 2270d80e2..071d79297 100644
--- a/admin/views/language_translations/tmpl/default.php
+++ b/admin/views/language_translations/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/language_translations/tmpl/default_body.php b/admin/views/language_translations/tmpl/default_body.php
index b6e538f32..55c0dffc4 100644
--- a/admin/views/language_translations/tmpl/default_body.php
+++ b/admin/views/language_translations/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=language_translations&task=l
|
get('language_translation.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/language_translations/tmpl/default_head.php b/admin/views/language_translations/tmpl/default_head.php
index 17e59d12f..c8c679102 100644
--- a/admin/views/language_translations/tmpl/default_head.php
+++ b/admin/views/language_translations/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php
index 95b430c3f..12b008395 100644
--- a/admin/views/language_translations/view.html.php
+++ b/admin/views/language_translations/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewLanguage_translations 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
@@ -229,7 +229,7 @@ class ComponentbuilderViewLanguage_translations extends JViewLegacy
protected function getSortFields()
{
return array(
- 'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+ 'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
'a.published' => JText::_('JSTATUS'),
'a.source' => JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_SOURCE_LABEL'),
'a.id' => JText::_('JGRID_HEADING_ID')
diff --git a/admin/views/languages/tmpl/default_body.php b/admin/views/languages/tmpl/default_body.php
index 0043b84a5..28def2eec 100644
--- a/admin/views/languages/tmpl/default_body.php
+++ b/admin/views/languages/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=languages&task=language.edit
|
get('language.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/languages/tmpl/default_head.php b/admin/views/languages/tmpl/default_head.php
index 07a32e556..5b7548b8f 100644
--- a/admin/views/languages/tmpl/default_head.php
+++ b/admin/views/languages/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/languages/view.html.php b/admin/views/languages/view.html.php
index 356f0d7da..3ea33e7a7 100644
--- a/admin/views/languages/view.html.php
+++ b/admin/views/languages/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewLanguages 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
@@ -234,7 +234,7 @@ class ComponentbuilderViewLanguages 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_LANGUAGE_NAME_LABEL'),
'a.langtag' => JText::_('COM_COMPONENTBUILDER_LANGUAGE_LANGTAG_LABEL'),
diff --git a/admin/views/layouts/tmpl/default_body.php b/admin/views/layouts/tmpl/default_body.php
index df8e197ac..324eb893f 100644
--- a/admin/views/layouts/tmpl/default_body.php
+++ b/admin/views/layouts/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=layouts&task=layout.edit";
|
get('core.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/layouts/tmpl/default_head.php b/admin/views/layouts/tmpl/default_head.php
index 6feaf4169..f9b164085 100644
--- a/admin/views/layouts/tmpl/default_head.php
+++ b/admin/views/layouts/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php
index b80e465c4..11b20f5d2 100644
--- a/admin/views/layouts/view.html.php
+++ b/admin/views/layouts/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewLayouts 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 ComponentbuilderViewLayouts 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_LAYOUT_NAME_LABEL'),
'a.description' => JText::_('COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_LABEL'),
diff --git a/admin/views/libraries/tmpl/default.php b/admin/views/libraries/tmpl/default.php
index b68deb7d5..2f72be745 100644
--- a/admin/views/libraries/tmpl/default.php
+++ b/admin/views/libraries/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/libraries/tmpl/default_body.php b/admin/views/libraries/tmpl/default_body.php
index 428f950c1..4568b9829 100644
--- a/admin/views/libraries/tmpl/default_body.php
+++ b/admin/views/libraries/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=libraries&task=library.edit"
|
get('library.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/libraries/tmpl/default_head.php b/admin/views/libraries/tmpl/default_head.php
index d683dc029..d6aad882e 100644
--- a/admin/views/libraries/tmpl/default_head.php
+++ b/admin/views/libraries/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php
index 387ad101e..ecbeffd3b 100644
--- a/admin/views/libraries/view.html.php
+++ b/admin/views/libraries/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewLibraries 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
@@ -314,7 +314,7 @@ class ComponentbuilderViewLibraries 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_LIBRARY_NAME_LABEL'),
'a.target' => JText::_('COM_COMPONENTBUILDER_LIBRARY_TARGET_LABEL'),
diff --git a/admin/views/libraries_config/tmpl/default.php b/admin/views/libraries_config/tmpl/default.php
index a0903a080..de01322d2 100644
--- a/admin/views/libraries_config/tmpl/default.php
+++ b/admin/views/libraries_config/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/libraries_config/tmpl/default_body.php b/admin/views/libraries_config/tmpl/default_body.php
index 128f2184c..c8eb0e3df 100644
--- a/admin/views/libraries_config/tmpl/default_body.php
+++ b/admin/views/libraries_config/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=libraries_config&task=librar
|
get('library_config.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/libraries_config/tmpl/default_head.php b/admin/views/libraries_config/tmpl/default_head.php
index 9a3e55b2b..933acb9ce 100644
--- a/admin/views/libraries_config/tmpl/default_head.php
+++ b/admin/views/libraries_config/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/libraries_config/view.html.php b/admin/views/libraries_config/view.html.php
index e6acdf78a..2b58e7289 100644
--- a/admin/views/libraries_config/view.html.php
+++ b/admin/views/libraries_config/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewLibraries_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 ComponentbuilderViewLibraries_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')
);
diff --git a/admin/views/libraries_files_folders_urls/tmpl/default.php b/admin/views/libraries_files_folders_urls/tmpl/default.php
index 33e903268..7ba0381f3 100644
--- a/admin/views/libraries_files_folders_urls/tmpl/default.php
+++ b/admin/views/libraries_files_folders_urls/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/libraries_files_folders_urls/tmpl/default_body.php b/admin/views/libraries_files_folders_urls/tmpl/default_body.php
index c2f4b753d..000f40892 100644
--- a/admin/views/libraries_files_folders_urls/tmpl/default_body.php
+++ b/admin/views/libraries_files_folders_urls/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=libraries_files_folders_urls
|
get('library_files_folders_urls.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/libraries_files_folders_urls/tmpl/default_head.php b/admin/views/libraries_files_folders_urls/tmpl/default_head.php
index 88a7012e6..737f3ea36 100644
--- a/admin/views/libraries_files_folders_urls/tmpl/default_head.php
+++ b/admin/views/libraries_files_folders_urls/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/libraries_files_folders_urls/view.html.php b/admin/views/libraries_files_folders_urls/view.html.php
index 37a901234..ad34c262b 100644
--- a/admin/views/libraries_files_folders_urls/view.html.php
+++ b/admin/views/libraries_files_folders_urls/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewLibraries_files_folders_urls 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 ComponentbuilderViewLibraries_files_folders_urls 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')
);
diff --git a/admin/views/placeholders/tmpl/default.php b/admin/views/placeholders/tmpl/default.php
index 242a4833c..ac46aef81 100644
--- a/admin/views/placeholders/tmpl/default.php
+++ b/admin/views/placeholders/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/placeholders/tmpl/default_body.php b/admin/views/placeholders/tmpl/default_body.php
index c9efd1b4c..d7a11c2bf 100644
--- a/admin/views/placeholders/tmpl/default_body.php
+++ b/admin/views/placeholders/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=placeholders&task=placeholde
|
get('placeholder.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/placeholders/tmpl/default_head.php b/admin/views/placeholders/tmpl/default_head.php
index 314685539..3cb17175e 100644
--- a/admin/views/placeholders/tmpl/default_head.php
+++ b/admin/views/placeholders/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/placeholders/view.html.php b/admin/views/placeholders/view.html.php
index e2eaa3655..b1dc60a0d 100644
--- a/admin/views/placeholders/view.html.php
+++ b/admin/views/placeholders/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewPlaceholders 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
@@ -229,7 +229,7 @@ class ComponentbuilderViewPlaceholders extends JViewLegacy
protected function getSortFields()
{
return array(
- 'ordering' => JText::_('JGRID_HEADING_ORDERING'),
+ 'a.ordering' => JText::_('JGRID_HEADING_ORDERING'),
'a.published' => JText::_('JSTATUS'),
'a.target' => JText::_('COM_COMPONENTBUILDER_PLACEHOLDER_TARGET_LABEL'),
'a.value' => JText::_('COM_COMPONENTBUILDER_PLACEHOLDER_VALUE_LABEL'),
diff --git a/admin/views/servers/tmpl/default.php b/admin/views/servers/tmpl/default.php
index cbb2a15bd..b137f22ef 100644
--- a/admin/views/servers/tmpl/default.php
+++ b/admin/views/servers/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/servers/tmpl/default_body.php b/admin/views/servers/tmpl/default_body.php
index e3dce61ea..e7630a42a 100644
--- a/admin/views/servers/tmpl/default_body.php
+++ b/admin/views/servers/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=servers&task=server.edit";
|
get('server.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/servers/tmpl/default_head.php b/admin/views/servers/tmpl/default_head.php
index 42f71a59f..a98a0a9d8 100644
--- a/admin/views/servers/tmpl/default_head.php
+++ b/admin/views/servers/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php
index 2283ddf6c..0d37ebab7 100644
--- a/admin/views/servers/view.html.php
+++ b/admin/views/servers/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewServers 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
@@ -289,7 +289,7 @@ class ComponentbuilderViewServers 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_SERVER_NAME_LABEL'),
'a.protocol' => JText::_('COM_COMPONENTBUILDER_SERVER_PROTOCOL_LABEL'),
diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php
index a9090f66c..237791534 100644
--- a/admin/views/site_views/tmpl/default.php
+++ b/admin/views/site_views/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/site_views/tmpl/default_body.php b/admin/views/site_views/tmpl/default_body.php
index da5beac8e..e3bbf35a3 100644
--- a/admin/views/site_views/tmpl/default_body.php
+++ b/admin/views/site_views/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=site_views&task=site_view.ed
|
get('core.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/site_views/tmpl/default_head.php b/admin/views/site_views/tmpl/default_head.php
index 173030ce5..a895af7fa 100644
--- a/admin/views/site_views/tmpl/default_head.php
+++ b/admin/views/site_views/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php
index 2fe9ec51a..343c75572 100644
--- a/admin/views/site_views/view.html.php
+++ b/admin/views/site_views/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewSite_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 ComponentbuilderViewSite_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_SITE_VIEW_SYSTEM_NAME_LABEL'),
'a.name' => JText::_('COM_COMPONENTBUILDER_SITE_VIEW_NAME_LABEL'),
diff --git a/admin/views/snippet_types/tmpl/default.php b/admin/views/snippet_types/tmpl/default.php
index 820ed9c04..c08e9a460 100644
--- a/admin/views/snippet_types/tmpl/default.php
+++ b/admin/views/snippet_types/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/snippet_types/tmpl/default_body.php b/admin/views/snippet_types/tmpl/default_body.php
index e8664c4ee..2236f64b0 100644
--- a/admin/views/snippet_types/tmpl/default_body.php
+++ b/admin/views/snippet_types/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=snippet_types&task=snippet_t
|
get('snippet_type.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/snippet_types/tmpl/default_head.php b/admin/views/snippet_types/tmpl/default_head.php
index c862e11bf..534996cdc 100644
--- a/admin/views/snippet_types/tmpl/default_head.php
+++ b/admin/views/snippet_types/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/snippet_types/view.html.php b/admin/views/snippet_types/view.html.php
index 9532233d7..82c84f333 100644
--- a/admin/views/snippet_types/view.html.php
+++ b/admin/views/snippet_types/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewSnippet_types 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 ComponentbuilderViewSnippet_types 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_SNIPPET_TYPE_NAME_LABEL'),
'a.description' => JText::_('COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_LABEL'),
diff --git a/admin/views/snippets/tmpl/default.php b/admin/views/snippets/tmpl/default.php
index 937eb60f0..4be137907 100644
--- a/admin/views/snippets/tmpl/default.php
+++ b/admin/views/snippets/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/snippets/tmpl/default_body.php b/admin/views/snippets/tmpl/default_body.php
index afdc15154..90ffba9e7 100644
--- a/admin/views/snippets/tmpl/default_body.php
+++ b/admin/views/snippets/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=snippets&task=snippet.edit";
|
get('core.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/snippets/tmpl/default_head.php b/admin/views/snippets/tmpl/default_head.php
index 5f334e595..541e50e8c 100644
--- a/admin/views/snippets/tmpl/default_head.php
+++ b/admin/views/snippets/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php
index f2cf6f21b..b8b36e432 100644
--- a/admin/views/snippets/view.html.php
+++ b/admin/views/snippets/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewSnippets 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
@@ -299,7 +299,7 @@ class ComponentbuilderViewSnippets 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_SNIPPET_NAME_LABEL'),
'a.url' => JText::_('COM_COMPONENTBUILDER_SNIPPET_URL_LABEL'),
diff --git a/admin/views/templates/tmpl/default_body.php b/admin/views/templates/tmpl/default_body.php
index cb081e795..e7c7c3708 100644
--- a/admin/views/templates/tmpl/default_body.php
+++ b/admin/views/templates/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=templates&task=template.edit
|
get('core.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/templates/tmpl/default_head.php b/admin/views/templates/tmpl/default_head.php
index 18ef3a02a..69ef13274 100644
--- a/admin/views/templates/tmpl/default_head.php
+++ b/admin/views/templates/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php
index 83e26eb5b..f516ed5af 100644
--- a/admin/views/templates/view.html.php
+++ b/admin/views/templates/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewTemplates 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 ComponentbuilderViewTemplates 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_TEMPLATE_NAME_LABEL'),
'a.description' => JText::_('COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_LABEL'),
diff --git a/admin/views/validation_rules/tmpl/default.php b/admin/views/validation_rules/tmpl/default.php
index cfe4c2d20..c0d7fd02a 100644
--- a/admin/views/validation_rules/tmpl/default.php
+++ b/admin/views/validation_rules/tmpl/default.php
@@ -82,4 +82,5 @@ if ($this->saveOrder)
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/views/validation_rules/tmpl/default_body.php b/admin/views/validation_rules/tmpl/default_body.php
index dd91f6f2d..f1787372c 100644
--- a/admin/views/validation_rules/tmpl/default_body.php
+++ b/admin/views/validation_rules/tmpl/default_body.php
@@ -25,11 +25,8 @@ $edit = "index.php?option=com_componentbuilder&view=validation_rules&task=valida
|
get('validation_rule.edit.state')): ?>
saveOrder)
- {
- $iconClass = ' inactive';
- }
- else
+ $iconClass = '';
+ if (!$this->saveOrder)
{
$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
}
diff --git a/admin/views/validation_rules/tmpl/default_head.php b/admin/views/validation_rules/tmpl/default_head.php
index 177b3a7f9..a6b52d58b 100644
--- a/admin/views/validation_rules/tmpl/default_head.php
+++ b/admin/views/validation_rules/tmpl/default_head.php
@@ -16,7 +16,7 @@ defined('_JEXEC') or die('Restricted access');
|
- ', 'ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
diff --git a/admin/views/validation_rules/view.html.php b/admin/views/validation_rules/view.html.php
index 0b1f3d44c..31fa34589 100644
--- a/admin/views/validation_rules/view.html.php
+++ b/admin/views/validation_rules/view.html.php
@@ -37,7 +37,7 @@ class ComponentbuilderViewValidation_rules 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
@@ -234,7 +234,7 @@ class ComponentbuilderViewValidation_rules 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_VALIDATION_RULE_NAME_LABEL'),
'a.short_description' => JText::_('COM_COMPONENTBUILDER_VALIDATION_RULE_SHORT_DESCRIPTION_LABEL'),
diff --git a/componentbuilder.xml b/componentbuilder.xml
index bc8ff8604..096495187 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
| 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!Created by Llewellyn van der Merwe
toolbar->render(); ?>
diff --git a/admin/compiler/joomla_3/filter_forms.xml b/admin/compiler/joomla_3/filter_forms.xml
new file mode 100644
index 000000000..c1a539eff
--- /dev/null
+++ b/admin/compiler/joomla_3/filter_forms.xml
@@ -0,0 +1,9 @@
+
+ ' . $plugin->description . ' '; } @@ -9765,13 +9794,16 @@ class Get ); unset( $this->placeholders[$this->hhh . 'VERSION' - . $this->hhh]); + . $this->hhh] + ); unset( $this->placeholders[$this->hhh . 'DESCRIPTION' - . $this->hhh]); + . $this->hhh] + ); unset( $this->placeholders[$this->hhh . 'PLUGIN_NAME' - . $this->hhh]); + . $this->hhh] + ); $this->joomlaPlugins[$id] = $plugin; @@ -10432,19 +10464,26 @@ class Get if (strpos($script, 'LOCKBASE64((((') !== false) { // get the strings - $values = ComponentbuilderHelper::getAllBetween($script, 'LOCKBASE64((((', '))))'); + $values = ComponentbuilderHelper::getAllBetween( + $script, 'LOCKBASE64((((', '))))' + ); $locker = array(); // convert them - foreach($values as $value) + foreach ($values as $value) { - $locker['LOCKBASE64((((' . $value . '))))'] = "base64_decode( preg_replace('/\s+/', ''," . + $locker['LOCKBASE64((((' . $value . '))))'] + = "base64_decode( preg_replace('/\s+/', ''," . PHP_EOL . $this->_t(2) . "'" . - wordwrap(base64_encode($value), 64, PHP_EOL . $this->_t(2), true) . + wordwrap( + base64_encode($value), 64, PHP_EOL . $this->_t(2), true + ) . "'))"; } + // update the script return $this->setPlaceholders($script, $locker); } + return $script; } diff --git a/admin/helpers/compiler/b_Structure.php b/admin/helpers/compiler/b_Structure.php index caea7cafb..858847f38 100644 --- a/admin/helpers/compiler/b_Structure.php +++ b/admin/helpers/compiler/b_Structure.php @@ -2634,11 +2634,13 @@ class Structure extends Get { // get the fields ids $ids = array_map( - 'trim', explode( - ',', ComponentbuilderHelper::getBetween( - $multi_field['settings']->xml, 'fields="', '"' - ) - ) + 'trim', + explode( + ',', + ComponentbuilderHelper::getBetween( + $multi_field['settings']->xml, 'fields="', '"' + ) + ) ); if (ComponentbuilderHelper::checkArray($ids)) { diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php index 306ec094e..3ec806ce1 100644 --- a/admin/helpers/compiler/c_Fields.php +++ b/admin/helpers/compiler/c_Fields.php @@ -5003,16 +5003,28 @@ class Fields extends Structure && $typeName != 'repeatable' && $typeName != 'subform')) { - $this->filterBuilder[$nameListCode][] = array('type' => $typeName, - 'multi' => $field['filter'], - 'code' => $name, - 'lang' => $listLangName, - 'database' => $nameSingleCode, - 'function' => ComponentbuilderHelper::safeString( - $name, 'F' - ), - 'custom' => $custom, - 'options' => $options); + // this pains me... but to avoid collusion + $filter_type_code = ComponentbuilderHelper::safeString( + $name . $field['filter'] . $typeName + ); + $filter_type_code = preg_replace('/_+/', '', $filter_type_code); + $filter_function_name = ComponentbuilderHelper::safeString( + $name, 'F' + ); + // add the filter details + $this->filterBuilder[$nameListCode][] = array( + 'id' => (int) $field['field'], + 'type' => $typeName, + 'multi' => $field['filter'], + 'code' => $name, + 'label' => $langLabel, + 'lang' => $listLangName, + 'database' => $nameSingleCode, + 'function' => $filter_function_name, + 'custom' => $custom, + 'options' => $options, + 'filter_type' => $filter_type_code + ); } // build the layout @@ -5148,7 +5160,7 @@ class Fields extends Structure } // start loading the field type $this->fileContentDynamic['customfield_' . $data['type']] = array(); - // JPREFIX <Multi Filter Error'), + 'Error' + ); + $field_url + = "index.php?option=com_componentbuilder&view=fields&task=field.edit&id=" + . $filter['id']; + $field_fix + = "if (\$this->multiple === false) { // <-- this if statement is needed"; + $field_fix .= PHP_EOL . $this->_t(1) + . "\$options[] = JHtml::_('select.option', '', 'Select an option'); // <-- the empty option"; + $field_fix .= PHP_EOL . "}"; + $this->app->enqueueMessage( + JText::sprintf( + 'We detected that you have an empty option in a custom field (%s) that is used in a multi filter. This will cause a problem, you will need to add the following code to it. %s', + $field_url, + $filter['code'], + $field_fix + ), 'Error' + ); + } + } + // divert the code to a file if this is not a funtion path + if (!$funtion_path + && ComponentbuilderHelper::checkArray( + $function + )) + { + // set the filter file + $this->setFilterFieldFile( + implode(PHP_EOL, $function), $filter + ); + // clear the filter out + $function = array(); } } - if (ComponentbuilderHelper::checkArray($function)) + // if this is a function path, return the function if set + if ($funtion_path && ComponentbuilderHelper::checkArray($function)) { // return the function return PHP_EOL . implode(PHP_EOL, $function); @@ -17758,15 +17845,26 @@ class Interpretation extends Fields } /** - * build other filter loading scripts + * build sidebar filter loading scripts * - * @param string $nameListCode The list view name + * @param string $nameSingleCode The single view name + * @param string $nameListCode The list view name * * @return string The php to place in view.html.php * */ - public function setOtherFilter(&$nameListCode) - { + public function setFilterFieldSidebarDisplayHelper(&$nameSingleCode, + &$nameListCode + ) { + // start the filter bucket + $fieldFilters = array(); + // add the default filter + $this->setDefaultSidebarFilterHelper( + $fieldFilters, $nameSingleCode, $nameListCode + ); + // add the category filter stuff + $this->setCategorySidebarFilterHelper($fieldFilters, $nameListCode); + // check if filter fields are added if (isset($this->adminFilterType[$nameListCode]) && $this->adminFilterType[$nameListCode] == 1 && isset($this->filterBuilder[$nameListCode]) @@ -17775,88 +17873,72 @@ class Interpretation extends Fields )) { // get component name - $Component = $this->fileContentStatic[$this->hhh . 'Component' + $Component = $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh]; - $otherFilter = array(); + // load the rest of the filters foreach ($this->filterBuilder[$nameListCode] as $filter) { if ($filter['type'] != 'category' && ComponentbuilderHelper::checkArray($filter['custom']) && $filter['custom']['extends'] !== 'user') { - $CodeName = ComponentbuilderHelper::safeString( + $CodeName = ComponentbuilderHelper::safeString( $filter['code'] . ' ' . $filter['custom']['text'], 'W' ); - $codeName = $filter['code'] + $codeName = $filter['code'] . ComponentbuilderHelper::safeString( $filter['custom']['text'], 'F' ); - $type = ComponentbuilderHelper::safeString( + $type = ComponentbuilderHelper::safeString( $filter['custom']['type'], 'F' ); - $otherFilter[] = PHP_EOL . $this->_t(2) . "//" + $fieldFilters[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $CodeName . " Selection"; - $otherFilter[] = $this->_t(2) . "\$this->" . $codeName + $fieldFilters[] = $this->_t(2) . "\$this->" . $codeName . "Options = JFormHelper::loadFieldType('" . $type . "')->options;"; - $otherFilter[] = $this->_t(2) . "//" . $this->setLine( + $fieldFilters[] = $this->_t(2) . "//" . $this->setLine( __LINE__ ) . " We do some sanitation for " . $CodeName . " filter"; - $otherFilter[] = $this->_t(2) . "if (" . $Component + $fieldFilters[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $codeName . "Options) &&"; - $otherFilter[] = $this->_t(3) . "isset(\$this->" . $codeName + $fieldFilters[] = $this->_t(3) . "isset(\$this->" + . $codeName . "Options[0]->value) &&"; - $otherFilter[] = $this->_t(3) . "!" . $Component + $fieldFilters[] = $this->_t(3) . "!" . $Component . "Helper::checkString(\$this->" . $codeName . "Options[0]->value))"; - $otherFilter[] = $this->_t(2) . "{"; - $otherFilter[] = $this->_t(3) . "unset(\$this->" . $codeName + $fieldFilters[] = $this->_t(2) . "{"; + $fieldFilters[] = $this->_t(3) . "unset(\$this->" + . $codeName . "Options[0]);"; - $otherFilter[] = $this->_t(2) . "}"; - $otherFilter[] = $this->_t(2) . "//" . $this->setLine( + $fieldFilters[] = $this->_t(2) . "}"; + $fieldFilters[] = $this->_t(2) . "//" . $this->setLine( __LINE__ ) . " Only load " . $CodeName . " filter if it has values"; - $otherFilter[] = $this->_t(2) . "if (" . $Component + $fieldFilters[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $codeName . "Options))"; - $otherFilter[] = $this->_t(2) . "{"; - $otherFilter[] = $this->_t(3) . "//" . $this->setLine( + $fieldFilters[] = $this->_t(2) . "{"; + $fieldFilters[] = $this->_t(3) . "//" . $this->setLine( __LINE__ ) . " " . $CodeName . " Filter"; - $otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter("; - $otherFilter[] = $this->_t(4) . "'- Select '.JText:" + $fieldFilters[] = $this->_t(3) . "JHtmlSidebar::addFilter("; + $fieldFilters[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',"; - $otherFilter[] = $this->_t(4) . "'filter_" . $filter['code'] + $fieldFilters[] = $this->_t(4) . "'filter_" + . $filter['code'] . "',"; - $otherFilter[] = $this->_t(4) + $fieldFilters[] = $this->_t(4) . "JHtml::_('select.options', \$this->" . $codeName . "Options, 'value', 'text', \$this->state->get('filter." . $filter['code'] . "'))"; - $otherFilter[] = $this->_t(3) . ");"; - - $otherFilter[] = PHP_EOL . $this->_t(3) - . "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; - $otherFilter[] = $this->_t(3) . "{"; - $otherFilter[] = $this->_t(4) . "//" . $this->setLine( - __LINE__ - ) . " " . $CodeName . " Batch Selection"; - $otherFilter[] = $this->_t(4) - . "JHtmlBatch_::addListSelection("; - $otherFilter[] = $this->_t(5) . "'- Keep Original '.JText:" - . ":_('" . $filter['lang'] . "').' -',"; - $otherFilter[] = $this->_t(5) . "'batch[" . $filter['code'] - . "]',"; - $otherFilter[] = $this->_t(5) - . "JHtml::_('select.options', \$this->" . $codeName - . "Options, 'value', 'text')"; - $otherFilter[] = $this->_t(4) . ");"; - $otherFilter[] = $this->_t(3) . "}"; - - $otherFilter[] = $this->_t(2) . "}"; + $fieldFilters[] = $this->_t(3) . ");"; + $fieldFilters[] = $this->_t(2) . "}"; } elseif ($filter['type'] != 'category') { @@ -17877,82 +17959,384 @@ class Interpretation extends Fields $functionName = "\$this->getThe" . $filter['function'] . "Selections();"; } - $otherFilter[] = PHP_EOL . $this->_t(2) . "//" + $fieldFilters[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Set " . $Codename . " Selection"; - $otherFilter[] = $this->_t(2) . "\$this->" . $filter['code'] + $fieldFilters[] = $this->_t(2) . "\$this->" + . $filter['code'] . "Options = " . $functionName; - $otherFilter[] = $this->_t(2) . "//" . $this->setLine( + $fieldFilters[] = $this->_t(2) . "//" . $this->setLine( __LINE__ ) . " We do some sanitation for " . $Codename . " filter"; - $otherFilter[] = $this->_t(2) . "if (" . $Component + $fieldFilters[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $filter['code'] . "Options) &&"; - $otherFilter[] = $this->_t(3) . "isset(\$this->" + $fieldFilters[] = $this->_t(3) . "isset(\$this->" . $filter['code'] . "Options[0]->value) &&"; - $otherFilter[] = $this->_t(3) . "!" . $Component + $fieldFilters[] = $this->_t(3) . "!" . $Component . "Helper::checkString(\$this->" . $filter['code'] . "Options[0]->value))"; - $otherFilter[] = $this->_t(2) . "{"; - $otherFilter[] = $this->_t(3) . "unset(\$this->" + $fieldFilters[] = $this->_t(2) . "{"; + $fieldFilters[] = $this->_t(3) . "unset(\$this->" . $filter['code'] . "Options[0]);"; - $otherFilter[] = $this->_t(2) . "}"; - $otherFilter[] = $this->_t(2) . "//" . $this->setLine( + $fieldFilters[] = $this->_t(2) . "}"; + $fieldFilters[] = $this->_t(2) . "//" . $this->setLine( __LINE__ ) . " Only load " . $Codename . " filter if it has values"; - $otherFilter[] = $this->_t(2) . "if (" . $Component + $fieldFilters[] = $this->_t(2) . "if (" . $Component . "Helper::checkArray(\$this->" . $filter['code'] . "Options))"; - $otherFilter[] = $this->_t(2) . "{"; - $otherFilter[] = $this->_t(3) . "//" . $this->setLine( + $fieldFilters[] = $this->_t(2) . "{"; + $fieldFilters[] = $this->_t(3) . "//" . $this->setLine( __LINE__ ) . " " . $Codename . " Filter"; - $otherFilter[] = $this->_t(3) . "JHtmlSidebar::addFilter("; - $otherFilter[] = $this->_t(4) . "'- Select '.JText:" + $fieldFilters[] = $this->_t(3) . "JHtmlSidebar::addFilter("; + $fieldFilters[] = $this->_t(4) . "'- Select '.JText:" . ":_('" . $filter['lang'] . "').' -',"; - $otherFilter[] = $this->_t(4) . "'filter_" . $filter['code'] + $fieldFilters[] = $this->_t(4) . "'filter_" + . $filter['code'] . "',"; - $otherFilter[] = $this->_t(4) + $fieldFilters[] = $this->_t(4) . "JHtml::_('select.options', \$this->" . $filter['code'] . "Options, 'value', 'text', \$this->state->get('filter." . $filter['code'] . "'))"; - $otherFilter[] = $this->_t(3) . ");"; + $fieldFilters[] = $this->_t(3) . ");"; - $otherFilter[] = PHP_EOL . $this->_t(3) - . "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; - $otherFilter[] = $this->_t(3) . "{"; - $otherFilter[] = $this->_t(4) . "//" . $this->setLine( - __LINE__ - ) . " " . $Codename . " Batch Selection"; - $otherFilter[] = $this->_t(4) - . "JHtmlBatch_::addListSelection("; - $otherFilter[] = $this->_t(5) . "'- Keep Original '.JText:" - . ":_('" . $filter['lang'] . "').' -',"; - $otherFilter[] = $this->_t(5) . "'batch[" . $filter['code'] - . "]',"; - $otherFilter[] = $this->_t(5) - . "JHtml::_('select.options', \$this->" - . $filter['code'] . "Options, 'value', 'text')"; - $otherFilter[] = $this->_t(4) . ");"; - $otherFilter[] = $this->_t(3) . "}"; - - $otherFilter[] = $this->_t(2) . "}"; + $fieldFilters[] = $this->_t(2) . "}"; } } - if (ComponentbuilderHelper::checkArray($otherFilter)) - { - // return the filter - return PHP_EOL . implode(PHP_EOL, $otherFilter); - } + } + // did we find filters + if (ComponentbuilderHelper::checkArray($fieldFilters)) + { + // return the filter + return PHP_EOL . implode(PHP_EOL, $fieldFilters); } return ''; } - public function setCategoryFilter($nameListCode) + /** + * add default filter helper + * + * @param array $filter The batch code array + * @param string $nameSingleCode The single view name + * @param string $nameListCode The list view name + * + * @return void + * + */ + protected function setDefaultSidebarFilterHelper(&$filter, &$nameSingleCode, + &$nameListCode + ) { + // add the default filters if we are on the old filter paths + if (isset($this->adminFilterType[$nameListCode]) + && $this->adminFilterType[$nameListCode] == 1) + { + // set batch + $filter[] = PHP_EOL . $this->_t(2) + . "//" . $this->setLine(__LINE__) + . " Only load publish filter if state change is allowed"; + $filter[] = $this->_t(2) + . "if (\$this->canState)"; + $filter[] = $this->_t(2) . "{"; + $filter[] = $this->_t(3) . "JHtmlSidebar::addFilter("; + $filter[] = $this->_t(4) . "JText:" + . ":_('JOPTION_SELECT_PUBLISHED'),"; + $filter[] = $this->_t(4) . "'filter_published',"; + $filter[] = $this->_t(4) + . "JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', \$this->state->get('filter.published'), true)"; + $filter[] = $this->_t(3) . ");"; + $filter[] = $this->_t(2) . "}"; + // check if view has access + if (isset($this->accessBuilder[$nameSingleCode]) + && ComponentbuilderHelper::checkString( + $this->accessBuilder[$nameSingleCode] + ) + && !isset($this->fieldsNames[$nameSingleCode]['access'])) + { + $filter[] = PHP_EOL . $this->_t(2) . "JHtmlSidebar::addFilter("; + $filter[] = $this->_t(3) . "JText:" + . ":_('JOPTION_SELECT_ACCESS'),"; + $filter[] = $this->_t(3) . "'filter_access',"; + $filter[] = $this->_t(3) + . "JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', \$this->state->get('filter.access'))"; + $filter[] = $this->_t(2) . ");"; + } + } + } + + /** + * build category sidebar display filter helper + * + * @param array $filter The filter code array + * @param string $nameListCode The list view name + * + * @return void + * + */ + protected function setCategorySidebarFilterHelper(&$filter, &$nameListCode) + { + // add the category filter if we are on the old filter paths + if (isset($this->adminFilterType[$nameListCode]) + && $this->adminFilterType[$nameListCode] == 1 + && isset($this->categoryBuilder[$nameListCode]) + && ComponentbuilderHelper::checkArray( + $this->categoryBuilder[$nameListCode] + ) + && isset($this->categoryBuilder[$nameListCode]['extension'])) + { + // set filter + $filter[] = PHP_EOL . $this->_t(2) . "//" + . $this->setLine(__LINE__) . " Category Filter."; + $filter[] = $this->_t(2) . "JHtmlSidebar::addFilter("; + $filter[] = $this->_t(3) . "JText:" + . ":_('JOPTION_SELECT_CATEGORY'),"; + $filter[] = $this->_t(3) . "'filter_category_id',"; + $filter[] = $this->_t(3) + . "JHtml::_('select.options', JHtml::_('category.options', '" + . $this->categoryBuilder[$nameListCode]['extension'] + . "'), 'value', 'text', \$this->state->get('filter.category_id'))"; + $filter[] = $this->_t(2) . ");"; + } + } + + /** + * build batch loading helper scripts + * + * @param string $nameSingleCode The single view name + * @param string $nameListCode The list view name + * + * @return string The php to place in view.html.php + * + */ + public function setBatchDisplayHelper(&$nameSingleCode, &$nameListCode) + { + // start the batch bucket + $fieldBatch = array(); + // add the default batch + $this->setDefaultBatchHelper($fieldBatch, $nameSingleCode); + // add the category filter stuff + $this->setCategoryBatchHelper($fieldBatch, $nameListCode); + // check if we have other batch options to add + if (isset($this->filterBuilder[$nameListCode]) + && ComponentbuilderHelper::checkArray( + $this->filterBuilder[$nameListCode] + )) + { + // check if we should add some help to get the values + $get_values = false; + if (isset($this->adminFilterType[$nameListCode]) + && $this->adminFilterType[$nameListCode] == 2) + { + // since the old path is not used, we need to add those values here + $get_values = true; + } + // get component name + $Component = $this->fileContentStatic[$this->hhh . 'Component' + . $this->hhh]; + // load the rest of the batch options + foreach ($this->filterBuilder[$nameListCode] as $filter) + { + if ($filter['type'] != 'category' + && ComponentbuilderHelper::checkArray($filter['custom']) + && $filter['custom']['extends'] !== 'user') + { + $CodeName = ComponentbuilderHelper::safeString( + $filter['code'] . ' ' . $filter['custom']['text'], 'W' + ); + $codeName = $filter['code'] + . ComponentbuilderHelper::safeString( + $filter['custom']['text'], 'F' + ); + $fieldBatch[] = PHP_EOL . $this->_t(2) + . "//" . $this->setLine(__LINE__) + . " Only load " . $CodeName + . " batch if create, edit, and batch is allowed"; + $fieldBatch[] = $this->_t(2) + . "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; + $fieldBatch[] = $this->_t(2) . "{"; + // add the get values here + if ($get_values) + { + $type = ComponentbuilderHelper::safeString( + $filter['custom']['type'], 'F' + ); + $fieldBatch[] = $this->_t(3) . "//" + . $this->setLine(__LINE__) . " Set " . $CodeName + . " Selection"; + $fieldBatch[] = $this->_t(3) . "\$this->" . $codeName + . "Options = JFormHelper::loadFieldType('" . $type + . "')->options;"; + $fieldBatch[] = $this->_t(3) . "//" . $this->setLine( + __LINE__ + ) . " We do some sanitation for " . $CodeName + . " filter"; + $fieldBatch[] = $this->_t(3) . "if (" . $Component + . "Helper::checkArray(\$this->" . $codeName + . "Options) &&"; + $fieldBatch[] = $this->_t(4) . "isset(\$this->" + . $codeName + . "Options[0]->value) &&"; + $fieldBatch[] = $this->_t(4) . "!" . $Component + . "Helper::checkString(\$this->" . $codeName + . "Options[0]->value))"; + $fieldBatch[] = $this->_t(3) . "{"; + $fieldBatch[] = $this->_t(4) . "unset(\$this->" + . $codeName + . "Options[0]);"; + $fieldBatch[] = $this->_t(3) . "}"; + } + $fieldBatch[] = $this->_t(3) . "//" . $this->setLine( + __LINE__ + ) . " " . $CodeName . " Batch Selection"; + $fieldBatch[] = $this->_t(3) + . "JHtmlBatch_::addListSelection("; + $fieldBatch[] = $this->_t(4) . "'- Keep Original '.JText:" + . ":_('" . $filter['lang'] . "').' -',"; + $fieldBatch[] = $this->_t(4) . "'batch[" . $filter['code'] + . "]',"; + $fieldBatch[] = $this->_t(4) + . "JHtml::_('select.options', \$this->" . $codeName + . "Options, 'value', 'text')"; + $fieldBatch[] = $this->_t(3) . ");"; + $fieldBatch[] = $this->_t(2) . "}"; + } + elseif ($filter['type'] != 'category') + { + $CodeName = ComponentbuilderHelper::safeString( + $filter['code'], 'W' + ); + + $fieldBatch[] = PHP_EOL . $this->_t(2) + . "//" . $this->setLine(__LINE__) + . " Only load " . $CodeName + . " batch if create, edit, and batch is allowed"; + $fieldBatch[] = $this->_t(2) + . "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; + $fieldBatch[] = $this->_t(2) . "{"; + // add the get values here + if ($get_values) + { + $fieldBatch[] = $this->_t(3) . "//" + . $this->setLine(__LINE__) . " Set " . $CodeName + . " Selection"; + $fieldBatch[] = $this->_t(3) . "\$this->" + . $filter['code'] + . "Options = JFormHelper::loadFieldType('" + . $filter['filter_type'] + . "')->options;"; + $fieldBatch[] = $this->_t(3) . "//" . $this->setLine( + __LINE__ + ) . " We do some sanitation for " . $CodeName + . " filter"; + $fieldBatch[] = $this->_t(3) . "if (" . $Component + . "Helper::checkArray(\$this->" . $filter['code'] + . "Options) &&"; + $fieldBatch[] = $this->_t(4) . "isset(\$this->" + . $filter['code'] . "Options[0]->value) &&"; + $fieldBatch[] = $this->_t(4) . "!" . $Component + . "Helper::checkString(\$this->" . $filter['code'] + . "Options[0]->value))"; + $fieldBatch[] = $this->_t(3) . "{"; + $fieldBatch[] = $this->_t(4) . "unset(\$this->" + . $filter['code'] . "Options[0]);"; + $fieldBatch[] = $this->_t(3) . "}"; + } + $fieldBatch[] = $this->_t(3) . "//" . $this->setLine( + __LINE__ + ) . " " . $CodeName . " Batch Selection"; + $fieldBatch[] = $this->_t(3) + . "JHtmlBatch_::addListSelection("; + $fieldBatch[] = $this->_t(4) . "'- Keep Original '.JText:" + . ":_('" . $filter['lang'] . "').' -',"; + $fieldBatch[] = $this->_t(4) . "'batch[" . $filter['code'] + . "]',"; + $fieldBatch[] = $this->_t(4) + . "JHtml::_('select.options', \$this->" + . $filter['code'] . "Options, 'value', 'text')"; + $fieldBatch[] = $this->_t(3) . ");"; + $fieldBatch[] = $this->_t(2) . "}"; + } + } + } + // did we find batch options + if (ComponentbuilderHelper::checkArray($fieldBatch)) + { + // return the batch + return PHP_EOL . implode(PHP_EOL, $fieldBatch); + } + + return ''; + } + + /** + * add default batch helper + * + * @param array $batch The batch code array + * @param string $nameSingleCode The single view name + * + * @return void + * + */ + protected function setDefaultBatchHelper(&$batch, &$nameSingleCode) + { + // set component name + $COPMONENT = ComponentbuilderHelper::safeString( + $this->componentData->name_code, 'U' + ); + // set batch + $batch[] = PHP_EOL . $this->_t(2) + . "//" . $this->setLine(__LINE__) + . " Only load published batch if state and batch is allowed"; + $batch[] = $this->_t(2) + . "if (\$this->canState && \$this->canBatch)"; + $batch[] = $this->_t(2) . "{"; + $batch[] = $this->_t(3) . "JHtmlBatch_::addListSelection("; + $batch[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT + . "_KEEP_ORIGINAL_STATE'),"; + $batch[] = $this->_t(4) . "'batch[published]',"; + $batch[] = $this->_t(4) + . "JHtml::_('select.options', JHtml::_('jgrid.publishedOptions', array('all' => false)), 'value', 'text', '', true)"; + $batch[] = $this->_t(3) . ");"; + $batch[] = $this->_t(2) . "}"; + // check if view has access + if (isset($this->accessBuilder[$nameSingleCode]) + && ComponentbuilderHelper::checkString( + $this->accessBuilder[$nameSingleCode] + ) + && !isset($this->fieldsNames[$nameSingleCode]['access'])) + { + $batch[] = PHP_EOL . $this->_t(2) + . "//" . $this->setLine(__LINE__) + . " Only load access batch if create, edit and batch is allowed"; + $batch[] = $this->_t(2) + . "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; + $batch[] = $this->_t(2) . "{"; + $batch[] = $this->_t(3) . "JHtmlBatch_::addListSelection("; + $batch[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT + . "_KEEP_ORIGINAL_ACCESS'),"; + $batch[] = $this->_t(4) . "'batch[access]',"; + $batch[] = $this->_t(4) + . "JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text')"; + $batch[] = $this->_t(3) . ");"; + $batch[] = $this->_t(2) . "}"; + } + } + + /** + * build category batch helper + * + * @param array $batch The batch code array + * @param string $nameListCode The list view name + * + * @return mixed The php to place in view.html.php + * + */ + protected function setCategoryBatchHelper(&$batch, &$nameListCode) { if (isset($this->categoryBuilder[$nameListCode]) && ComponentbuilderHelper::checkArray( @@ -17965,41 +18349,22 @@ class Interpretation extends Fields $this->componentData->name_code, 'U' ); // set filter - $filter = array(); - $filter[] = PHP_EOL . PHP_EOL . $this->_t(2) . "//" - . $this->setLine(__LINE__) . " Category Filter."; - $filter[] = $this->_t(2) . "JHtmlSidebar::addFilter("; - $filter[] = $this->_t(3) . "JText:" - . ":_('JOPTION_SELECT_CATEGORY'),"; - $filter[] = $this->_t(3) . "'filter_category_id',"; - $filter[] = $this->_t(3) - . "JHtml::_('select.options', JHtml::_('category.options', '" - . $this->categoryBuilder[$nameListCode]['extension'] - . "'), 'value', 'text', \$this->state->get('filter.category_id'))"; - $filter[] = $this->_t(2) . ");"; - - - $filter[] = PHP_EOL . $this->_t(2) + $batch[] = PHP_EOL . $this->_t(2) . "if (\$this->canBatch && \$this->canCreate && \$this->canEdit)"; - $filter[] = $this->_t(2) . "{"; - $filter[] = $this->_t(3) . "//" . $this->setLine(__LINE__) + $batch[] = $this->_t(2) . "{"; + $batch[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Category Batch selection."; - $filter[] = $this->_t(3) . "JHtmlBatch_::addListSelection("; - $filter[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT + $batch[] = $this->_t(3) . "JHtmlBatch_::addListSelection("; + $batch[] = $this->_t(4) . "JText:" . ":_('COM_" . $COPMONENT . "_KEEP_ORIGINAL_CATEGORY'),"; - $filter[] = $this->_t(4) . "'batch[category]',"; - $filter[] = $this->_t(4) + $batch[] = $this->_t(4) . "'batch[category]',"; + $batch[] = $this->_t(4) . "JHtml::_('select.options', JHtml::_('category.options', '" . $this->categoryBuilder[$nameListCode]['extension'] . "'), 'value', 'text')"; - $filter[] = $this->_t(3) . ");"; - $filter[] = $this->_t(2) . "}"; - - // return the filter - return implode(PHP_EOL, $filter); + $batch[] = $this->_t(3) . ");"; + $batch[] = $this->_t(2) . "}"; } - - return ''; } public function setRouterCategoryViews($nameSingleCode, $nameListCode) @@ -19731,7 +20096,7 @@ class Interpretation extends Fields * @return string The code for the filter fields array * */ - public function setFilterFields(&$nameListCode) + public function setFilterFieldsArray(&$nameListCode) { // keep track of all fields already added $donelist = array('id' => true, 'search' => true, @@ -20355,8 +20720,9 @@ class Interpretation extends Fields protected function getPopulateStateFilterCode(&$filter, $new_filter, $extra = '' ) { + $state = ''; // add category stuff (may still remove these) TODO - if ($filter['type'] === 'category') + if (isset($filter['type']) && $filter['type'] === 'category') { $state .= PHP_EOL . PHP_EOL . $this->_t(2) . "\$category = \$app->getUserStateFromRequest(\$this->context . '.filter.category', 'filter_category');"; @@ -20368,7 +20734,7 @@ class Interpretation extends Fields . "\$this->setState('filter.category_id', \$categoryId);"; } // always add the default filter - $state = PHP_EOL . PHP_EOL . $this->_t(2) . "\$" . $filter['code'] + $state .= PHP_EOL . PHP_EOL . $this->_t(2) . "\$" . $filter['code'] . " = \$this->getUserStateFromRequest(\$this->context . '.filter." . $filter['code'] . "', 'filter_" . $filter['code'] . "'" . $extra . ");"; @@ -21279,6 +21645,15 @@ class Interpretation extends Fields return $script . $forEachStart . $fix; } + /** + * Build headers for the model/view/controller headers + * + * @param string $context The name of the context + * @param string $viewsCodeName The view or views name + * + * @return string The php to place in the header + * + */ public function setClassHeaders($context, $viewsCodeName) { // set the defaults @@ -21291,6 +21666,34 @@ class Interpretation extends Fields $headers[] = 'use Joomla\String\StringHelper;'; $headers[] = 'use Joomla\Utilities\ArrayHelper;'; break; + case 'admin.view': + case 'custom.admin.view': + case 'custom.admin.views': + case 'site.admin.view': + $headers[] + = 'JHtml::addIncludePath(JPATH_COMPONENT.\'/helpers/html\');'; + $headers[] = 'JHtml::_(\'behavior.tooltip\');'; + $headers[] = 'JHtml::_(\'behavior.formvalidation\');'; + $headers[] = 'JHtml::_(\'formbehavior.chosen\', \'select\');'; + $headers[] = 'JHtml::_(\'behavior.keepalive\');'; + if ($context === 'site.admin.view') + { + $headers[] = 'JHtml::_(\'behavior.tabstate\');'; + $headers[] = 'JHtml::_(\'behavior.calendar\');'; + } + break; + case 'admin.views': + $headers[] = 'JHtml::_(\'behavior.tooltip\');'; + $headers[] = 'JHtml::_(\'behavior.multiselect\');'; + $headers[] = 'JHtml::_(\'dropdown.init\');'; + // add more headers if the new filter option is used + $this->setChosenMultiSelectionHeaders($headers, $viewsCodeName); + $headers[] = 'JHtml::_(\'formbehavior.chosen\', \'select\');'; + break; + case 'site.view': + case 'site.views': + $headers = array(); + break; default: $headers[] = 'use Joomla\Utilities\ArrayHelper;'; break; @@ -21301,9 +21704,62 @@ class Interpretation extends Fields array(&$this->componentContext, &$context, &$viewsCodeName, &$headers) ); + // check if headers were added + if (ComponentbuilderHelper::checkArray($headers)) + { + // return the headers + return implode(PHP_EOL, $headers); + } - // return the headers - return implode(PHP_EOL, $headers); + return ''; + } + + /** + * Build chosen multi selection headers for the view + * + * @param array $headers The headers array + * @param string $nameListCode The list view name + * + * @return void + * + */ + protected function setChosenMultiSelectionHeaders(&$headers, $nameListCode) + { + // check that the filter type is the new filter option + if (isset($this->adminFilterType[$nameListCode]) + && $this->adminFilterType[$nameListCode] == 2 + && isset($this->filterBuilder[$nameListCode]) + && ComponentbuilderHelper::checkArray( + $this->filterBuilder[$nameListCode] + )) + { + // main lang prefix + $lang_ = $this->langPrefix . '_FILTER_'; + foreach ($this->filterBuilder[$nameListCode] as $filter) + { + // we need this only for filters that are multi + if (isset($filter['multi']) + && $filter['multi'] == 2) + { + // set the selection string (not ideal) + $select_name = "Select " . strip_tags($filter['name']); + // set the language + $select_lang = $lang_ . ComponentbuilderHelper::safeString( + $select_name, 'U' + ); + // set selection lang + $this->setLangContent( + $this->lang, $select_lang, $select_name + ); + // add the header + $headers[] + = 'JHtml::_(\'formbehavior.chosen\', \'.multiple' + . $filter['class'] + . '\', null, array(\'placeholder_text_multiple\' => JText::_(\'' + . $select_lang . '\')));'; + } + } + } } protected function setModelFieldRelation($item, $nameListCode, $tab) diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php index 9457d79a6..71c2114d4 100644 --- a/admin/helpers/compiler/f_Infusion.php +++ b/admin/helpers/compiler/f_Infusion.php @@ -631,7 +631,7 @@ class Infusion extends Interpretation $nameSingleCode, $view ); } - // SITE_VIEW_CONTROLLER_HEADER <<
- listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+ ', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
|
@@ -30,17 +30,17 @@ defined('_JEXEC') or die('Restricted access');
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
canState): ?>
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
@@ -48,6 +48,6 @@ defined('_JEXEC') or die('Restricted access');
|
- listDirn, $this->listOrder); ?>
+ listDirn, $this->listOrder); ?>
|
' . JText::_('COM_COMPONENTBUILDER_HI') . ' ' . $this->user->name . ''; $selectNotice .= '' . JText::_('COM_COMPONENTBUILDER_PLEASE_SELECT_A_COMPONENT_THAT_YOU_WOULD_LIKE_TO_COMPILE') . ' '; - -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); -JHtml::_('behavior.tooltip'); -JHtml::_('behavior.formvalidation'); -JHtml::_('formbehavior.chosen', 'select'); -JHtml::_('behavior.keepalive'); ?> canDo->get('compiler.access')): ?>
--
2.40.1
From 9d9c8e664e47ab037c008759855eda64008132d2 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-###VIEWS_FOOTER_SCRIPT###
\ No newline at end of file
+###VIEWS_DEFAULT_BODY######VIEWS_FOOTER_SCRIPT###
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 1a70d4d6b..35eb9410b 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -11934,6 +11934,146 @@ class Interpretation extends Fields
? $this->listFieldClass[$nameListCode][$name] : $default;
}
+ /**
+ * set the default views body
+ *
+ * @param string $nameSingleCode
+ * @param string $nameListCode
+ *
+ * @return string
+ */
+ public function setDefaultViewsBody($nameSingleCode, $nameListCode)
+ {
+ // set component name
+ $component = $this->componentCodeName;
+ $Component = ucfirst($component);
+ $COMPONENT = strtoupper($component);
+ // set uppercase view
+ $VIEWS = strtoupper($nameListCode);
+
+ // build the body
+ $body = array();
+ // check if the filter type is sidebar
+ if (isset($this->adminFilterType[$nameListCode])
+ && $this->adminFilterType[$nameListCode] == 1)
+ {
+ $body[] = "";
+ }
+ $body[] = "
-
-
-
- loadTemplate('toolbar');?>
- ";
+ $body[] = $this->_t(2) . "sidebar; ?>";
+ $body[] = $this->_t(1) . " ";
+ $body[] = $this->_t(1)
+ . "";
+ $body[] = "";
+ $body[] = $this->_t(1) . " ";
+ $body[] = "";
+ // check if the filter type is sidebar
+ if (isset($this->adminFilterType[$nameListCode])
+ && $this->adminFilterType[$nameListCode] == 2)
+ {
+ $body[] = "_t(1) . "//" . $this->setLine(
+ __LINE__
+ ) . " Add the searchtools";
+ $body[] = $this->_t(1)
+ . "echo JLayoutHelper::render('joomla.searchtools.default', array('view' => \$this));";
+ $body[] = "?>";
+ }
+ $body[] = "items)): ?>";
+ // check if the filter type is sidebar
+ if (isset($this->adminFilterType[$nameListCode])
+ && $this->adminFilterType[$nameListCode] == 1)
+ {
+ $body[] = $this->_t(1)
+ . "loadTemplate('toolbar');?>";
+ }
+ $body[] = $this->_t(1)
+ . " ";
+ $body[] = "";
+ $body[] = $this->_t(1)
+ . "";
+ $body[] = $this->_t(1) . "";
+ $body[] = "";
+
+ return implode(PHP_EOL, $body);
+ }
+
/**
* set the list body table head
*
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 71c2114d4..d3a69a991 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -510,7 +510,7 @@ class Infusion extends Interpretation
. 'EDITBODY' . $this->hhh]
= $this->setEditBody($view);
- // EDITBODY <<";
+ $body[] = $this->_t(2)
+ . "";
+ $body[] = $this->_t(1) . " ";
+ $body[] = "";
+ // check if the filter type is sidebar
+ if (isset($this->adminFilterType[$nameListCode])
+ && $this->adminFilterType[$nameListCode] == 1)
+ {
+ $body[] = $this->_t(1)
+ . "loadTemplate('toolbar');?>";
+ }
+ $body[] = $this->_t(1) . "
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
\ No newline at end of file
+
diff --git a/admin/views/admins_custom_tabs/tmpl/default.php b/admin/views/admins_custom_tabs/tmpl/default.php
index fc3753653..8ee23facd 100644
--- a/admin/views/admins_custom_tabs/tmpl/default.php
+++ b/admin/views/admins_custom_tabs/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admins_custom_tabs.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'admin_custom_tabsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/admins_fields/tmpl/default.php b/admin/views/admins_fields/tmpl/default.php
index 4a070c198..a90540ce7 100644
--- a/admin/views/admins_fields/tmpl/default.php
+++ b/admin/views/admins_fields/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admins_fields.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'admin_fieldsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/admins_fields_conditions/tmpl/default.php b/admin/views/admins_fields_conditions/tmpl/default.php
index d0c534c2f..06fa8b440 100644
--- a/admin/views/admins_fields_conditions/tmpl/default.php
+++ b/admin/views/admins_fields_conditions/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admins_fields_conditions.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'admin_fields_conditionsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/admins_fields_relations/tmpl/default.php b/admin/views/admins_fields_relations/tmpl/default.php
index 6fbd76ba2..a111494b7 100644
--- a/admin/views/admins_fields_relations/tmpl/default.php
+++ b/admin/views/admins_fields_relations/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admins_fields_relations.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'admin_fields_relationsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/class_extendings/tmpl/default.php b/admin/views/class_extendings/tmpl/default.php
index 785b3799d..c63cc84da 100644
--- a/admin/views/class_extendings/tmpl/default.php
+++ b/admin/views/class_extendings/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=class_extendings.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'class_extendsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/class_methods/tmpl/default.php b/admin/views/class_methods/tmpl/default.php
index 3519498ee..d9daa5268 100644
--- a/admin/views/class_methods/tmpl/default.php
+++ b/admin/views/class_methods/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=class_methods.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'class_methodList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/class_properties/tmpl/default.php b/admin/views/class_properties/tmpl/default.php
index 987e7d216..8c970d170 100644
--- a/admin/views/class_properties/tmpl/default.php
+++ b/admin/views/class_properties/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=class_properties.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'class_propertyList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_admin_views/tmpl/default.php b/admin/views/components_admin_views/tmpl/default.php
index 76f10ee5f..890abcb92 100644
--- a/admin/views/components_admin_views/tmpl/default.php
+++ b/admin/views/components_admin_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_admin_views.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_admin_viewsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_config/tmpl/default.php b/admin/views/components_config/tmpl/default.php
index e58d0f782..f91110868 100644
--- a/admin/views/components_config/tmpl/default.php
+++ b/admin/views/components_config/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_config.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_configList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_custom_admin_menus/tmpl/default.php b/admin/views/components_custom_admin_menus/tmpl/default.php
index 39fb4e4ad..7130c4ae8 100644
--- a/admin/views/components_custom_admin_menus/tmpl/default.php
+++ b/admin/views/components_custom_admin_menus/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_custom_admin_menus.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_custom_admin_menusList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_custom_admin_views/tmpl/default.php b/admin/views/components_custom_admin_views/tmpl/default.php
index 16d158c9a..b64c13041 100644
--- a/admin/views/components_custom_admin_views/tmpl/default.php
+++ b/admin/views/components_custom_admin_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_custom_admin_views.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_custom_admin_viewsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_dashboard/tmpl/default.php b/admin/views/components_dashboard/tmpl/default.php
index 8ac5c9c3e..988dcd94c 100644
--- a/admin/views/components_dashboard/tmpl/default.php
+++ b/admin/views/components_dashboard/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_dashboard.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_dashboardList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_files_folders/tmpl/default.php b/admin/views/components_files_folders/tmpl/default.php
index 88d4d3d13..4b3395800 100644
--- a/admin/views/components_files_folders/tmpl/default.php
+++ b/admin/views/components_files_folders/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_files_folders.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_files_foldersList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_modules/tmpl/default.php b/admin/views/components_modules/tmpl/default.php
index 328bcce4d..24c6e5ead 100644
--- a/admin/views/components_modules/tmpl/default.php
+++ b/admin/views/components_modules/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_modules.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_modulesList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_mysql_tweaks/tmpl/default.php b/admin/views/components_mysql_tweaks/tmpl/default.php
index 78593ab7b..d074e9286 100644
--- a/admin/views/components_mysql_tweaks/tmpl/default.php
+++ b/admin/views/components_mysql_tweaks/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_mysql_tweaks.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_mysql_tweaksList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_placeholders/tmpl/default.php b/admin/views/components_placeholders/tmpl/default.php
index 0d3f05eab..d1f3b1124 100644
--- a/admin/views/components_placeholders/tmpl/default.php
+++ b/admin/views/components_placeholders/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_placeholders.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_placeholdersList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_plugins/tmpl/default.php b/admin/views/components_plugins/tmpl/default.php
index 9e207e653..661842ba8 100644
--- a/admin/views/components_plugins/tmpl/default.php
+++ b/admin/views/components_plugins/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_plugins.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_pluginsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_site_views/tmpl/default.php b/admin/views/components_site_views/tmpl/default.php
index cd0ce8f54..8a014e839 100644
--- a/admin/views/components_site_views/tmpl/default.php
+++ b/admin/views/components_site_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_site_views.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_site_viewsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/components_updates/tmpl/default.php b/admin/views/components_updates/tmpl/default.php
index 7a28fa75a..f8095541c 100644
--- a/admin/views/components_updates/tmpl/default.php
+++ b/admin/views/components_updates/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_updates.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'component_updatesList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php
index 43c6478d4..0f9e68ac6 100644
--- a/admin/views/custom_admin_views/tmpl/default.php
+++ b/admin/views/custom_admin_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=custom_admin_views.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'custom_admin_viewList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
-
-
\ No newline at end of file
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
+
diff --git a/admin/views/custom_codes/tmpl/default.php b/admin/views/custom_codes/tmpl/default.php
index bb4297f27..d592910ba 100644
--- a/admin/views/custom_codes/tmpl/default.php
+++ b/admin/views/custom_codes/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=custom_codes.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'custom_codeList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
\ No newline at end of file
+
diff --git a/admin/views/dynamic_gets/tmpl/default.php b/admin/views/dynamic_gets/tmpl/default.php
index 4db0b247a..a14c7a004 100644
--- a/admin/views/dynamic_gets/tmpl/default.php
+++ b/admin/views/dynamic_gets/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=dynamic_gets.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'dynamic_getList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
\ No newline at end of file
+
diff --git a/admin/views/fields/tmpl/default.php b/admin/views/fields/tmpl/default.php
index 5ab370a84..48137594f 100644
--- a/admin/views/fields/tmpl/default.php
+++ b/admin/views/fields/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=fields.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'fieldList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
-
-
-
-
+
+
-
-
-
- loadTemplate('toolbar');?>
-
+ sidebar; ?>
+
+
+
+
+
+items)): ?>
+ loadTemplate('toolbar');?>
+
+
+
+
\ No newline at end of file
+
diff --git a/admin/views/fieldtypes/tmpl/default.php b/admin/views/fieldtypes/tmpl/default.php
index 7d24f1f44..4efe559a8 100644
--- a/admin/views/fieldtypes/tmpl/default.php
+++ b/admin/views/fieldtypes/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=fieldtypes.saveOrderAjax&tmpl=component';
JHtml::_('sortablelist.sortable', 'fieldtypeList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
}
-
?>
-
-
+
+
+
+ loadTemplate('toolbar');?>
+
- sidebar; ?>
-
-
-
-
-
-items)): ?>
- loadTemplate('toolbar');?>
- |
---|