diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts index 7913502d..1c9b1da0 100644 --- a/landingPages/landing-utils/parsingFunctions.class.ts +++ b/landingPages/landing-utils/parsingFunctions.class.ts @@ -8,6 +8,8 @@ import {Injectable} from '@angular/core'; export class ParsingFunctions { public notebookInSubjects: boolean = false; private notebookKeyword: string = "eosc jupyter notebook"; + private notebook_label: string = "EOSC"; + private notebook_value: string = "EOSC Jupyter Notebook"; public open = 'assets/common-assets/unlock.svg'; public closed = 'assets/common-assets/lock.svg'; @@ -530,28 +532,28 @@ export class ParsingFunctions { classifiedSubjects.get(subject.classname).push(subject.content); } else { if (subject.classid == "keyword") { - if (subjects == undefined) { - subjects = new Array(); - } - let content: string = subject.content; console.log("keyword subject: "+content); if(content && content.toLowerCase().includes(this.notebookKeyword)) { // console.log("included in keyword subject: "+content); console.log("included"); - this.notebookInSubjects = true; + + if (classifiedSubjects == undefined) { + classifiedSubjects = new Map(); + } + if (!classifiedSubjects.has(subject.classname)) { + classifiedSubjects.set(this.notebook_label, new Array()); + } + classifiedSubjects.get(this.notebook_label).push(this.notebook_value); + } else { + if (subjects == undefined) { + subjects = new Array(); + } + subjects.push(content); } - subjects.push(content); } else { - if (otherSubjects == undefined) { - otherSubjects = new Map(); - } - - if (!otherSubjects.has(subject.classname)) { - otherSubjects.set(subject.classname, new Array()); - } let content: string = subject.content; let classname: string = subject.classname; console.log("other subject: "+classname + ": " +content); @@ -562,8 +564,24 @@ export class ParsingFunctions { console.log("included"); this.notebookInSubjects = true; + + if (classifiedSubjects == undefined) { + classifiedSubjects = new Map(); + } + if (!classifiedSubjects.has(subject.classname)) { + classifiedSubjects.set(this.notebook_label, new Array()); + } + classifiedSubjects.get(this.notebook_label).push(this.notebook_value); + } else { + if (otherSubjects == undefined) { + otherSubjects = new Map(); + } + + if (!otherSubjects.has(subject.classname)) { + otherSubjects.set(subject.classname, new Array()); + } + otherSubjects.get(classname).push(content); } - otherSubjects.get(classname).push(content); } } } diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index db41463f..ca909b46 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -126,11 +126,11 @@ && (properties.environment == 'beta' || properties.environment == 'development')"> - - egi_notebook + + eosc_logo - EGI Notebook + EOSC SERVICE: EGI NOTEBOOK diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index fe218259..fe70d83f 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -27,10 +27,6 @@ import {$e} from "codelyzer/angular/styles/chars"; @Component({ - styles: [ - '.notebook-button { background-color: #f2f2f2; border: 1px solid #f2f2f2; } ' + - '.notebook-button:hover { background-color: #e5e5e5; border-color: #e5e5e5; } ' - ], selector: 'result-landing', templateUrl: 'resultLanding.component.html', })