diff --git a/landingPages/landing-utils/showSubjects.component.ts b/landingPages/landing-utils/showSubjects.component.ts index 8d38de9a..31767075 100644 --- a/landingPages/landing-utils/showSubjects.component.ts +++ b/landingPages/landing-utils/showSubjects.component.ts @@ -26,7 +26,7 @@ import {properties} from "../../../../environments/environment";
- Subjects + Keywords
@@ -215,7 +215,7 @@ export class ShowSubjectsComponent { if(this.isMobile) { this.viewAllSubjects = true; this.viewAllClicked.emit({ - subtitle: 'Subjects', + subtitle: 'Keywords', id: 'subjects' }); } else { diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index f7f290dc..a7f40041 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -286,6 +286,9 @@ + + @@ -312,6 +315,9 @@ + + + @@ -512,6 +518,13 @@

+ +
+ Subjects + +
+
+
References @@ -660,6 +673,13 @@ + + + + + + @@ -854,20 +874,6 @@ {{resultLandingInfo.countries.join(", ")}}
-
- - [viewAllSubjects]="viewAllMobile=='subjects'" - [viewAllClassifiedSubjects]="viewAllMobile=='classifiedSubjects'" - (viewAllClicked)="viewAllSubjectsMobileClicked($event)"> - -
@@ -890,6 +896,20 @@
+ +
+ + +
+
+
0) - || !!this.resultLandingInfo.subjects - || (this.resultLandingInfo.classifiedSubjects && this.resultLandingInfo.classifiedSubjects.size > 0) || (!!this.resultLandingInfo.organizations && this.resultLandingInfo.organizations.length > 0)); } @@ -927,9 +926,9 @@ export class ResultLandingComponent { } } - public viewAllSubjectsMobileClicked(event: string) { - this.summaryFsModal.title += " - "+event['subtitle']; - this.summaryFsModal.back = true; + public viewAllSubjectsMobileClicked(event) { + this.subjectsFsModal.title += " - "+event['subtitle']; + this.subjectsFsModal.back = true; this.viewAllMobile = event['id']; } @@ -947,6 +946,12 @@ export class ResultLandingComponent { this.viewAllMobile = ""; } + public cancelSubjectsClicked() { + this.subjectsFsModal.title = "Subjects"; + this.subjectsFsModal.back = false; + this.viewAllMobile = ""; + } + public openOrganizationsModal() { this.organizationsModal.cancelButton = false; this.organizationsModal.okButton = false;