From b2de61d45ba6d208168d43d41526bf3676f28b77 Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Sun, 20 Aug 2017 11:39:19 +0100
Subject: [PATCH] Menu searchtools consistent with module search tools. Fixes
 #17633

---
 .../layouts/joomla/searchtools/default.php    | 36 +++++++++++++
 .../joomla/searchtools/default/bar.php        | 51 -------------------
 2 files changed, 36 insertions(+), 51 deletions(-)
 delete mode 100644 administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php

diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default.php b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
index f5f12967e2c28..f7968abcfc069 100644
--- a/administrator/components/com_menus/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
@@ -46,6 +46,42 @@
 ?>
 <div class="js-stools clearfix">
 	<div class="clearfix">
+        <?php
+        if ($data['view'] instanceof \Joomla\Component\Menus\Administrator\View\Items\Html)
+        {
+	        // We will get the menutype filter & remove it from the form filters
+	        $menuTypeField = $data['view']->filterForm->getField('menutype');
+
+	        // Add the client selector before the form filters.
+	        $clientIdField = $data['view']->filterForm->getField('client_id');
+
+	        if ($clientIdField): ?>
+                <div class="js-stools-container-selector">
+                    <div class="js-stools-field-selector js-stools-client_id">
+				        <?php echo $clientIdField->input; ?>
+                    </div>
+                </div>
+	        <?php endif; ?>
+            <div class="js-stools-container-selector">
+                <div class="js-stools-field-selector js-stools-menutype">
+			        <?php echo $menuTypeField->input; ?>
+                </div>
+            </div>
+	        <?php
+        }
+        elseif ($data['view'] instanceof \Joomla\Component\Menus\Administrator\View\Menus\Html)
+        {
+	        // Add the client selector before the form filters.
+	        $clientIdField = $data['view']->filterForm->getField('client_id');
+	        ?>
+            <div class="js-stools-container-selector">
+                <div class="js-stools-field-selector js-stools-client_id">
+			        <?php echo $clientIdField->input; ?>
+                </div>
+            </div>
+	        <?php
+        }
+        ?>
 		<div class="js-stools-container-bar">
 			<?php echo JLayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
 		</div>
diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php
deleted file mode 100644
index 31adaa941c48e..0000000000000
--- a/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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;
-
-if ($data['view'] instanceof \Joomla\Component\Menus\Administrator\View\Items\Html)
-{
-	// We will get the menutype filter & remove it from the form filters
-	$menuTypeField = $data['view']->filterForm->getField('menutype');
-
-	// Add the client selector before the form filters.
-	$clientIdField = $data['view']->filterForm->getField('client_id');
-
-	if ($clientIdField): ?>
-	<div class="js-stools-container-selector">
-		<div class="js-stools-field-selector js-stools-client_id">
-			<?php echo $clientIdField->input; ?>
-		</div>
-	</div>
-	<?php endif; ?>
-	<div class="js-stools-container-selector">
-		<div class="js-stools-field-selector js-stools-menutype">
-			<?php echo $menuTypeField->input; ?>
-		</div>
-	</div>
-	<?php
-}
-elseif ($data['view'] instanceof \Joomla\Component\Menus\Administrator\View\Menus\Html)
-{
-	// Add the client selector before the form filters.
-	$clientIdField = $data['view']->filterForm->getField('client_id');
-	?>
-	<div class="js-stools-container-selector">
-		<div class="js-stools-field-selector js-stools-client_id">
-			<?php echo $clientIdField->input; ?>
-		</div>
-	</div>
-	<?php
-}
-
-// Display the main joomla layout
-echo JLayoutHelper::render('joomla.searchtools.default.bar', $data, null, array('component' => 'none'));