Stable release of v3.2.0-beta1

Move beta to main repo. Fix #1053 so that the right and left tabs display correctly in Joomla 4&5.
2024-03-02 22:10:30 +02:00
parent 3c91a5cdbb
commit d1e1a56671
1786 changed files with 73608 additions and 37437 deletions
--- a/admin/views/joomla_modules/tmpl/default.php
+++ b/admin/views/joomla_modules/tmpl/default.php
@@ -12,17 +12,24 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

-JHtml::_('behavior.multiselect');
-JHtml::_('dropdown.init');
-JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -'));
-JHtml::_('formbehavior.chosen', 'select');
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
+Html::_('behavior.multiselect');
+Html::_('dropdown.init');
+Html::_('formbehavior.chosen', 'select');
+Html::_('formbehavior.chosen', '.multipleAccessLevels', null, ['placeholder_text_multiple' => '- ' . Text::_('COM_COMPONENTBUILDER_FILTER_SELECT_ACCESS') . ' -']);
+
 if ($this->saveOrder)
 {
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_modules.saveOrderAjax&tmpl=component';
-	JHtml::_('sortablelist.sortable', 'joomla_moduleList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
+	Html::_('sortablelist.sortable', 'joomla_moduleList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_modules'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo Route::_('index.php?option=com_componentbuilder&view=joomla_modules'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if(!empty( $this->sidebar)): ?>
 	<div id="j-sidebar-container" class="span2">
 		<?php echo $this->sidebar; ?>
@@ -33,13 +40,13 @@ if ($this->saveOrder)
 <?php endif; ?>
 <?php
 	// Add the trash helper layout
-	echo JLayoutHelper::render('trashhelper', $this);
+	echo LayoutHelper::render('trashhelper', $this);
 	// Add the searchtools
-	echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+	echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this));
 ?>
 <?php if (empty($this->items)): ?>
 	<div class="alert alert-no-items">
-		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		<?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php else : ?>
 	<table class="table table-striped" id="joomla_moduleList">
@@ -49,11 +56,11 @@ if ($this->saveOrder)
 	</table>
 	<?php // Load the batch processing form. ?>
 	<?php if ($this->canCreate && $this->canEdit) : ?>
-		<?php echo JHtml::_(
+		<?php echo Html::_(
 			'bootstrap.renderModal',
 			'collapseModal',
 			array(
-				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_OPTIONS'),
+				'title' => Text::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_OPTIONS'),
 				'footer' => $this->loadTemplate('batch_footer')
 			),
 			$this->loadTemplate('batch_body')
@@ -63,28 +70,35 @@ if ($this->saveOrder)
 	</div>
 <?php endif; ?>
 	<input type="hidden" name="task" value="" />
-	<?php echo JHtml::_('form.token'); ?>
+	<?php echo Html::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // joomla_modules footer script

-// waiting spinner
-var outerDiv = jQuery('body');
-jQuery('<div id="loading"></div>')
-	.css("background", "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat")
-	.css("top", outerDiv.position().top - jQuery(window).scrollTop())
-	.css("left", outerDiv.position().left - jQuery(window).scrollLeft())
-	.css("width", outerDiv.width())
-	.css("height", outerDiv.height())
-	.css("position", "fixed")
-	.css("opacity", "0.80")
-	.css("-ms-filter", "progid:DXImageTransform.Microsoft.Alpha(Opacity = 80)")
-	.css("filter", "alpha(opacity = 80)")
-	.css("display", "none")
-	.appendTo(outerDiv);
+	// get page body
+	var outerBodyDiv = document.querySelector('body');
+
+	// start loading spinner
+	var loadingDiv = document.createElement('div');
+	loadingDiv.id = 'loading';
+
+	// Set CSS properties individually
+	loadingDiv.style.background = "rgba(255, 255, 255, .8) url('components/com_componentbuilder/assets/images/import.gif') 50% 15% no-repeat";
+	loadingDiv.style.top = (outerBodyDiv.getBoundingClientRect().top + window.pageYOffset) + "px";
+	loadingDiv.style.left = (outerBodyDiv.getBoundingClientRect().left + window.pageXOffset) + "px";
+	loadingDiv.style.width = outerBodyDiv.offsetWidth + "px";
+	loadingDiv.style.height = outerBodyDiv.offsetHeight + "px";
+	loadingDiv.style.position = 'fixed';
+	loadingDiv.style.opacity = '0.80';
+	loadingDiv.style.msFilter = "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	loadingDiv.style.filter = "alpha(opacity=80)";
+	loadingDiv.style.display = 'none';
+
+	// add to page body
+	outerBodyDiv.appendChild(loadingDiv);
 // when the build button is clicked
 jQuery('#toolbar').on('click',"button.button-joomla", function(e){
-	jQuery('#loading').show();
+	loadingDiv.style.display = 'block';
 });

 </script>
--- a/admin/views/joomla_modules/tmpl/default_batch_body.php
+++ b/admin/views/joomla_modules/tmpl/default_batch_body.php
@@ -12,7 +12,10 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
 ?>

-<p><?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_TIP'); ?></p>
+<p><?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_TIP'); ?></p>
 <?php echo $this->batchDisplay; ?>
--- a/admin/views/joomla_modules/tmpl/default_batch_footer.php
+++ b/admin/views/joomla_modules/tmpl/default_batch_footer.php
@@ -12,12 +12,14 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+
 ?>
 <!-- clear the batch values if cancel -->
 <button class="btn" type="button" onclick="" data-dismiss="modal">
-	<?php echo JText::_('JCANCEL'); ?>
+	<?php echo Text::_('JCANCEL'); ?>
 </button>
 <!-- post the batch values if process -->
 <button class="btn btn-success" type="submit" onclick="Joomla.submitbutton('joomla_module.batch');">
-	<?php echo JText::_('JGLOBAL_BATCH_PROCESS'); ?>
+	<?php echo Text::_('JGLOBAL_BATCH_PROCESS'); ?>
 </button>
--- a/admin/views/joomla_modules/tmpl/default_body.php
+++ b/admin/views/joomla_modules/tmpl/default_body.php
@@ -11,7 +11,12 @@

 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
 use VDM\Joomla\Utilities\ArrayHelper;
+use VDM\Joomla\Utilities\GetHelper;

 $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_module.edit";

@@ -19,7 +24,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 <?php foreach ($this->items as $i => $item): ?>
 	<?php
 		$canCheckin = $this->user->authorise('core.manage', 'com_checkin') || $item->checked_out == $this->user->id || $item->checked_out == 0;
-		$userChkOut = JFactory::getUser($item->checked_out);
+		$userChkOut = Factory::getUser($item->checked_out);
 		$canDo = ComponentbuilderHelper::getActions('joomla_module',$item,'joomla_modules');
 	?>
 	<tr class="row<?php echo $i % 2; ?>">
@@ -29,7 +34,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 				$iconClass = '';
 				if (!$this->saveOrder)
 				{
-					$iconClass = ' inactive tip-top" hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
+					$iconClass = ' inactive tip-top" hasTooltip" title="' . Html::tooltipText('JORDERINGDISABLED');
 				}
 			?>
 			<span class="sortable-handler<?php echo $iconClass; ?>">
@@ -47,12 +52,12 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 		<?php if ($canDo->get('joomla_module.edit')): ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
-						<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+						<?php echo Html::_('grid.id', $i, $item->id); ?>
 					<?php else: ?>
 						&#9633;
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+					<?php echo Html::_('grid.id', $i, $item->id); ?>
 				<?php endif; ?>
 		<?php else: ?>
 			&#9633;
@@ -63,7 +68,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 			<?php if ($canDo->get('joomla_module.edit')): ?>
 				<a href="<?php echo $edit; ?>&id=<?php echo $item->id; ?>"><?php echo $this->escape($item->system_name); ?></a>
 				<?php if ($item->checked_out): ?>
-					<?php echo JHtml::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_modules.', $canCheckin); ?>
+					<?php echo Html::_('jgrid.checkedout', $i, $userChkOut->name, $item->checked_out_time, 'joomla_modules.', $canCheckin); ?>
 				<?php endif; ?>
 			<?php else: ?>
 				<?php echo $this->escape($item->system_name); ?>
@@ -79,19 +84,19 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 						array(
 							'view' => 'joomla_module_updates',
 							'views' => 'joomla_modules_updates',
-							'title' => JText::_('COM_COMPONENTBUILDER_THE_MODULE_UPDATES'),
+							'title' => Text::_('COM_COMPONENTBUILDER_THE_MODULE_UPDATES'),
 							'icon' => 'database'),
 						array(
 							'view' => 'joomla_module_files_folders_urls',
 							'views' => 'joomla_modules_files_folders_urls',
-							'title' => JText::_('COM_COMPONENTBUILDER_THE_MODULE_FILES_FOLDERS'),
+							'title' => Text::_('COM_COMPONENTBUILDER_THE_MODULE_FILES_FOLDERS'),
 							'icon' => 'briefcase')
 						);
 				}
 			?>
 			<div class="btn-group" style="margin: 5px 0 0 0;">
 			<?php foreach ($_buttons[0] as $_button): ?>
-				<?php if ($canDo->get($_button['view'].'.edit') && ($id = ComponentbuilderHelper::getVar($_button['view'], $item->id, 'joomla_module', 'id')) !== false): ?>
+				<?php if ($canDo->get($_button['view'].'.edit') && ($id = GetHelper::var($_button['view'], $item->id, 'joomla_module', 'id')) !== false): ?>
 					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&id=<?php echo $id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
 				<?php elseif ($canDo->get($_button['view'].'.create')): ?>
 					<a class="hasTooltip btn btn-mini" href="index.php?option=com_componentbuilder&view=<?php echo $_button['views'] ?>&task=<?php echo $_button['view'] ?>.edit&ref=joomla_module&refid=<?php echo $item->id; ?>&return=<?php echo $this->return_here; ?>" title="<?php echo $_button['title']; ?>" ><span class="icon-<?php echo $_button['icon']; ?>"></span></a>
@@ -100,7 +105,7 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 			</div>
 		</td>
 		<td class="hidden-phone">
-			<?php echo JText::_($item->target); ?>
+			<?php echo Text::_($item->target); ?>
 		</td>
 		<td class="hidden-phone">
 			<?php echo $this->escape($item->description); ?>
@@ -109,15 +114,15 @@ $edit = "index.php?option=com_componentbuilder&view=joomla_modules&task=joomla_m
 		<?php if ($canDo->get('joomla_module.edit.state')) : ?>
 				<?php if ($item->checked_out) : ?>
 					<?php if ($canCheckin) : ?>
-						<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
+						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
 					<?php else: ?>
-						<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_modules.', false, 'cb'); ?>
+						<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', false, 'cb'); ?>
 					<?php endif; ?>
 				<?php else: ?>
-					<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
+					<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', true, 'cb'); ?>
 				<?php endif; ?>
 		<?php else: ?>
-			<?php echo JHtml::_('jgrid.published', $item->published, $i, 'joomla_modules.', false, 'cb'); ?>
+			<?php echo Html::_('jgrid.published', $item->published, $i, 'joomla_modules.', false, 'cb'); ?>
 		<?php endif; ?>
 		</td>
 		<td class="nowrap center hidden-phone">
--- a/admin/views/joomla_modules/tmpl/default_head.php
+++ b/admin/views/joomla_modules/tmpl/default_head.php
@@ -12,14 +12,17 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
 ?>
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
+			<?php echo Html::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
 		<th width="20" class="nowrap center">
-			<?php echo JHtml::_('grid.checkall'); ?>
+			<?php echo Html::_('grid.checkall'); ?>
 		</th>
 	<?php else: ?>
 		<th width="20" class="nowrap center hidden-phone">
@@ -30,24 +33,24 @@ defined('_JEXEC') or die('Restricted access');
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_MODULE_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_MODULE_SYSTEM_NAME_LABEL', 'a.system_name', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULE_TARGET_LABEL'); ?>
+			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_MODULE_TARGET_LABEL'); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_MODULE_DESCRIPTION_LABEL', 'a.description', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_MODULE_DESCRIPTION_LABEL', 'a.description', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
-			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_MODULE_STATUS', 'a.published', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_MODULE_STATUS', 'a.published', $this->listDirn, $this->listOrder); ?>
 		</th>
 	<?php else: ?>
 		<th width="10" class="nowrap center" >
-			<?php echo JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULE_STATUS'); ?>
+			<?php echo Text::_('COM_COMPONENTBUILDER_JOOMLA_MODULE_STATUS'); ?>
 		</th>
 	<?php endif; ?>
 	<th width="5" class="nowrap center hidden-phone" >
-			<?php echo JHtml::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
+			<?php echo Html::_('searchtools.sort', 'COM_COMPONENTBUILDER_JOOMLA_MODULE_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
 	</th>
 </tr>
--- a/admin/views/joomla_modules/tmpl/default_toolbar.php
+++ b/admin/views/joomla_modules/tmpl/default_toolbar.php
@@ -12,34 +12,37 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');

+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper as Html;
+
 ?>
 <div id="filter-bar" class="btn-toolbar">
-        <div class="filter-search btn-group pull-left">
-            <label for="filter_search" class="element-invisible"><?php echo JText::_('Search');?></label>
-            <input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo JHtml::tooltipText('Search Joomla_modules'); ?>" />
-        </div>
-        <div class="btn-group pull-left">
-            <button type="submit" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
-            <button type="button" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_CLEAR'); ?>" onclick="document.id('filter_search').value='';this.form.submit();"><i class="icon-remove"></i></button>
-        </div>
-        <div class="btn-group pull-right hidden-phone">
-            <label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
-            <?php echo $this->pagination->getLimitBox(); ?>
-        </div>
-        <div class="btn-group pull-right hidden-phone">
-            <label for="directionTable" class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC');?></label>
-            <select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
-                <option value=""><?php echo JText::_('JFIELD_ORDERING_DESC');?></option>
-                <option value="asc" <?php if ($this->listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_ASCENDING');?></option>
-                <option value="desc" <?php if ($this->listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING');?></option>
-            </select>
-        </div>
-        <div class="btn-group pull-right">
-            <label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY');?></label>
-            <select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
-                <option value=""><?php echo JText::_('JGLOBAL_SORT_BY');?></option>
-                <?php echo JHtml::_('select.options', $this->getSortFields(), 'value', 'text', $this->listOrder);?>
-            </select>
-        </div>
-    </div>
+	<div class="filter-search btn-group pull-left">
+		<label for="filter_search" class="element-invisible"><?php echo Text::_('Search');?></label>
+		<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo Text::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo Html::tooltipText('Search Joomla_modules'); ?>" />
+	</div>
+	<div class="btn-group pull-left">
+		<button type="submit" class="btn hasTooltip" title="<?php echo Html::tooltipText('JSEARCH_FILTER_SUBMIT'); ?>"><i class="icon-search"></i></button>
+		<button type="button" class="btn hasTooltip" title="<?php echo Html::tooltipText('JSEARCH_FILTER_CLEAR'); ?>" onclick="document.id('filter_search').value='';this.form.submit();"><i class="icon-remove"></i></button>
+	</div>
+	<div class="btn-group pull-right hidden-phone">
+		<label for="limit" class="element-invisible"><?php echo Text::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
+		<?php echo $this->pagination->getLimitBox(); ?>
+	</div>
+	<div class="btn-group pull-right hidden-phone">
+		<label for="directionTable" class="element-invisible"><?php echo Text::_('JFIELD_ORDERING_DESC');?></label>
+		<select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
+			<option value=""><?php echo Text::_('JFIELD_ORDERING_DESC');?></option>
+			<option value="asc" <?php if ($this->listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo Text::_('JGLOBAL_ORDER_ASCENDING');?></option>
+			<option value="desc" <?php if ($this->listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo Text::_('JGLOBAL_ORDER_DESCENDING');?></option>
+		</select>
+	</div>
+	<div class="btn-group pull-right">
+		<label for="sortTable" class="element-invisible"><?php echo Text::_('JGLOBAL_SORT_BY');?></label>
+		<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
+			<option value=""><?php echo Text::_('JGLOBAL_SORT_BY');?></option>
+			<?php echo Html::_('select.options', $this->getSortFields(), 'value', 'text', $this->listOrder);?>
+		</select>
+	</div>
+</div>
 <div class="clearfix"> </div>