-
Link to:
-
{{entity.title}}
+
+ Link to:
+
+ {{entity.title}}
+
`
})
diff --git a/claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts b/claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts
index 92557d9a..14ee0e60 100644
--- a/claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts
+++ b/claims/claim-utils/entityFormatter/projectTitleFormatter.component.ts
@@ -20,7 +20,7 @@ import {properties} from "../../../../../environments/environment";
- Funder: {{project['funderName']}}
+ Funder: {{project['funderName']}}
`
})
diff --git a/sharedComponents/menu.ts b/sharedComponents/menu.ts
index e3b38e60..b4328834 100644
--- a/sharedComponents/menu.ts
+++ b/sharedComponents/menu.ts
@@ -23,10 +23,11 @@ export class MenuItem {
isFeatured: boolean;
isActive: boolean;
target: string = "_blank";
+ badge?: string = ""; // used only for RDGraph portal (FAIRCORE4EOSC)
constructor(id: string, title: string, url: string, route: string, needsAuthorization: boolean, entitiesRequired: string[],
routeRequired: string[], params, icon: Icon = null, fragment = null, customClass = null, routeActive = null,
- target: string = "_blank", type: string = "internal", isFeatured: boolean = false, items: MenuItem[] = []) {
+ target: string = "_blank", type: string = "internal", isFeatured: boolean = false, items: MenuItem[] = [], badge: string = "") {
this._id = id;
this.title = title;
this.url = url;
@@ -43,6 +44,7 @@ export class MenuItem {
this.target = target;
this.type = type;
this.isFeatured = isFeatured;
+ this.badge = badge;
}
public static isTheActiveMenu(menu: MenuItem, currentRoute: any, activeMenuItem: string = ""): boolean {
diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html
index 7f502eab..a0147369 100644
--- a/sharedComponents/navigationBar.component.html
+++ b/sharedComponents/navigationBar.component.html
@@ -41,7 +41,9 @@
{{menu.title}} 0" class="uk-nav-parent-icon">
+ [fragment]="menu.fragment">
+
{{menu.badge}}
+ {{menu.title}}
0" class="uk-nav-parent-icon">
0"
href="{{menu.url}}" target="{{menu.target}}"
[class.custom-external]="menu.target != '_self'">{{menu.title}}
-
0 && menu.routeRequired && !isEnabled([menu.route], showPage) && isAtleastOneEnabled(menu.routeRequired, showPage))">{{menu.title}}
+
0 && menu.routeRequired && !isEnabled([menu.route], showPage) && isAtleastOneEnabled(menu.routeRequired, showPage))">
+ {{menu.badge}}
+ {{menu.title}}
0" class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left uk-height-max-medium uk-overflow-auto">
diff --git a/sharedComponents/tabs/slider-tabs.component.ts b/sharedComponents/tabs/slider-tabs.component.ts
index d4246f23..666f90a2 100644
--- a/sharedComponents/tabs/slider-tabs.component.ts
+++ b/sharedComponents/tabs/slider-tabs.component.ts
@@ -6,11 +6,14 @@ import {
ElementRef, EventEmitter,
Input, OnDestroy, Output,
QueryList,
- ViewChild
+ ViewChild,
+ Inject,
+ PLATFORM_ID
} from "@angular/core";
import {SliderTabComponent} from "./slider-tab.component";
import {ActivatedRoute, Router} from "@angular/router";
import {Subscription} from "rxjs";
+import {isPlatformServer} from "@angular/common";
import Timeout = NodeJS.Timeout;
declare var UIkit;
@@ -20,7 +23,7 @@ declare var UIkit;
template: `
-
`,
})
@@ -112,6 +117,11 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy {
* */
@Input()
public flexPosition: 'center' | 'left' | 'right' = 'left';
+ /**
+ * Set a class for the container
+ * */
+ @Input()
+ public containerClass: string;
/**
* Set a class above tabs
* */
@@ -138,10 +148,13 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy {
private subscriptions: any[] = [];
private observer: IntersectionObserver;
private timeout: Timeout;
+ isServer: boolean;
constructor(private route: ActivatedRoute,
private router: Router,
- private cdr: ChangeDetectorRef) {
+ private cdr: ChangeDetectorRef,
+ @Inject(PLATFORM_ID) private platform: any) {
+ this.isServer = isPlatformServer(this.platform);
}
ngAfterViewInit() {
@@ -164,7 +177,7 @@ export class SliderTabsComponent implements AfterViewInit, OnDestroy {
}
});
if (this.type === 'static') {
- let tabs = UIkit.tab(this.tabsElement.nativeElement, {connect: this.connect});
+ let tabs = UIkit.switcher(this.tabsElement.nativeElement, {connect: this.connect});
tabs.show(this.activeIndex);
if (this.connect.includes('#')) {
this.scrollToStart();
diff --git a/utils/properties/searchFields.base.ts b/utils/properties/searchFields.base.ts
index 0e488176..eea2a832 100644
--- a/utils/properties/searchFields.base.ts
+++ b/utils/properties/searchFields.base.ts
@@ -341,6 +341,14 @@ export class SearchFieldsBase {
operator: "pf",
equalityOperator: " = ",
filterType: "triplet"
+ },
+ ["haslicense"]: {
+ name: "License",
+ type: "triplet",
+ param: "haslicense",
+ operator: "hl",
+ equalityOperator: " = ",
+ filterType: "triplet"
}
};
@@ -377,6 +385,11 @@ export class SearchFieldsBase {
{ name: "All", id: "", count: "0" },
{ name: "Yes", id: "true", count: "0" },
{ name: "No", id: "false", count: "0" }
+ ],
+ ["haslicense"]: [
+ { name: "All", id: "", count: "0" },
+ { name: "Yes", id: "true", count: "0" },
+ { name: "No", id: "false", count: "0" }
]
};