Skip to content

[4.0][Atum] Some searchtool fixes #28644

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
wilsonge merged 2 commits into from
Apr 11, 2020
Merged

[4.0][Atum] Some searchtool fixes #28644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff34bc
[4.0][Atum] Some searchtool fixes
ciar4n Apr 11, 2020
1700a92
clear btn color
ciar4n Apr 11, 2020
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
4 changes: 2 additions & 2 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
Expand Up @@ -84,12 +84,12 @@
// Load search tools
HTMLHelper::_('searchtools.form', $data['options']['formSelector'], $data['options']);
?>
<div class="js-stools d-flex flex-wrap" role="search">
<div class="js-stools" role="search">
<?php // Add the itemtype and language selectors before the form filters. Do not display in modal. ?>
<?php $app = Factory::getApplication(); ?>
<?php if ($app->input->get('forcedItemType', '', 'string') == '') : ?>
<?php $itemTypeField = $data['view']->filterForm->getField('itemtype'); ?>
<div class="js-stools-container-selector-first">
<div class="js-stools-container-selector">
<div class="js-stools-field-selector js-stools-itemtype">
<div class="sr-only"><?php echo $itemTypeField->label; ?></div>
<?php echo $itemTypeField->input; ?>
Expand Down
4 changes: 2 additions & 2 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 @@ -88,13 +88,13 @@
// Load search tools
HTMLHelper::_('searchtools.form', $data['options']['formSelector'], $data['options']);
?>
<div class="js-stools d-flex flex-wrap" role="search">
<div class="js-stools" role="search">
<?php if ($data['view'] instanceof \Joomla\Component\Menus\Administrator\View\Items\HtmlView) : ?>
<?php // Add the itemtype and language selectors before the form filters. Do not display in modal. ?>
<?php $app = Factory::getApplication(); ?>
<?php $clientIdField = $data['view']->filterForm->getField('client_id'); ?>
<?php if ($clientIdField) : ?>
<div class="js-stools-container-selector-first">
<div class="js-stools-container-selector">
<div class="sr-only">
<?php echo $clientIdField->label; ?>
</div>
Expand Down
16 changes: 16 additions & 0 deletions administrator/templates/atum/scss/system/searchtools/searchtools.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

// Search tools

.js-stools {
display: flex;
flex-wrap: wrap;
}

.js-stools-container-bar,
.js-stools-container-filters {
width: 100%;
margin-bottom: 10px;
}

Expand All @@ -18,6 +24,11 @@
margin-inline-start: 8px;
}
}

.js-stools-btn-clear {
background-color: var(--atum-bg-dark);
border: 0;
}
}

.ordering-select {
Expand All @@ -42,3 +53,8 @@
margin-inline-start: 8px;
}
}

.js-stools-container-selector {
margin: 5px 0;
margin-inline-end: 8px;
}