Merge branch 'new-theme' of code-repo.d4science.org:MaDgIK/openaire-library into new-theme

This commit is contained in:
argirok 2022-09-20 10:51:33 +03:00
commit 5ba1d27aaa
5 changed files with 10 additions and 12 deletions

View File

@ -14,19 +14,18 @@ import {Subscriber} from "rxjs";
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs> <breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
</div> </div>
</div> </div>
<div class="uk-section uk-container"> <div class="uk-container uk-container-large uk-section">
<h1>Indicator Themes<span class="uk-text-primary">.</span></h1> <h1>Indicator Themes<span class="uk-text-primary">.</span></h1>
<div class="uk-section"> <div class="uk-section">
<div class="uk-grid uk-grid-large uk-child-width-1-2@m uk-child-width-1-1 uk-flex-middle" uk-grid> <div class="uk-grid uk-grid-large uk-flex-middle" uk-grid>
<div> <div class="uk-width-3-5@m uk-width-1-1">
<img src="assets/common-assets/monitor-assets/indicator-themes-circle.png"> <img src="assets/common-assets/monitor-assets/indicator-themes-circle.png">
</div> </div>
<div> <div class="uk-width-expand@m uk-width-1-1">
<div class="uk-width-4-5@m"> <div>
<h5>Indicator themes that we are covering in the Monitor dashboards.</h5> <h5>Indicator themes that we are covering in the Monitor dashboards.</h5>
<p> <p>
Please be aware that this is the current set, which will be enriched as requests and data are coming into the This is the current set of indicator themes we cover. Well keep enriching it as new requests and data are coming into the <a href="https://graph.openaire.eu" class="text-graph" target="_blank">OpenAIRE Research Graph</a>. We are at your disposal, should you have any recommendations!
<a href="https://graph.openaire.eu" class="text-graph" target="_blank">OpenAIRE Research Graph</a>. We are at your disposal to add more indicator themes that may fit your needs.
</p> </p>
<p> <p>
Check out the indicator pages (for <a [routerLink]="['../funder']" [relativeTo]="route">funders</a>, Check out the indicator pages (for <a [routerLink]="['../funder']" [relativeTo]="route">funders</a>,
@ -44,7 +43,7 @@ import {Subscriber} from "rxjs";
export class IndicatorThemesComponent implements OnInit, OnDestroy { export class IndicatorThemesComponent implements OnInit, OnDestroy {
private subscriptions: any[] = []; private subscriptions: any[] = [];
public properties = properties; public properties = properties;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Resources'}, {name: 'Themes'}]; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Resources - Themes'}];
constructor(private router: Router, constructor(private router: Router,
private meta: Meta, private meta: Meta,

View File

@ -44,7 +44,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy {
const description = "Monitor | Indicators for " + type.label; const description = "Monitor | Indicators for " + type.label;
const title = "Monitor | Indicators for " + type.label; const title = "Monitor | Indicators for " + type.label;
this.metaTags(title, description); this.metaTags(title, description);
this.breadcrumbs[2] = {name: type.label}; this.breadcrumbs[1] = {name: 'Resources - ' + type.label}
} }
} }
this.breadcrumbs[0].route = '/' + (params['stakeholder']?params['stakeholder']:''); this.breadcrumbs[0].route = '/' + (params['stakeholder']?params['stakeholder']:'');

View File

@ -68,7 +68,7 @@ export class SeeHowItWorksComponent implements OnInit, OnDestroy {
public tab: 'entities' | 'attributes' = 'entities'; public tab: 'entities' | 'attributes' = 'entities';
private subscriptions: any[] = []; private subscriptions: any[] = [];
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Resources'}, {name: 'See how it works', keepFormat: true}]; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Resources - See how it works', keepFormat: true}];
constructor(private seoService: SEOService, constructor(private seoService: SEOService,
private meta: Meta, private meta: Meta,

View File

@ -459,7 +459,7 @@ export class TerminologyComponent implements OnInit, OnDestroy {
public tab: 'entities' | 'attributes' = 'entities'; public tab: 'entities' | 'attributes' = 'entities';
private subscriptions: any[] = []; private subscriptions: any[] = [];
public openaireEntities = OpenaireEntities; public openaireEntities = OpenaireEntities;
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Resources'}, {name: 'Terminology and construction', keepFormat: true}]; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Resources - Terminology and construction', keepFormat: true}];
public graph_offset: number = 0; public graph_offset: number = 0;
public graph_height: number = 0; public graph_height: number = 0;
@ViewChild("graph_element") graph_element; @ViewChild("graph_element") graph_element;

View File

@ -21,7 +21,6 @@ export class ClearCacheService {
purgeBrowserCache(message: string = null, pid: string) { purgeBrowserCache(message: string = null, pid: string) {
if(properties.deleteBrowserCacheUrl) { if(properties.deleteBrowserCacheUrl) {
let url = properties.deleteBrowserCacheUrl + "/" + pid; let url = properties.deleteBrowserCacheUrl + "/" + pid;
this.http.get(url, CustomOptions.registryOptions()).subscribe( this.http.get(url, CustomOptions.registryOptions()).subscribe(
res => console.log((message ? message + ": " : "") + "Browser Cache purged!"), res => console.log((message ? message + ": " : "") + "Browser Cache purged!"),