Revision 58525
Added by Argiro Kokogiannaki almost 4 years ago
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/find/searchAll.component.html | ||
---|---|---|
67 | 67 |
</a> |
68 | 68 |
</li> |
69 | 69 |
</ul> |
70 |
<quick-selections *ngIf="activeEntity == 'result' && quickFilter" [resultTypes]="resultTypes" |
|
70 |
<!-- <quick-selections *ngIf="activeEntity == 'result' && quickFilter" [resultTypes]="resultTypes"
|
|
71 | 71 |
(typeChange)="quickSelectionsChanged()" [isDisabled]="disableForms" |
72 | 72 |
[quickFilter]="quickFilter" [QFselected]="(quickFilter)?quickFilter.selected:null" |
73 | 73 |
[properties]="properties"> |
74 |
</quick-selections> |
|
74 |
</quick-selections>-->
|
|
75 | 75 |
|
76 | 76 |
</div> |
77 | 77 |
|
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/find/searchAll.component.ts | ||
---|---|---|
338 | 338 |
delete this.parameters['fv0']; |
339 | 339 |
} |
340 | 340 |
} |
341 |
/* |
|
342 |
//quickSelection moved inside the searchpage |
|
341 | 343 |
private prepareResultParameters() { |
342 | 344 |
//quickSelections |
343 | 345 |
if (this.resultTypes && this.activeEntity == "result") { |
... | ... | |
368 | 370 |
this.parameters["page"] = 1; |
369 | 371 |
this.reload[this.activeEntity] = true; |
370 | 372 |
this.router.navigate([location.pathname], {queryParams: this.parameters}); |
371 |
} |
|
373 |
}*/
|
|
372 | 374 |
|
373 | 375 |
|
374 | 376 |
public keywordChanged($event) { |
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/find/searchAll.module.ts | ||
---|---|---|
18 | 18 |
import {SearchAllComponent} from "./searchAll.component"; |
19 | 19 |
import {AdvancedSearchFormModule} from "../searchUtils/advancedSearchForm.module"; |
20 | 20 |
import {SearchResearchResultsModule} from "../searchResearchResults.module"; |
21 |
import {QuickSelectionsModule} from "../searchUtils/quick-selections.module"; |
|
22 | 21 |
import {SearchProjectsModule} from "../searchProjects.module"; |
23 | 22 |
import {SearchOrganizationsModule} from "../searchOrganizations.module"; |
24 | 23 |
import {SearchDataProvidersModule} from "../searchDataProviders.module"; |
... | ... | |
28 | 27 |
CommonModule, FormsModule, RouterModule, |
29 | 28 |
DataProvidersServiceModule, ProjectsServiceModule, |
30 | 29 |
SearchResearchResultsServiceModule, OrganizationsServiceModule, |
31 |
BrowseEntitiesModule, SearchResultsModule, PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, AdvancedSearchFormModule, SearchResearchResultsModule, QuickSelectionsModule, SearchProjectsModule, SearchOrganizationsModule, SearchDataProvidersModule
|
|
30 |
BrowseEntitiesModule, SearchResultsModule, PiwikServiceModule, Schema2jsonldModule, SEOServiceModule, AdvancedSearchFormModule, SearchResearchResultsModule, SearchProjectsModule, SearchOrganizationsModule, SearchDataProvidersModule |
|
32 | 31 |
], |
33 | 32 |
declarations: [ |
34 | 33 |
SearchAllComponent |
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/advancedSearchForm.component.html | ||
---|---|---|
18 | 18 |
|
19 | 19 |
<quick-selections [resultTypes]="resultTypes" (typeChange)="queryChanged()" [isDisabled]="isDisabled" |
20 | 20 |
[quickFilter]="quickFilter" [QFselected]="(quickFilter)?quickFilter.selected:null" |
21 |
[properties]="properties" class="uk-grid uk-margin-small-left"
|
|
21 |
[properties]="properties" class="uk-grid "
|
|
22 | 22 |
></quick-selections> |
23 | 23 |
<hr *ngIf="resultTypes || quickFilter" class="uk-margin-small"> |
24 | 24 |
<table class=" uk-table uk-table-responsive uk-table-small uk-margin-remove"> |
... | ... | |
147 | 147 |
[placeholder]="formPlaceholderText" aria-describedby="sizing-addon2" |
148 | 148 |
[(ngModel)]="selectedFields[0].value" name="keyword"> |
149 | 149 |
</div> |
150 |
<div> |
|
150 |
<div class=" uk-width-xlarge@l uk-width-large@m uk-width-medium">
|
|
151 | 151 |
<quick-selections [resultTypes]="resultTypes" (typeChange)="queryChanged()" [isDisabled]="isDisabled" |
152 | 152 |
[quickFilter]="quickFilter" [QFselected]="(quickFilter)?quickFilter.selected:null" |
153 | 153 |
[properties]="properties"> |
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/newSearchPage.component.html | ||
---|---|---|
112 | 112 |
<div class="tm-main uk-width-1-1@s uk-width-1-1@m uk-width-1-1@l uk-row-first "> |
113 | 113 |
<!-- TODO add breadcrumb here--> |
114 | 114 |
<div *ngIf="showBreadcrumb" class=" uk-margin-large-left">Home > Search</div> |
115 |
<div class="uk-container uk-container-large uk-margin-medium-top">
|
|
115 |
<div class="uk-container uk-container-large"> |
|
116 | 116 |
<div> |
117 | 117 |
|
118 | 118 |
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" [texts]="pageContents['top']"></helper> |
... | ... | |
249 | 249 |
|
250 | 250 |
</div> |
251 | 251 |
</div> |
252 |
<div *ngIf="includeOnlyResultsAndFilter" class="uk-margin-medium-top uk-margin-medium-bottom"> |
|
253 |
<a *ngIf ="advancedSearchLink" routerLinkActive="router-link-active" |
|
252 |
<div *ngIf="includeOnlyResultsAndFilter && (resultTypes || quickFilter)" |
|
253 |
class="uk-margin-medium-top uk-margin-medium-bottom"> |
|
254 |
<a *ngIf ="showAdvancedSearchLink && advancedSearchLink" routerLinkActive="router-link-active" |
|
254 | 255 |
[routerLink]="advancedSearchLink" style="z-index:1;" [queryParams]="this.routerHelper.createQueryParams(this.parameterNames, this.parameterValues)" |
255 | 256 |
[class]="(disableForms?' uk-disabled uk-link-muted ':'') +' portal-link uk-float-right '">Advanced search |
256 | 257 |
</a> |
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchUtils/quick-selections.component.ts | ||
---|---|---|
9 | 9 |
@Component({ |
10 | 10 |
selector: 'quick-selections', |
11 | 11 |
template: ` |
12 |
<form *ngIf="resultTypes || quickFilter" [formGroup]="control" class="uk-text-small uk-margin-small-bottom uk-grid"> |
|
13 |
<div *ngIf="quickFilter" class="uk-margin-small-top uk-padding-remove-left "> |
|
12 |
<form *ngIf="resultTypes || quickFilter" [formGroup]="control" class="uk-text-small uk-margin-small-bottom uk-grid uk-inline uk-flex uk-margin-small-left">
|
|
13 |
<div *ngIf="quickFilter" class="uk-margin-small-top uk-padding-remove-left uk-margin-right ">
|
|
14 | 14 |
<span class="uk-text-bold">{{quickFilter.value}}</span> |
15 | 15 |
<mat-slide-toggle |
16 | 16 |
class="uk-margin-small-left" formControlName="QFselected" (change)="quickFilterChanged()"> |
17 | 17 |
</mat-slide-toggle> |
18 | 18 |
</div> |
19 |
<div *ngIf="resultTypes && showEntities" class="uk-margin-small-top"> |
|
19 |
<div *ngIf="resultTypes && showEntities" class="uk-margin-small-top uk-padding-remove-left">
|
|
20 | 20 |
<span class="uk-text-muted">Include: </span> |
21 |
<span> |
|
22 |
<span *ngIf="showPublications" class="uk-margin-small-left"> <input type="checkbox" id="publ" name="Publications" formControlName="publication" (change)="changed()"> Publications </span> |
|
23 |
<span *ngIf="showDatasets" class="uk-margin-small-left"> <input type="checkbox" formControlName="dataset" (change)="changed()"> Research data </span> |
|
24 |
<span *ngIf="showSoftware" class="uk-margin-small-left"> <input type="checkbox" formControlName="software" (change)="changed()"> Software </span> |
|
25 |
<span *ngIf="showOrp" class="uk-margin-small-left"> <input type="checkbox" formControlName="other" (change)="changed()"> Other research products </span> |
|
26 |
</span> |
|
21 |
<span>
|
|
22 |
<span *ngIf="showPublications" class="uk-margin-small-left"> <input type="checkbox" id="publ" name="Publications" formControlName="publication" (change)="changed()"> Publications </span>
|
|
23 |
<span *ngIf="showDatasets" class="uk-margin-small-left"> <input type="checkbox" formControlName="dataset" (change)="changed()"> Research data </span>
|
|
24 |
<span *ngIf="showSoftware" class="uk-margin-small-left"> <input type="checkbox" formControlName="software" (change)="changed()"> Software </span>
|
|
25 |
<span *ngIf="showOrp" class="uk-margin-small-left"> <input type="checkbox" formControlName="other" (change)="changed()"> Other research products </span>
|
|
26 |
</span>
|
|
27 | 27 |
</div> |
28 | 28 |
</form> |
29 | 29 |
` |
modules/uoa-services-library/trunk/ng-openaire-library/src/app/searchPages/searchResearchResults.component.ts | ||
---|---|---|
33 | 33 |
[filters]="filters" [quickFilter]="quickFilter" |
34 | 34 |
[rangeFilters]="rangeFilters" [rangeFields]="rangeFields" |
35 | 35 |
[simpleView]="simpleView" formPlaceholderText="Search by title, author, abstract, DOI, orcid..." |
36 |
[includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter" [showBreadcrumb]="showBreadcrumb" |
|
36 |
[includeOnlyResultsAndFilter]="includeOnlyResultsAndFilter" [showBreadcrumb]="showBreadcrumb" [showAdvancedSearchLink]="showAdvancedSearchLink"
|
|
37 | 37 |
> |
38 | 38 |
</new-search-page> |
39 | 39 |
|
... | ... | |
84 | 84 |
@Input() includeOnlyResultsAndFilter: boolean = false; |
85 | 85 |
@Input() showBreadcrumb:boolean = false; |
86 | 86 |
@Output() searchPageUpdates = new EventEmitter(); |
87 |
@Input() showAdvancedSearchLink:boolean = true; |
|
87 | 88 |
subs: any[]=[]; |
88 | 89 |
constructor(private route: ActivatedRoute, private _searchResearchResultsService: SearchResearchResultsService) { |
89 | 90 |
this.results = []; |
Also available in: Unified diff
[Library |Trunk]
Apply corrections after initial connect update :
Search all: remove quick selections as it is inside the search page
Search results: add option to show advanced search link
QuickSelections: fix widths and margins