From 3257823c4826c3c5c131dc2cc3b5b8c190bef6f6 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Mon, 13 Aug 2018 08:26:20 +0200
Subject: [PATCH] [4.0] Normalise display of searchtools specific fields for
 menu items and multilingual associations

---
 .../layouts/joomla/searchtools/default.php    | 69 +++++++++++++++++++
 .../joomla/searchtools/default/bar.php        | 35 ----------
 .../layouts/joomla/searchtools/default.php    | 20 ++----
 build/media/system/css/searchtools.css        |  9 ++-
 4 files changed, 83 insertions(+), 50 deletions(-)
 create mode 100644 administrator/components/com_associations/layouts/joomla/searchtools/default.php
 delete mode 100644 administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php

diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default.php b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
new file mode 100644
index 0000000000000..1c4f03bfc0e2e
--- /dev/null
+++ b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/** @var  array  $displayData */
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+$showSelector    = false;
+
+if ($data['view'] instanceof \Joomla\Component\Associations\Administrator\View\Associations\HtmlView)
+{
+	// Client selector doesn't have to activate the filter bar.
+	unset($data['view']->activeFilters['itemtype']);
+
+	// Menutype filter doesn't have to activate the filter bar
+	unset($data['view']->activeFilters['language']);
+}
+
+// Set some basic options
+$customOptions = array(
+	'filtersHidden'       => $data['options']['filtersHidden'] ?? empty($data['view']->activeFilters),
+	'defaultLimit'        => $data['options']['defaultLimit'] ?? JFactory::getApplication()->get('list_limit', 20),
+	'searchFieldSelector' => '#filter_search',
+	'orderFieldSelector'  => '#list_fullordering',
+	'formSelector'        => !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm',
+);
+
+$data['options'] = array_merge($customOptions, $data['options']);
+
+// Load search tools
+JHtml::_('searchtools.form', $data['options']['formSelector'], $data['options']);
+
+$filtersClass = isset($data['view']->activeFilters) && $data['view']->activeFilters ? ' js-stools-container-filters-visible' : '';
+?>
+<div class="js-stools" role="search">
+	<?php $itemTypeField = $data['view']->filterForm->getField('itemtype'); ?>
+	<?php $languageField = $data['view']->filterForm->getField('language'); ?>
+
+	<?php // Add the itemtype and language selectors before the form filters. ?>
+	<div class="js-stools-container-selector-first">
+		<div class="js-stools-field-selector js-stools-itemtype">
+			<?php echo $itemTypeField->input; ?>
+		</div>
+	</div>
+	<div class="js-stools-container-selector">
+		<div class="js-stools-field-selector js-stools-language">
+			<?php echo $languageField->input; ?>
+		</div>
+	</div>
+
+	<div class="js-stools-container-bar">
+		<?php echo $this->sublayout('bar', $data); ?>
+	</div>
+
+	<!-- Filters div -->
+	<div class="js-stools-container-filters clearfix<?php echo $filtersClass; ?>">
+		<?php echo $this->sublayout('list', $data); ?>
+		<?php echo $this->sublayout('filters', $data); ?>
+	</div>
+</div>
diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
deleted file mode 100644
index f748b3cbe6cd6..0000000000000
--- a/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_associations
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('JPATH_BASE') or die;
-
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Factory;
-
-$data = $displayData;
-
-?>
-<?php if ($data['view'] instanceof \Joomla\Component\Associations\Administrator\View\Associations\HtmlView) : ?>
-	<?php $app = Factory::getApplication(); ?>
-	<?php // We will get the component item type and language filters & remove it from the form filters. ?>
-	<?php if ($app->input->get('forcedItemType', '', 'string') == '') : ?>
-		<?php $itemTypeField = $data['view']->filterForm->getField('itemtype'); ?>
-		<div class="js-stools-field-filter js-stools-selector">
-			<?php echo $itemTypeField->input; ?>
-		</div>
-	<?php endif; ?>
-	<?php if ($app->input->get('forcedLanguage', '', 'cmd') == '') : ?>
-		<?php $languageField = $data['view']->filterForm->getField('language'); ?>
-		<div class="js-stools-field-filter js-stools-selector">
-			<?php echo $languageField->input; ?>
-		</div>
-	<?php endif; ?>
-<?php endif; ?>
-<?php // Display the main joomla layout ?>
-<?php echo LayoutHelper::render('joomla.searchtools.default.bar', $data, null, array('component' => 'none')); ?>
diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default.php b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
index 4b1225c92319d..a061662441a2e 100644
--- a/administrator/components/com_menus/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
@@ -9,7 +9,6 @@
 
 defined('JPATH_BASE') or die;
 
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -36,8 +35,6 @@
 	'defaultLimit'        => $data['options']['defaultLimit'] ?? Factory::getApplication()->get('list_limit', 20),
 	'searchFieldSelector' => '#filter_search',
 	'orderFieldSelector'  => '#list_fullordering',
-	'totalResults'        => $data['options']['totalResults'] ?? -1,
-	'noResultsText'       => $data['options']['noResultsText'] ?? Text::_('JGLOBAL_NO_MATCHING_RESULTS'),
 );
 
 $data['options'] = array_merge($customOptions, $data['options']);
@@ -49,9 +46,8 @@
 
 $filtersClass = isset($data['view']->activeFilters) && $data['view']->activeFilters ? ' js-stools-container-filters-visible' : '';
 ?>
-<div class="js-stools clearfix">
-	<div class="clearfix">
-		<?php
+<div class="js-stools" role="search">
+	<?php
 		if ($data['view'] instanceof \Joomla\Component\Menus\Administrator\View\Items\HtmlView)
 		{
 			// We will get the menutype filter & remove it from the form filters
@@ -61,7 +57,7 @@
 			$clientIdField = $data['view']->filterForm->getField('client_id');
 
 			if ($clientIdField): ?>
-				<div class="js-stools-container-selector">
+				<div class="js-stools-container-selector-first">
 					<div class="js-stools-field-selector js-stools-client_id">
 						<?php echo $clientIdField->input; ?>
 					</div>
@@ -86,10 +82,9 @@
 			</div>
 			<?php
 		}
-		?>
-		<div class="js-stools-container-bar">
-			<?php echo LayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
-		</div>
+	?>
+	<div class="js-stools-container-bar">
+		<?php echo LayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
 	</div>
 	<!-- Filters div -->
 	<div class="js-stools-container-filters clearfix<?php echo $filtersClass; ?>">
@@ -97,6 +92,3 @@
 		<?php echo LayoutHelper::render('joomla.searchtools.default.filters', $data); ?>
 	</div>
 </div>
-<?php if ($data['options']['totalResults'] === 0) : ?>
-	<?php echo LayoutHelper::render('joomla.searchtools.default.noitems', $data); ?>
-<?php endif; ?>
diff --git a/build/media/system/css/searchtools.css b/build/media/system/css/searchtools.css
index 892a475d1c89f..c3da3fac7641e 100644
--- a/build/media/system/css/searchtools.css
+++ b/build/media/system/css/searchtools.css
@@ -22,11 +22,18 @@
 /* Fixed filter fields (selector) */
 .js-stools .js-stools-container-selector {
 	float: left;
+	margin-right: auto;
+}
+.js-stools .js-stools-container-selector-first {
 	margin-right: 8px;
 }
 html[dir=rtl] .js-stools .js-stools-container-selector {
 	float: right;
-	margin-left: 10px;
+	margin-left: auto;
+	margin-right: 0;
+}
+html[dir=rtl] .js-stools .js-stools-container-selector-first {
+	margin-left: 8px;
 	margin-right: 0;
 }
 .js-stools .js-stools-container-bar {