Skip to content

Commit 2226cc4

Browse files
Merge branch 'advanced-search_contribute-7.6' into advanced-search_contribute-main
2 parents 806b07c + 58d7387 commit 2226cc4

3 files changed

Lines changed: 15 additions & 4 deletions

File tree

src/app/shared/search/advanced-search/advanced-search.component.html

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
<h3>{{ 'search.sidebar.advanced-search.title' | translate }}</h3>
22
<div class="advanced-search b-3 p-3">
3-
<h5>{{ 'search.sidebar.advanced-search.filter-by' | translate }}</h5>
3+
<h4>{{ 'search.sidebar.advanced-search.filter-by' | translate }}</h4>
4+
<label class="sr-only" for="advanced-search-filters">
5+
{{ 'search.sidebar.advanced-search.filters' | translate }}
6+
</label>
47
<select [(ngModel)]="currentFilter" (keyup.enter)="applyFilter()"
58
(ngModelChange)="currentOperator = advancedFilterMap.get(currentFilter).operators[0].operator"
6-
class="form-control mb-2">
9+
class="form-control mb-2" id="advanced-search-filters">
710
<option *ngFor="let advancedFilter of (advancedFilters$ | async) | keyvalue" [value]="advancedFilter.value.filter">
811
{{ 'search.filters.filter.' + advancedFilter.value.filter + '.head' | translate }}
912
</option>
1013
</select>
11-
<select [(ngModel)]="currentOperator" (keyup.enter)="applyFilter()" class="form-control mb-2">
14+
<label class="sr-only" for="advanced-search-operators">
15+
{{ 'search.sidebar.advanced-search.operators' | translate }}
16+
</label>
17+
<select [(ngModel)]="currentOperator" (keyup.enter)="applyFilter()"
18+
class="form-control mb-2" id="advanced-search-operators">
1219
<option *ngFor="let operator of advancedFilterMap.get(currentFilter)?.operators" [value]="operator.operator">
1320
{{ 'search.filters.operator.' + operator.operator + '.text' | translate }}
1421
</option>

src/assets/i18n/en.json5

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4608,6 +4608,10 @@
46084608

46094609
"search.sidebar.advanced-search.filter-by": "Filter by",
46104610

4611+
"search.sidebar.advanced-search.filters": "Filters",
4612+
4613+
"search.sidebar.advanced-search.operators": "Operators",
4614+
46114615
"search.sidebar.advanced-search.add": "Add",
46124616

46134617
"search.sidebar.settings.title": "Settings",

src/themes/dspace/styles/_global-styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
background-color: var(--bs-primary);
1818
}
1919

20-
h4 {
20+
h4, .h4 {
2121
font-size: 1.1rem
2222
}
2323
}

0 commit comments

Comments
 (0)