Skip to content

[4.0] Normalise display of searchtools specific fields for menu items and multilingual associations managers #21581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2018
Merged

[4.0] Normalise display of searchtools specific fields for menu items and multilingual associations managers #21581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions administrator/components/com_associations/layouts/joomla/searchtools/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
35 changes: 0 additions & 35 deletions administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
View file
Open in desktop

This file was deleted.

20 changes: 6 additions & 14 deletions administrator/components/com_menus/layouts/joomla/searchtools/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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']);
Expand All @@ -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
Expand All @@ -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>
Expand All @@ -86,17 +82,13 @@
</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; ?>">
<?php echo LayoutHelper::render('joomla.searchtools.default.list', $data); ?>
<?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; ?>
9 changes: 8 additions & 1 deletion build/media/system/css/searchtools.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down