@@ -315,4 +315,4 @@ export class HowItWorksComponent {
private updateUrl(url: string) {
this._meta.updateTag({content: url}, "property='og:url'");
}
-}
\ No newline at end of file
+}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index a37d5c5..802b69e 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -8,7 +8,7 @@ const routes: Routes = [
{path: 'about/learn-how', redirectTo: 'about', pathMatch: 'full'},
{
path: 'about',
- loadChildren: () => import('./learn-how/learn-how.module').then(m => m.LearnHowModule)
+ loadChildren: () => import('./about/about.module').then(m => m.AboutModule)
},
{
path: 'methodology',
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ee2d138..42ca9af 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -155,9 +155,12 @@ export class AppComponent {
new MenuItem("stakeholders", "Browse " + this.stakeholderEntities.STAKEHOLDERS, "", "/browse", false, [], null, {})
);
this.resourcesService.setResources(this.menuItems);
- this.menuItems.push(
- new MenuItem("about", "About", "", "/about", false, [], null, {})
- );
+ let about = new MenuItem("about", "About", "", "", false, [], null, {});
+ about.items = [
+ new MenuItem("how-it-works", "How it works", "", "/about/how-it-works", false, [], null, {}),
+ new MenuItem("faqs", "FAQs", "", "/about/faqs", false, [], null, {})
+ ]
+ this.menuItems.push(about);
this.bottomMenuItems = [
new MenuItem("", "About", "https://beta.openaire.eu/project-factsheets", "", false, [], [], {}),
new MenuItem("", "News - Events", "https://beta.openaire.eu/news-events", "", false, [], [], {}),
diff --git a/src/app/learn-how/learn-how-routing.module.ts b/src/app/learn-how/learn-how-routing.module.ts
deleted file mode 100644
index 7f389e7..0000000
--- a/src/app/learn-how/learn-how-routing.module.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule} from '@angular/router';
-
-import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {LearnHowComponent} from "./learn-how.component";
-
-@NgModule({
- imports: [
- RouterModule.forChild([
- { path: '', component: LearnHowComponent, canDeactivate: [PreviousRouteRecorder] }
-
- ])
- ]
-})
-export class LearnHowRoutingModule { }
diff --git a/src/app/learn-how/learn-how.component.html b/src/app/learn-how/learn-how.component.html
deleted file mode 100644
index 1a0991f..0000000
--- a/src/app/learn-how/learn-how.component.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
Learn the process.
-
- Use the Monitor Dashboard to view your research results, open science.
-
-
-
-
-
-
-
-
-
-
-
- Starting from the OpenAIRE RESEARCH GRAPH
-
-
-
OpenAIRE Research Graph is a comprehensive research graph (meta research) that links all types of research products to funders, organizations, researchers, research communities and publishers. With information from global databases, disambiguated and interlinked using semantic AI technologies.
-
-
-
-
-
-
-
- Provide us some information
-
-
- You give us some simple (meta)data related to your organization function: e.g., funding database, repositories, related projects, registry of peopleā¦ All under confidential agreements.
-
-
-
-
-
-
-
- We get the ball rolling
-
-
- We ingest your data in our system and start the work: we clean and normalize your data, we identify and extract related information, we infer links. We refine until we are happy of the results and present to you.
-
-
-
-
-
-
-
- You validate
-
-
- After the first iteration you examine our results to ensure you are satisfied with what you see. As numbers are important, we will work with you to understand any gaps and deviations. We correct, you check, you approve.
-
-
-
-
-
-
-
- You set up your portal
-
-
- Using our admin panel you set up your portal. You select metrics of interest to you (full documentation available). You decide what you want to publish, what to keep private, what to share with colleagues.
-
-
-
-
-
-
-
- You track, monitor, report
-
-
- Now your views are updated every 2-4 weeks, as new content and new providers join OpenAIRE. You are notified about new metrics and indicators as we keep on enriching the OpenAIRE Research Graph and you may add them as they come along.
-
-
-
-
-
-
-
-
Inclusion, transparency, quality, state of the art technology.
-
Research tracking & monitoring in a nutshell.
-
-
-
-
diff --git a/src/app/learn-how/learn-how.component.less b/src/app/learn-how/learn-how.component.less
deleted file mode 100644
index 3f4532d..0000000
--- a/src/app/learn-how/learn-how.component.less
+++ /dev/null
@@ -1,4 +0,0 @@
-.about-background {
- background-image: url('~src/assets/monitor-assets/about/dot-pattern.svg');
- background-size: 20%;
-}
diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts
deleted file mode 100644
index 45cdc12..0000000
--- a/src/app/learn-how/learn-how.component.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import {Component} from '@angular/core';
-import {ActivatedRoute, Router} from '@angular/router';
-import {Meta, Title} from '@angular/platform-browser';
-import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
-import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
-import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
-import {properties} from "../../environments/environment";
-import {Subscriber} from "rxjs";
-import {Breadcrumb} from '../openaireLibrary/utils/breadcrumbs/breadcrumbs.component';
-import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields";
-import {StakeholderEntities} from '../openaireLibrary/monitor/entities/stakeholder';
-
-@Component({
- selector: 'learn-how',
- templateUrl: 'learn-how.component.html',
- styleUrls: ['learn-how.component.less'],
-})
-export class LearnHowComponent {
- public pageContents = null;
- public divContents = null;
-
- public url: string = null;
- public pageTitle: string = "OpenAIRE - Monitor | About";
- public description: string = "Learn the process: Use the Monitor Dashboard to view your research results, open science. See how it works. Simplify research tracking & monitoring ";
- public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'About'}];
- public openaireEntities = OpenaireEntities;
- public stakeholderEntities = StakeholderEntities;
- public properties: EnvProperties = properties;
- subscriptions = [];
-
- constructor(
- private route: ActivatedRoute,
- private _router: Router,
- private _meta: Meta,
- private _title: Title,
- private seoService: SEOService,
- private _piwikService: PiwikService,
- private helper: HelperService) {
- }
-
- public ngOnInit() {
- if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
- this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
- }
- this.url = this.properties.domain + this.properties.baseLink + this._router.url;
- this.seoService.createLinkForCanonicalURL(this.url);
- this.updateUrl(this.url);
- this.updateTitle(this.pageTitle);
- this.updateDescription("OpenAIRE - Monitor, " + this.stakeholderEntities.FUNDERS+ ", Statistics, EC - Learn How");``
- //this.getDivContents();
- //this.getPageContents();
-
- }
-
- private getPageContents() {
- this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
- this.pageContents = contents;
- }));
- }
-
- private getDivContents() {
- this.subscriptions.push(this.helper.getDivHelpContents(this.properties, 'monitor', this._router.url).subscribe(contents => {
- this.divContents = contents;
- }));
- }
-
- ngOnDestroy() {
- this.subscriptions.forEach(subscription => {
- if (subscription instanceof Subscriber) {
- subscription.unsubscribe();
- }
- });
- }
-
-
- private updateDescription(description: string) {
- this._meta.updateTag({content: description}, "name='description'");
- this._meta.updateTag({content: description}, "property='og:description'");
- }
-
- private updateTitle(title: string) {
- var _title = ((title.length > 50) ? title.substring(0, 50) : title);
- this._title.setTitle(_title);
- this._meta.updateTag({content: _title}, "property='og:title'");
- }
-
- private updateUrl(url: string) {
- this._meta.updateTag({content: url}, "property='og:url'");
- }
-}
diff --git a/src/app/learn-how/learn-how.module.ts b/src/app/learn-how/learn-how.module.ts
deleted file mode 100644
index cee5747..0000000
--- a/src/app/learn-how/learn-how.module.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { NgModule} from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
-import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
-import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-
-import {LearnHowComponent} from "./learn-how.component";
-import {LearnHowRoutingModule} from "./learn-how-routing.module";
-import {GifSliderModule} from "../openaireLibrary/utils/gif-slider/gif-slider.module";
-import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
-import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
-import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
-import {HowModule} from "../openaireLibrary/monitor/how/how.module";
-import {BreadcrumbsModule} from '../openaireLibrary/utils/breadcrumbs/breadcrumbs.module';
-import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
-
-@NgModule({
- imports: [
- CommonModule, RouterModule, LearnHowRoutingModule, GifSliderModule, HelperModule,
- Schema2jsonldModule, SEOServiceModule, HowModule, BreadcrumbsModule, IconsModule
- ],
- declarations: [
- LearnHowComponent
- ],
- exports: [
- LearnHowComponent
- ],
- providers:[
- PreviousRouteRecorder, PiwikService
- ]
-})
-export class LearnHowModule { }
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 8491155..cdffb01 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 84911550beebde7edd9c08c2c0b7e8e3b560258c
+Subproject commit cdffb018b6ddd246b930300745a423ff0f1870b9
diff --git a/src/app/search-stakeholders/search-stakeholders.component.ts b/src/app/search-stakeholders/search-stakeholders.component.ts
index 76389ef..ee11eb3 100644
--- a/src/app/search-stakeholders/search-stakeholders.component.ts
+++ b/src/app/search-stakeholders/search-stakeholders.component.ts
@@ -10,7 +10,7 @@ import {Session, User} from "../openaireLibrary/login/utils/helper.class";
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
-import {NewSearchPageComponent} from "../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
+import {NewSearchPageComponent, SearchForm} from "../openaireLibrary/searchPages/searchUtils/newSearchPage.component";
import {StakeholderEntities, StakeholderInfo} from "../openaireLibrary/monitor/entities/stakeholder";
import {properties} from "../../environments/environment";
import {Subscriber} from "rxjs";
@@ -21,16 +21,19 @@ import {TitleCasePipe} from "@angular/common";
selector: 'search-stakeholders',
template: `
1) ? this.stakeholderEntities.STAKEHOLDERS:this.stakeholderEntities.STAKEHOLDER" entityType="stakeholder"
- [results]="results" [searchUtils]="searchUtils"
- [showResultCount]=true
- [disableForms]="disableForms"
- [showIndexInfo]=false
- [simpleView]="true"
- [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields" [showBreadcrumb]="true" [breadcrumbs]="breadcrumbs"
- [simpleSearchLink]="searchLink" [entitiesSelection]="false">
+ [hasPrefix]=false [piwikSiteId]="piwikSiteId"
+ [formPlaceholderText]="'Search OpenAIRE Monitor ' + this.stakeholderEntities.STAKEHOLDERS"
+ [type]="(results.length > 1) ? this.stakeholderEntities.STAKEHOLDERS:this.stakeholderEntities.STAKEHOLDER"
+ entityType="stakeholder"
+ [results]="results" [searchUtils]="searchUtils"
+ [showResultCount]=true
+ [disableForms]="disableForms"
+ [showIndexInfo]=false
+ [simpleView]="true"
+ [searchForm]="searchForm"
+ [fieldIds]="fieldIds" [fieldIdsMap]="fieldIdsMap" [selectedFields]="selectedFields"
+ [showBreadcrumb]="true" [breadcrumbs]="breadcrumbs"
+ [simpleSearchLink]="searchLink" [entitiesSelection]="false">
`
})
@@ -61,8 +64,9 @@ export class SearchStakeholdersComponent {
};
public keyword = "";
public searchLink;
- public stakeholderEntities = StakeholderEntities;
+ public stakeholderEntities = StakeholderEntities;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Browse ' + this.stakeholderEntities.STAKEHOLDERS}];
+ public searchForm: SearchForm = {class: 'uk-background-muted', dark: false};
properties: EnvProperties = properties;
@ViewChild(NewSearchPageComponent, {static: true}) searchPage: NewSearchPageComponent;
private user: User;
@@ -70,7 +74,7 @@ export class SearchStakeholdersComponent {
constructor(private route: ActivatedRoute,
private _stakeholderService: StakeholderService,
private userManagementService: UserManagementService,
- public titleCasePipe: TitleCasePipe) {
+ public titleCasePipe: TitleCasePipe) {
this.errorCodes = new ErrorCodes();
this.errorMessages = new ErrorMessagesComponent();
this.searchUtils.status = this.errorCodes.LOADING;
@@ -129,7 +133,7 @@ export class SearchStakeholdersComponent {
* @param params
*/
private initFunders(params) {
- if(this.totalResults) {
+ if (this.totalResults) {
this.parseResults(this.totalResults);
this._getResults(params);
} else {