[Connect Admin | Library | new-theme]: Redesign of remove/add projects and zenodo communities pages according to the new mocks.
1. searchProjects.service.ts: Added "params" parameter in "getFunders()" method. 2. resultsAndPagesNum.component.ts: Do not show number of results and pages when no results. 3. manage-communities.module.ts: Remove "group" and "lock" icons from registerIcons call. 4. add-projects.component & communityProjects.module.ts & manage-projects.component.ts & remove-projects.component: Redesign of remove/add projects pages according to the new mocks. 5. add-zenodo-communities.component & manage-zenodo-communities.component & preview-z-community.component.ts & zenodo-communities.component.ts & zenodo-communities.module.ts: Redesign of remove/add zenodo communities pages according to the new mocks.
This commit is contained in:
parent
d925b62133
commit
72905d8599
|
@ -135,7 +135,7 @@ export class PortalsComponent implements OnInit {
|
||||||
|
|
||||||
private confirmModalOpen() {
|
private confirmModalOpen() {
|
||||||
this.deleteModal.alertTitle = 'Delete Confirmation';
|
this.deleteModal.alertTitle = 'Delete Confirmation';
|
||||||
this.deleteModal.message = 'Are you sure you want to delete the selected portal(-ies)?';
|
this.deleteModal.message = 'Are you sure you want to delete the selected portal(s)?';
|
||||||
this.deleteModal.okButtonText = 'Yes';
|
this.deleteModal.okButtonText = 'Yes';
|
||||||
this.deleteModal.open();
|
this.deleteModal.open();
|
||||||
}
|
}
|
||||||
|
|
|
@ -95,12 +95,12 @@ export class SearchProjectsService {
|
||||||
//.map(res => <any> res.json())
|
//.map(res => <any> res.json())
|
||||||
.pipe(map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "project")]));
|
.pipe(map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "project")]));
|
||||||
}
|
}
|
||||||
getFunders(properties:EnvProperties ):any {
|
getFunders(params: string, properties:EnvProperties ):any {
|
||||||
let url = properties.searchAPIURLLAst+"projects?refine=true&fields=funder&size=0"+ "&format=json";
|
let url = properties.searchAPIURLLAst+"projects?refine=true&fields=funder"+(params ? "&"+params : "")+"&size=0"+ "&format=json";
|
||||||
|
|
||||||
return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
|
return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
|
||||||
//.map(res => <any> res.json())
|
//.map(res => <any> res.json())
|
||||||
.pipe(map(res => [res['meta'].total, res['refineResults']['funder']]));
|
.pipe(map(res => [res['meta'].total, RefineResultsUtils.parse(res['refineResults'], ['funder'], 'project')]));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ import {Component, Input} from "@angular/core";
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'results-and-pages',
|
selector: 'results-and-pages',
|
||||||
template: `
|
template: `
|
||||||
<h6 *ngIf="type" [ngClass]="customClasses">
|
<h6 *ngIf="type && totalResults > 0" [ngClass]="customClasses">
|
||||||
<span>{{totalResults | number}}</span>
|
<span>{{totalResults | number}}</span>
|
||||||
<span class="uk-text-meta uk-text-capitalize"> {{type}}, page </span>
|
<span class="uk-text-meta uk-text-capitalize"> {{type}}, page </span>
|
||||||
<span>{{currentPage}}</span>
|
<span>{{currentPage}}</span>
|
||||||
|
|
Loading…
Reference in New Issue