0) || (otherSubjects && otherSubjects.size > 0))">
0">
- 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 @@
+
+
0"
[tabTitle]="'References'" [tabId]="'references'"
[tabNumber]="resultLandingInfo.references.length">
@@ -312,6 +315,9 @@
+
+
+
0">
@@ -512,6 +518,13 @@
+ 0">
References
@@ -660,6 +673,13 @@
+
+
+
+
+
+
0">
@@ -854,20 +874,6 @@
{{resultLandingInfo.countries.join(", ")}}
-
-
- [viewAllSubjects]="viewAllMobile=='subjects'"
- [viewAllClassifiedSubjects]="viewAllMobile=='classifiedSubjects'"
- (viewAllClicked)="viewAllSubjectsMobileClicked($event)">
-
-
0 && (!viewAllMobile || viewAllMobile == 'organizations')"
class="uk-margin-medium-bottom uk-width-2-3@m">
@@ -890,6 +896,20 @@
+
+
+
+
+
+
+
pageSize" [type]="'references'"
diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts
index 5adb093b..c92e1ae9 100644
--- a/landingPages/result/resultLanding.component.ts
+++ b/landingPages/result/resultLanding.component.ts
@@ -156,6 +156,7 @@ export class ResultLandingComponent {
public isMobile: boolean = false;
// Full screen modals for small screens (mobile)
@ViewChild('summaryFsModal') summaryFsModal: FullScreenModalComponent;
+ @ViewChild('subjectsFsModal') subjectsFsModal: FullScreenModalComponent;
@ViewChild('referencesFsModal') referencesFsModal: FullScreenModalComponent;
@ViewChild('relatedResearchFsModal') relatedResearchFsModal: FullScreenModalComponent;
@ViewChild('bioentitiesFsModal') bioentitiesFsModal: FullScreenModalComponent;
@@ -577,8 +578,6 @@ export class ResultLandingComponent {
public get hasPrimaryInfo(): boolean {
return !!this.resultLandingInfo && (
(!!this.resultLandingInfo.description && this.resultLandingInfo.description.length > 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;