[Aggregator & Library | new-theme]: Fixes in search forms and logo | Removed animation in card results | Added service landing links for incompatible datasources in eosc portal.

1. home.component.html:
   a. Removed uk-margin-large-top from search form and logo.
   b. Removed uk-height-medium from  search form and logo.
   c. Move searchImage on top of search form (uk-width-1-1) for small screens.
2. searchMyOrcidResults.component.html: Removed animation with uk-scrollspy.
3. searchAll.component.html: Move searchImage on top of search form (uk-width-1-1) for small screens.
4. newSearchPage.component.html:
   a. Removed animation with uk-scrollspy.
   b. For simple search, move searchImage on top of search form (uk-width-1-1) for small screens.
   c. For advanced search, searchImage is on top of search form for any screen size.
5. result-preview.component.html & result-preview.component.ts: For eosc portalType, added in incompatible datasources link to the service landing page.
6. aggregators.ts:
   a. In #searchImage commented custom margin-left.
   b. In #searchForm commented custom padding and width.
   c. Exclude also .uk-button-link from custom css for buttons with parent .search_box_bg or #searchForm.
This commit is contained in:
Konstantina Galouni 2022-05-20 15:20:50 +03:00
parent 1ee81c2181
commit 35d91a5fc6
5 changed files with 13 additions and 8 deletions

View File

@ -5,7 +5,7 @@
[totalResults]="totalResults"> [totalResults]="totalResults">
</no-load-paging> </no-load-paging>
<ul class="uk-list search-results uk-margin-remove-top" uk-scrollspy="cls: uk-animation-fade; target: .uk-card; delay: 100"> <ul class="uk-list search-results uk-margin-remove-top">
<errorMessages *ngIf="status != errorCodes.NONE" [status]="[status]" [type]="'results'"></errorMessages> <errorMessages *ngIf="status != errorCodes.NONE" [status]="[status]" [type]="'results'"></errorMessages>
<li *ngFor="let result of previewResults"> <li *ngFor="let result of previewResults">

View File

@ -9,7 +9,7 @@
<div class="uk-position-relative"> <div class="uk-position-relative">
<div class="uk-container uk-container-large uk-section uk-section-small uk-margin-bottom" id="searchForm"> <div class="uk-container uk-container-large uk-section uk-section-small uk-margin-bottom" id="searchForm">
<div class="uk-grid uk-flex uk-flex-middle uk-flex-center" uk-grid> <div class="uk-grid uk-flex uk-flex-middle uk-flex-center" uk-grid>
<div id="searchImage"></div> <div class="uk-width-1-1 uk-width-auto@m"><div id="searchImage"></div></div>
<advanced-search-form <advanced-search-form
entityType="all" entityType="all"
(queryChange)="keywordChanged($event)" (queryChange)="keywordChanged($event)"

View File

@ -130,7 +130,7 @@
<div class="uk-position-relative"> <div class="uk-position-relative">
<div class="uk-container uk-container-small uk-section uk-section-small uk-margin-bottom" id="searchForm"> <div class="uk-container uk-container-small uk-section uk-section-small uk-margin-bottom" id="searchForm">
<div class="uk-grid uk-flex uk-flex-middle uk-flex-center" uk-grid> <div class="uk-grid uk-flex uk-flex-middle uk-flex-center" uk-grid>
<div id="searchImage"></div> <div [class]="'uk-width-1-1'+(simpleView?' uk-width-auto@m' : '')"><div id="searchImage"></div></div>
<advanced-search-form class="uk-width-expand uk-padding uk-padding-remove-vertical" <advanced-search-form class="uk-width-expand uk-padding uk-padding-remove-vertical"
[entityType]="entityType" [entityType]="entityType"
[fieldIds]="fieldIds" [fieldIds]="fieldIds"
@ -293,7 +293,7 @@
</div> </div>
<div <div
*ngIf="(searchUtils.page <= pagingLimit) || (searchUtils.totalResults <= searchUtils.size*pagingLimit)" *ngIf="(searchUtils.page <= pagingLimit) || (searchUtils.totalResults <= searchUtils.size*pagingLimit)"
class="uk-margin" uk-scrollspy="cls: uk-animation-fade; target: .uk-card; delay: 100"> class="uk-margin">
<search-result *ngIf="( entityType !='community' && entityType != 'stakeholder') && usedBy == 'search'" <search-result *ngIf="( entityType !='community' && entityType != 'stakeholder') && usedBy == 'search'"
[results]="results" [results]="results"
[status]=searchUtils.status [status]=searchUtils.status

View File

@ -38,7 +38,7 @@
<!-- Title --> <!-- Title -->
<div> <div>
<h2 class="uk-margin-remove uk-text-break uk-inline-block uk-h6"> <h2 class="uk-margin-remove uk-text-break uk-inline-block uk-h6">
<a *ngIf="!externalUrl && result.id && !(result.resultType == 'dataprovider' && result.compatibilityUNKNOWN) " <a *ngIf="!externalUrl && result.id && !(result.resultType == 'dataprovider' && result.compatibilityUNKNOWN && properties.adminToolsPortalType != 'eosc') "
(click)="onClick()" [queryParams]="createParam()" (click)="onClick()" [queryParams]="createParam()"
[routerLink]="url" class="uk-link uk-link-heading uk-width-expand"> [routerLink]="url" class="uk-link uk-link-heading uk-width-expand">
<div *ngIf="(result.title) || result.acronym"> <div *ngIf="(result.title) || result.acronym">
@ -69,7 +69,7 @@
</span> </span>
</a> </a>
<div *ngIf="!result.id || (result.resultType == 'dataprovider' && result.compatibilityUNKNOWN)" <div *ngIf="!result.id || (result.resultType == 'dataprovider' && result.compatibilityUNKNOWN && properties.adminToolsPortalType != 'eosc')"
class="uk-width-expand"> class="uk-width-expand">
<div *ngIf="(result.title) || result.acronym"> <div *ngIf="(result.title) || result.acronym">
<span *ngIf="result.acronym"> <span *ngIf="result.acronym">

View File

@ -58,8 +58,13 @@ export class ResultPreviewComponent implements OnInit, OnChanges {
this.urlParam = "organizationId"; this.urlParam = "organizationId";
this.url = properties.searchLinkToOrganization.split('?')[0]; this.url = properties.searchLinkToOrganization.split('?')[0];
} else if (this.result.resultType == "dataprovider") { } else if (this.result.resultType == "dataprovider") {
this.urlParam = "datasourceId"; if(this.result.compatibilityUNKNOWN && properties.adminToolsPortalType == "eosc") {
this.url = properties.searchLinkToDataProvider.split('?')[0]; this.urlParam = "serviceId";
this.url = properties.searchLinkToService.split('?')[0];
} else {
this.urlParam = "datasourceId";
this.url = properties.searchLinkToDataProvider.split('?')[0];
}
} else if (this.result.resultType == "service") { } else if (this.result.resultType == "service") {
this.urlParam = "serviceId"; this.urlParam = "serviceId";
this.url = properties.searchLinkToService.split('?')[0]; this.url = properties.searchLinkToService.split('?')[0];