diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html index 087c01d4..6f03096d 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.component.html +++ b/dashboard/sharedComponents/sidebar/sideBar.component.html @@ -2,7 +2,7 @@
-
- diff --git a/searchPages/searchDataProviders.component.ts b/searchPages/searchDataProviders.component.ts index 045a26bb..be94994f 100644 --- a/searchPages/searchDataProviders.component.ts +++ b/searchPages/searchDataProviders.component.ts @@ -34,7 +34,7 @@ import {properties} from "../../../environments/environment"; [openaireLink]=openaireLink [includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter" [piwikSiteId]=piwikSiteId [hasPrefix]="hasPrefix" - [searchFormClass]="type!='deposit'?'datasourcesSearchForm':''" + [searchForm]="{class: '', dark: false}" [entitiesSelection]="type=='all'" [showSwitchSearchLink]="showSwitchSearchLink" [filters]="filters" [simpleView]="simpleView" formPlaceholderText="Search by name, description, subject..." diff --git a/searchPages/searchOrganizations.component.ts b/searchPages/searchOrganizations.component.ts index 70d5d697..ddb400d3 100644 --- a/searchPages/searchOrganizations.component.ts +++ b/searchPages/searchOrganizations.component.ts @@ -30,7 +30,6 @@ import {properties} from "../../../environments/environment"; [oldTotalResults]="oldTotalResults" [openaireLink]=openaireLink [piwikSiteId]=piwikSiteId [hasPrefix]="hasPrefix" - searchFormClass="organizationsSearchForm" [includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter" [sort]="false" [filters]="filters" diff --git a/searchPages/searchProjects.component.ts b/searchPages/searchProjects.component.ts index d91913c2..36c85ce9 100644 --- a/searchPages/searchProjects.component.ts +++ b/searchPages/searchProjects.component.ts @@ -30,7 +30,6 @@ import {properties} from "../../../environments/environment"; [oldTotalResults]="oldTotalResults" [openaireLink]=openaireLink [piwikSiteId]=piwikSiteId [hasPrefix]="hasPrefix" - searchFormClass="projectsSearchForm" [includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter" [filters]="filters" [rangeFilters]="rangeFilters" [rangeFields]="rangeFields" diff --git a/searchPages/searchResearchResults.component.ts b/searchPages/searchResearchResults.component.ts index 59c3bd8c..fdda877d 100644 --- a/searchPages/searchResearchResults.component.ts +++ b/searchPages/searchResearchResults.component.ts @@ -31,7 +31,6 @@ import {ContextsService} from "../claims/claim-utils/service/contexts.service"; [oldTotalResults]="oldTotalResults" [openaireLink]=openaireLink [piwikSiteId]=piwikSiteId [hasPrefix]="hasPrefix" - searchFormClass="publicationsSearchForm" [filters]="filters" [quickFilter]="quickFilter" [rangeFilters]="rangeFilters" [rangeFields]="rangeFields" [simpleView]="simpleView" formPlaceholderText="Search by title, author, abstract, DOI, orcid..." diff --git a/searchPages/searchUtils/advancedSearchForm.component.html b/searchPages/searchUtils/advancedSearchForm.component.html index a39d5598..bc706022 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.html +++ b/searchPages/searchUtils/advancedSearchForm.component.html @@ -133,7 +133,7 @@
-
+
Advanced search diff --git a/searchPages/searchUtils/advancedSearchForm.component.ts b/searchPages/searchUtils/advancedSearchForm.component.ts index 989ca4a4..f23c501d 100644 --- a/searchPages/searchUtils/advancedSearchForm.component.ts +++ b/searchPages/searchUtils/advancedSearchForm.component.ts @@ -24,6 +24,7 @@ export class AdvancedSearchFormComponent { @Input() advancedSearchLinkParameters; @Input() simpleView: boolean = false; @Input() formPlaceholderText = "Type Keywords..."; + @Input() dark: boolean; @Output() queryChange = new EventEmitter(); @Input() resultTypes; @Input() quickFilter: { filter: Filter, selected: boolean, filterId: string, value: string }; diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index d368a347..4dfac0f5 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -14,7 +14,7 @@ + [class.uk-disabled]="disabled" class="uk-link-reset"> {{type.name}} @@ -29,7 +29,7 @@ + [class.uk-disabled]="disabled" class="uk-link-reset"> {{filter.selectedFromAndToValues}} @@ -44,7 +44,7 @@ - {{value.name}} @@ -114,15 +114,15 @@ [attr.uk-sticky]="(stickyForm?'{animation:false;offset:100;top:90;cls-active:uk-active uk-sticky-below;cls-inactive:uk-sticky '+ (usedBy != 'deposit' && usedBy != 'orcid' && (!customFilter || customFilter.queryFieldName != 'communityId') ? ' uk-position-relative ' :(' uk-section ' ))+'}':null)"> -
+ 'uk-padding-remove-bottom uk-section uk-section-small' : '') + +(simpleView?'':' advancedSearchFormBackground ')" [ngClass]="searchForm.class">
-
+
- +
@@ -136,6 +136,7 @@ [selectedFields]="selectedFields" (queryChange)="queryChanged($event)" [isDisabled]="disabled" + [dark]="searchForm.dark" [simpleSearchLink]="simpleSearchLink" [advancedSearchLink]="advancedSearchLink" [advancedSearchLinkParameters]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)" @@ -152,14 +153,12 @@
-
+
-
-
-
+
@@ -168,7 +167,7 @@ + data-svg="settings"> @@ -185,49 +184,47 @@ ) -
+
Advanced + [routerLink]="advancedSearchLink" style="z-index:1;" + [queryParams]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)" + [class]="((disabled)?' uk-disabled uk-link-muted ':'') +'uk-link uk-float-right '">Advanced search
-
+
+ class="uk-width-1-4@m search-filters uk-visible@m">
+ class="uk-alert uk-animation-slide-top-small"> Do you want to see results only for {{customFilter.valueName}}? Click here.
- The following results are related to + The following results are related to {{customFilter.valueName}}. Are you interested to view more results? Visit OpenAIRE - Explore.
-
- -
- - {{searchUtils.totalResults|number}} - {{type}}, page - {{searchUtils.page | number}} - of {{(totalPages(searchUtils.totalResults)|number)}} - - - {{oldTotalResults|number}} - {{type}}, page - {{searchUtils.page | number}} - of {{(totalPages(oldTotalResults)|number)}} - -
- -
- - -
-
- -
+
+ +
+ + {{searchUtils.totalResults|number}} + {{type}}, page + {{searchUtils.page | number}} + of {{(totalPages(searchUtils.totalResults)|number)}} + + + {{oldTotalResults|number}} + {{type}}, page + {{searchUtils.page | number}} + of {{(totalPages(oldTotalResults)|number)}} + +
+ +
+ + +
+
+
-
-
-
+
+
+
+ [searchUtils]="searchUtils" [results]="results" [baseUrl]="searchUtils.baseUrl" + [parameterNames]="parameterNames" [parameterValues]="parameterValues" + [isDisabled]="disabled">
+ [results]="results" + [status]=searchUtils.status + [type]="entityType" + [showLoading]="true" [properties]=properties [showImpactFactors]="(customFilter && + customFilter.queryFieldName == 'communityId' && (customFilter.valueId == + 'elixir-gr' || customFilter.valueId == 'inspired-ris'))">
+ [searchUtils]="searchUtils" [results]="results" [baseUrl]="searchUtils.baseUrl" + [parameterNames]="parameterNames" [parameterValues]="parameterValues" + [isDisabled]="disabled">
+ class="uk-margin-small-top uk-grid uk-child-width-1-2">
-
-
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 9442c58b..af6e6c1f 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -59,7 +59,10 @@ export class NewSearchPageComponent { @Input() customFilter: SearchCustomFilter; @Input() sort: boolean = true; @Input() sortedByChanged: string = ""; - @Input() searchFormClass: string = "searchForm"; + @Input() searchForm = { + class: 'search-form', + dark: true + }; //From simple: @Input() rangeFilters: RangeFilter[] = []; @Input() rangeFields: string[][] = []; diff --git a/searchPages/searchUtils/searchDownload.component.ts b/searchPages/searchUtils/searchDownload.component.ts index bf5dae71..eec5fb76 100644 --- a/searchPages/searchUtils/searchDownload.component.ts +++ b/searchPages/searchUtils/searchDownload.component.ts @@ -14,20 +14,12 @@ import {properties} from "../../../../environments/environment"; @Component({ selector: 'search-download', template: ` - - - - - - - - - Download Results - + + Download Results + ` diff --git a/searchPages/searchUtils/searchDownload.module.ts b/searchPages/searchUtils/searchDownload.module.ts index 1275de01..ab3db513 100644 --- a/searchPages/searchUtils/searchDownload.module.ts +++ b/searchPages/searchUtils/searchDownload.module.ts @@ -5,10 +5,11 @@ import { FormsModule } from '@angular/forms'; import {SearchDownloadComponent} from './searchDownload.component'; import {LoadingModalModule} from '../../utils/modal/loadingModal.module'; import {AlertModalModule} from '../../utils/modal/alertModal.module'; +import {IconsModule} from "../../utils/icons/icons.module"; @NgModule({ imports: [ - CommonModule, FormsModule, LoadingModalModule, AlertModalModule + CommonModule, FormsModule, LoadingModalModule, AlertModalModule, IconsModule ], declarations: [ SearchDownloadComponent diff --git a/sharedComponents/input/input.component.ts b/sharedComponents/input/input.component.ts index b3498154..294c4627 100644 --- a/sharedComponents/input/input.component.ts +++ b/sharedComponents/input/input.component.ts @@ -48,7 +48,7 @@ declare var UIkit;
@@ -65,8 +65,13 @@ declare var UIkit; [rows]="rows" [formControl]="formAsControl"> -
{{getLabel(formControl.value)}}
-
{{placeholderInfo.label}}
+ +
{{placeholderInfo.label}}
+ + +
No value selected
+
{{getLabel(formControl.value)}}
+
- +
-
+
@@ -62,7 +62,7 @@ export class SearchInputComponent implements OnInit { if(this.input.focused) { if(event.code === 'Enter') { event.preventDefault(); - this.search(); + this.search(event); } } } @@ -85,9 +85,13 @@ export class SearchInputComponent implements OnInit { } } - public search() { + public search(event) { if(!this.disabled) { this.searchEmitter.emit(); + if(this.expandable) { + this.expand(!this.expanded); + } + event.stopPropagation(); } } @@ -100,7 +104,7 @@ export class SearchInputComponent implements OnInit { } get hidden(): boolean { - return !this.expanded && ((this.searchControl && !this.searchControl.value) || (!this.searchControl && !this.value)); + return !this.expanded && (!this.searchControl?.value && !this.value); } /** @deprecated all*/