hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'advanced-search_contribute-7.6' into advanced-search_contribute-main

Browse Source
This commit is contained in:
Alexandre Vryghem
2024-05-05 16:03:12 +02:00
parent 806b07c084 58d73875b8
commit 2226cc4d3b
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/shared/search/advanced-search/advanced-search.component.html
View File

@@ -1,14 +1,21 @@
<h3>{{ 'search.sidebar.advanced-search.title' | translate }}</h3> <h3>{{ 'search.sidebar.advanced-search.title' | translate }}</h3>
<div class="advanced-search b-3 p-3"> <div class="advanced-search b-3 p-3">
<h5>{{ 'search.sidebar.advanced-search.filter-by' | translate }}</h5> <h4>{{ 'search.sidebar.advanced-search.filter-by' | translate }}</h4>
<label class="sr-only" for="advanced-search-filters">
{{ 'search.sidebar.advanced-search.filters' | translate }}
</label>
<select [(ngModel)]="currentFilter" (keyup.enter)="applyFilter()" <select [(ngModel)]="currentFilter" (keyup.enter)="applyFilter()"
(ngModelChange)="currentOperator = advancedFilterMap.get(currentFilter).operators[0].operator" (ngModelChange)="currentOperator = advancedFilterMap.get(currentFilter).operators[0].operator"
class="form-control mb-2"> class="form-control mb-2" id="advanced-search-filters">
<option *ngFor="let advancedFilter of (advancedFilters$ | async) | keyvalue" [value]="advancedFilter.value.filter"> <option *ngFor="let advancedFilter of (advancedFilters$ | async) | keyvalue" [value]="advancedFilter.value.filter">
{{ 'search.filters.filter.' + advancedFilter.value.filter + '.head' | translate }} {{ 'search.filters.filter.' + advancedFilter.value.filter + '.head' | translate }}
</option> </option>
</select> </select>
<select [(ngModel)]="currentOperator" (keyup.enter)="applyFilter()" class="form-control mb-2"> <label class="sr-only" for="advanced-search-operators">
{{ 'search.sidebar.advanced-search.operators' | translate }}
</label>
<select [(ngModel)]="currentOperator" (keyup.enter)="applyFilter()"
class="form-control mb-2" id="advanced-search-operators">
<option *ngFor="let operator of advancedFilterMap.get(currentFilter)?.operators" [value]="operator.operator"> <option *ngFor="let operator of advancedFilterMap.get(currentFilter)?.operators" [value]="operator.operator">
{{ 'search.filters.operator.' + operator.operator + '.text' | translate }} {{ 'search.filters.operator.' + operator.operator + '.text' | translate }}
</option> </option>

4
src/assets/i18n/en.json5
View File

@@ -4608,6 +4608,10 @@
"search.sidebar.advanced-search.filter-by": "Filter by", "search.sidebar.advanced-search.filter-by": "Filter by",
"search.sidebar.advanced-search.filters": "Filters",
"search.sidebar.advanced-search.operators": "Operators",
"search.sidebar.advanced-search.add": "Add", "search.sidebar.advanced-search.add": "Add",
"search.sidebar.settings.title": "Settings", "search.sidebar.settings.title": "Settings",

2
src/themes/dspace/styles/_global-styles.scss
View File

@@ -17,7 +17,7 @@
background-color: var(--bs-primary); background-color: var(--bs-primary);
} }
h4 { h4, .h4 {
font-size: 1.1rem font-size: 1.1rem
} }
} }