Skip to content

Improve layout and labeling of index filters (CFM-295) #99

Merged
merged 2 commits into from
Jun 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions app/templates/element/filter.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,10 +170,8 @@
print $this->Form->control($key, $formParams);
}
?>
</div>
<?php if(!empty($field_booleans_columns)): ?>
<div class="top-search-checkboxes input">
<div class="top-search-checkbox-label">On-Off</div>
<div class="top-search-checkbox-fields">
<?php foreach($field_booleans_columns as $key => $options): ?>
<div class="form-check form-check-inline">
Expand All @@ -192,13 +190,16 @@
</div>
</div>
<?php endif; ?>
</div>

<?php if(!empty($field_datetime_columns)): ?>
<div class="top-filters-fields-subgroups">
<?php foreach($field_datetime_columns as $key => $options): ?>
<div class="input">
<div class="top-search-date-label"><?= Inflector::humanize($key) ?></div>
<div class="top-filters-fields-subgroups">
<div class="top-filters-fields-dates">
<!-- Start at -->
<div class="top-search-date-fields">
<div class="top-search-start-date">
<div class="d-flex">
<?php
// A datetime field will be rendered as plain text input with adjacent date and time pickers
Expand Down Expand Up @@ -232,7 +233,7 @@
</div>
</div>
<!-- Ends at -->
<div class="top-search-checkbox-fields">
<div class="top-search-end-date">
<div class="d-flex">
<?php
// A datetime field will be rendered as plain text input with adjacent date and time pickers
Expand Down Expand Up @@ -268,6 +269,7 @@
</div>
</div>
<?php endforeach; ?>
</div>
<?php endif; ?>

<?php $rebalanceColumns = ((count($vv_searchable_attributes)) % 2 != 0) ? ' class="tss-rebalance"' : ''; ?>
Expand Down
9 changes: 9 additions & 0 deletions app/webroot/css/co-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,15 @@ ul.form-list li.alert-banner .co-alert {
.top-filters .top-filters-checkboxes {
margin-top: 0.5em;
}
.top-filters-fields-dates {
padding: 1.25em 1em 0.5em;
border: 1px solid var(--cmg-color-bg-006);
border-radius: 4px;
margin-bottom: 1em;
}
.top-search-date-label {
padding: 1em 0 0.25em;
}
.top-filters .filter-clear-all-button {
font-size: 0.9em;
width: auto;
Expand Down
6 changes: 2 additions & 4 deletions app/webroot/css/co-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -322,17 +322,15 @@
grid-template-columns: 1fr 1fr;
column-gap: 1em;
padding: 0 0.5em;
align-items: center;
}
.top-search-checkboxes {
padding: 0 0.5em;
padding: 0.5em 0 0;
}
#top-filters-submit.tss-rebalance {
margin-top: -3.5em;
position: relative;
}
.top-search-date-label {
padding: 0 0.5em;
}
/* CO CONFIGURATION DASHBOARD */
.config-menu {
column-count: 3;
Expand Down