Skip to content

EspoCRM – Open Source CRM Application

Main filter menu icons

Yuriicd50549f3f55
diff --git a/client/res/templates/record/search.tpl b/client/res/templates/record/search.tpl
index f936a3e8d0..e76c50d4f8 100644
--- a/client/res/templates/record/search.tpl
+++ b/client/res/templates/record/search.tpl
@@ -22,7 +22,7 @@
role="button"
data-name=""
data-action="selectPreset"
- ><div>{{translate 'all' category='presetFilters' scope=entityType}}</div></a>
+ ><div class="item-text">{{translate 'all' category='presetFilters' scope=entityType}}</div></a>
</li>
{{#each presetFilterList}}
<li>
@@ -33,7 +33,7 @@
data-name="{{name}}"
data-action="selectPreset"
>
- <div class="{{#if style}}text-{{style}}{{/if}}">
+ <div class="item-text {{#if style}} text-{{style}} {{/if}}">
{{~#if label}}{{label}}{{else}}{{translate name category='presetFilters' scope=../entityType}}{{/if~}}
</div>
</a>
@@ -42,10 +42,22 @@
<li class="divider preset-control hidden"></li>
<li class="preset-control remove-preset hidden">
- <a tabindex="0" role="button" data-action="removePreset">{{translate 'Remove Filter'}}</a>
+ <a tabindex="0" role="button" data-action="removePreset">
+ {{~null~}}
+ <span class="item-icon fas fa-times"></span>
+ {{~null~}}
+ <span class="item-text">{{translate 'Remove Filter'}}</span>
+ {{~null~}}
+ </a>
</li>
<li class="preset-control save-preset hidden">
- <a tabindex="0" role="button" data-action="savePreset">{{translate 'Save Filter'}}</a>
+ <a tabindex="0" role="button" data-action="savePreset">
+ {{~null~}}
+ <span class="item-icon far fa-floppy-disk"></span>
+ {{~null~}}
+ <span class="item-text">{{translate 'Save Filter'}}</span>
+ {{~null~}}
+ </a>
</li>
{{#if boolFilterList.length}}
@@ -56,13 +68,15 @@
{{#each boolFilterList}}
<li class="checkbox">
<label>
+ {{~null~}}
<input
type="checkbox"
data-role="boolFilterCheckbox"
data-name="{{./this}}"
class="form-checkbox form-checkbox-small"
{{#ifPropEquals ../bool this true}}checked{{/ifPropEquals}}
- > {{translate this scope=../entityType category='boolFilters'}}
+ ><span class="checkbox-text">{{translate this scope=../entityType category='boolFilters'}}</span>
+ {{~null~}}
</label></li>
{{/each}}
</ul>
diff --git a/frontend/less/espo-rtl/custom.less b/frontend/less/espo-rtl/custom.less
index b3e0ea4b39..a7ef857820 100644
--- a/frontend/less/espo-rtl/custom.less
+++ b/frontend/less/espo-rtl/custom.less
@@ -40,7 +40,12 @@ li .preset .pull-right {
}
ul.dropdown-menu > li.checkbox {
- padding: 3px 20px 3px 0;
+ padding: 3px var(--14px) 3px 0;
+
+ .checkbox-text {
+ padding-left: 0;
+ padding-right: var(--2px);
+ }
}
.remove-filter.pull-right {
diff --git a/frontend/less/espo/elements/dropdown.less b/frontend/less/espo/elements/dropdown.less
index 7564d76995..74baca8331 100644
--- a/frontend/less/espo/elements/dropdown.less
+++ b/frontend/less/espo/elements/dropdown.less
@@ -73,7 +73,11 @@ ul.dropdown-menu > li.checkbox {
margin-left: 0;
margin-top: 0;
margin-bottom: 0;
- padding: var(--4px) 0 var(--4px) var(--20px);
+ padding: var(--4px) 0 var(--4px) var(--14px);
+
+ .checkbox-text {
+ padding-left: var(--2px);
+ }
user-select: none;
@@ -150,7 +154,7 @@ ul.dropdown-menu {
ul {
&.dropdown-menu-with-icons,
- &:has(> li > a span.item-icon) {
+ &:has(> li:not(.hidden) > a span.item-icon) {
> li {
&:not(:has(.item-icon-grid)) {
a {
@@ -179,7 +183,7 @@ ul {
}
}
- &:has(> li > a span.item-icon) {
+ &:has(> li:not(.hidden) > a span.item-icon) {
> li {
> a:not(:has(span.item-icon)):not(:has(span.item-icon)) {
padding-left: var(--28px);