MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merging explore-redesign branch into develop for Explore July release #7

Merged
konstantina.galouni merged 112 commits from explore-redesign into develop 2023-07-05 11:11:53 +02:00
Conversation 0 Commits 112 Files Changed 119 +8 -5
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd6f18db52 - Show all commits

3
searchPages/find/searchAll.component.ts
View File

@ -85,7 +85,8 @@ export class SearchAllComponent {
@Input() name; @Input() name;
@Input() customFilter: SearchCustomFilter = null; @Input() customFilter: SearchCustomFilter = null;
@Input() piwikSiteId = null; @Input() piwikSiteId = null;
@Input() formPlaceholderText = "Search for "+OpenaireEntities.RESULTS+", "+OpenaireEntities.PROJECTS+", "+OpenaireEntities.DATASOURCES+" & "+OpenaireEntities.ORGANIZATIONS+" in OpenAIRE"; @Input() formPlaceholderText = "What are you looking for?"
// @Input() formPlaceholderText = "Search for "+OpenaireEntities.RESULTS+", "+OpenaireEntities.PROJECTS+", "+OpenaireEntities.DATASOURCES+" & "+OpenaireEntities.ORGANIZATIONS+" in OpenAIRE";
@Input() searchForm: SearchForm = {class: 'search-form', dark: true} @Input() searchForm: SearchForm = {class: 'search-form', dark: true}
@Input() breadcrumbs: Breadcrumb[] = []; @Input() breadcrumbs: Breadcrumb[] = [];

9
searchPages/searchUtils/advancedSearchForm.component.html
View File

@ -163,11 +163,12 @@
</div> </div>
<div class="uk-flex uk-flex-center uk-child-width-1-1"> <div class="uk-flex uk-flex-center uk-child-width-1-1">
<ng-container *ngIf="entitiesSelection"> <ng-container *ngIf="entitiesSelection">
<advanced-search-input [class.uk-hidden]="disableSelect" [dark]="dark" [iconPosition]="isMobile?'left':'right'" [disabled]="isDisabled" (searchEmitter)="simpleKeywordChanged()"> <!-- [class.uk-hidden]="disableSelect" -->
<entities-selection [simpleView]="true" [currentEntity]="entityType" <advanced-search-input [dark]="dark" [iconPosition]="isMobile?'left':'right'" [disabled]="isDisabled" (searchEmitter)="simpleKeywordChanged()">
<!-- <entities-selection [simpleView]="true" [currentEntity]="entityType"
(selectionChange)="simpleEntityChanged($event)" (disableSelectEmitter)="disableSelectChange($event)" (selectionChange)="simpleEntityChanged($event)" (disableSelectEmitter)="disableSelectChange($event)"
[onChangeNavigate]="true" [customFilter]="customFilter" class="uk-width-2-5"></entities-selection> [onChangeNavigate]="true" [customFilter]="customFilter" class="uk-width-2-5"></entities-selection> -->
<div class="uk-width-expand" input placeholder="Scholary works" [searchable]="true" [hint]="formPlaceholderText" <div class="uk-width-expand" input placeholder="Search in Explore" [searchable]="true" [hint]="formPlaceholderText"
[(value)]="selectedFields[0].value" tooltip="true"></div> [(value)]="selectedFields[0].value" tooltip="true"></div>
<a *ngIf="isMobile" href="#mobile-filters" filters-toggle (click)="filtersClicked.emit(true)" uk-toggle> <a *ngIf="isMobile" href="#mobile-filters" filters-toggle (click)="filtersClicked.emit(true)" uk-toggle>
<icon name="filters"></icon> <icon name="filters"></icon>

1
utils/properties/env-properties.ts
View File

@ -96,6 +96,7 @@ export interface EnvProperties {
searchLinkToOrp?: string; searchLinkToOrp?: string;
searchLinkToOrganization?: string; searchLinkToOrganization?: string;
//Search pages //Search pages
searchLinkToAll?: string;
searchLinkToCommunities?: string; searchLinkToCommunities?: string;
searchLinkToStakeholders?: string; searchLinkToStakeholders?: string;
searchLinkToPublications?: string; searchLinkToPublications?: string;