diff --git a/contact-us/contact-us.component.html b/contact-us/contact-us.component.html index 4d09f21a..077c61fc 100644 --- a/contact-us/contact-us.component.html +++ b/contact-us/contact-us.component.html @@ -1,62 +1,72 @@

{{formTitle}}

- -
-
- +
+ -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
-
-
+
+
-
-
- - -
-
- +
+
+ + +
+
+
+ +
diff --git a/contact-us/contact-us.component.ts b/contact-us/contact-us.component.ts index ebbdc9b1..19c1a9dc 100644 --- a/contact-us/contact-us.component.ts +++ b/contact-us/contact-us.component.ts @@ -1,8 +1,7 @@ -import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; +import {Component, EventEmitter, Input, Output} from '@angular/core'; import {FormGroup} from '@angular/forms'; import {EnvProperties} from "../utils/properties/env-properties"; -import {Observable} from "rxjs"; -import {map, startWith} from "rxjs/operators"; +import {properties} from "../../../environments/environment"; @Component({ selector: 'contact-us', @@ -10,18 +9,16 @@ import {map, startWith} from "rxjs/operators"; }) export class ContactUsComponent { - @Input() - public contactForm: FormGroup; - @Input() formTitle: string; - @Input() properties: EnvProperties; + @Input() public contactForm: FormGroup; + @Input() public formTitle: string; + @Input() public organizationTypes: string[]; + @Input() public buttonClass: string; + @Input() public sendButton: string = "Send"; + @Input() public smallForm: boolean = false; + @Input() public scrollspy: boolean = false; + @Input() public sending: boolean = false; @Output() sendEmitter: EventEmitter = new EventEmitter(); - @Input() errorMessage; - @Input() - public organizationTypes: string[]; - @Input() - public right: boolean = true; - @Input() - public buttonClass: string; + public properties: EnvProperties = properties; public send() { this.sendEmitter.emit({ diff --git a/contact-us/contact-us.module.ts b/contact-us/contact-us.module.ts index 21def708..a365baa1 100644 --- a/contact-us/contact-us.module.ts +++ b/contact-us/contact-us.module.ts @@ -7,11 +7,12 @@ import {ReactiveFormsModule} from "@angular/forms"; import {MatAutocompleteModule} from "@angular/material/autocomplete"; import {RecaptchaModule} from "ng-recaptcha"; import {SafeHtmlPipeModule} from "../utils/pipes/safeHTMLPipe.module"; +import {LoadingModule} from "../utils/loading/loading.module"; @NgModule({ imports: [ CommonModule, RouterModule, - ReactiveFormsModule, MatAutocompleteModule, RecaptchaModule, SafeHtmlPipeModule], + ReactiveFormsModule, MatAutocompleteModule, RecaptchaModule, SafeHtmlPipeModule, LoadingModule], declarations: [ ContactUsComponent ], diff --git a/dashboard/menu/menu.component.html b/dashboard/menu/menu.component.html index fbc71e1e..7ce22cb9 100644 --- a/dashboard/menu/menu.component.html +++ b/dashboard/menu/menu.component.html @@ -39,7 +39,7 @@
-
-
No menu items found
+
+
+
Featured menu items can't have any sub menu items
@@ -118,8 +122,14 @@
+
+
Featured
+ + +
+ [options]="getTypeOptions(menuItemForm.get('isFeatured').value)" [tooltip]="false">
diff --git a/dashboard/menu/menu.component.ts b/dashboard/menu/menu.component.ts index cdedb37e..b18bec0e 100644 --- a/dashboard/menu/menu.component.ts +++ b/dashboard/menu/menu.component.ts @@ -132,11 +132,15 @@ export class MenuComponent implements OnInit { ); } - getTypeOptions() { + getTypeOptions(isFeatured: boolean = false) { if(this.isChild) { return this.typeOptions; } else { - return this.typeOptions.concat(this.rootOnlyTypeOptions); + if(isFeatured) { + return this.typeOptions; + } else { + return this.typeOptions.concat(this.rootOnlyTypeOptions); + } } } @@ -247,6 +251,7 @@ export class MenuComponent implements OnInit { route: this._fb.control(""), url: this._fb.control(""), isEnabled: this._fb.control(""), + isFeatured: this._fb.control(false), parentItemId: this._fb.control(isChild ? this.activeRootMenuId : null) }); this.isChild = isChild; @@ -261,6 +266,7 @@ export class MenuComponent implements OnInit { type: this._fb.control(menuItem['type'],Validators.required), route: this._fb.control(menuItem.route, (menuItem['type'] == "internal") ? [Validators.required] : []), url: this._fb.control(menuItem.url, (menuItem['type'] == "external") ? [Validators.required, StringUtils.urlValidator()] : []), + isFeatured: this._fb.control(menuItem.isFeatured), parentItemId: this._fb.control(menuItem['parentItemId']) }); this.isChild = isChild; diff --git a/dashboard/sharedComponents/page-content/page-content.component.ts b/dashboard/sharedComponents/page-content/page-content.component.ts index d1ad9868..2803fd79 100644 --- a/dashboard/sharedComponents/page-content/page-content.component.ts +++ b/dashboard/sharedComponents/page-content/page-content.component.ts @@ -1,82 +1,24 @@ -import { - AfterViewInit, - ChangeDetectorRef, - Component, - ElementRef, - HostListener, - OnDestroy, - ViewChild -} from "@angular/core"; -import {Observable, Subscription} from "rxjs"; -import {distinctUntilChanged} from "rxjs/operators"; +import {ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit} from "@angular/core"; @Component({ selector: '[page-content]', template: `
-
- +
+
+ +
-
+
` }) -export class PageContentComponent implements OnDestroy, AfterViewInit{ - public height = 0; - private subscription: Subscription; - @ViewChild('header') header: ElementRef; +export class PageContentComponent implements OnInit{ + public offset: string; - constructor(private cdr: ChangeDetectorRef) { - } - - @HostListener('window:resize', ['$event']) - onResize(event) { - this.height = this.getHeight(); - this.cdr.detectChanges(); - } - - getHeight(): number{ - return this.header.nativeElement.offsetHeight; - } - - setupHeightMutationObserver() { - if (typeof document !== 'undefined') { - const observable = new Observable(observer => { - const callback = (mutationsList, observer2) => { - observer.next(this.getHeight()); - }; - - // Create an observer instance linked to the callback function - const elementObserver = new MutationObserver(callback); - - // Options for the observer (which mutations to observe) - const config = {attributes: true, attributeFilter: ['class'], childList: true, subtree: true}; - // Start observing the target node for configured mutations - elementObserver.observe(this.header.nativeElement, config); - }); - - this.subscription = observable - .pipe( - distinctUntilChanged()//if the value hasn't changed, don't continue - ) - .subscribe(newHeight => { - this.height = this.getHeight(); - this.cdr.detectChanges(); - }); - } - } - - ngAfterViewInit() { - this.setupHeightMutationObserver(); - this.height = this.getHeight(); - this.cdr.detectChanges(); - } - - ngOnDestroy() { - if(this.subscription) { - this.subscription.unsubscribe(); - } + ngOnInit() { + this.offset = getComputedStyle(document.documentElement).getPropertyValue('--structure-header-height'); } } diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.html b/dashboard/sharedComponents/sidebar/sideBar.component.html index 4356a96c..de8830d8 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.component.html +++ b/dashboard/sharedComponents/sidebar/sideBar.component.html @@ -1,15 +1,5 @@
--> diff --git a/dashboard/sharedComponents/sidebar/sideBar.component.ts b/dashboard/sharedComponents/sidebar/sideBar.component.ts index 2d9f46f3..b50522d5 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.component.ts +++ b/dashboard/sharedComponents/sidebar/sideBar.component.ts @@ -11,16 +11,9 @@ import {LayoutService} from "./layout.service"; }) export class SideBarComponent implements OnInit { @Input() items: MenuItem[] = []; - @Input() logoLabel: string; - @Input() headerName: string; - @Input() headerPosition: "left" | "center" | "right" = "center"; - @Input() headerLogoUrl: string; - @Input() headerUrl: string; - @Input() showHeader: boolean = true; @Input() activeItem: string = ''; @Input() activeSubItem: string = ''; @Input() specialMenuItem: MenuItem = null; - @Input() searchParams = {}; @Input() queryParamsHandling = ""; properties; diff --git a/dashboard/sharedComponents/sidebar/sideBar.module.ts b/dashboard/sharedComponents/sidebar/sideBar.module.ts index 6958e4b5..b57e2d4c 100644 --- a/dashboard/sharedComponents/sidebar/sideBar.module.ts +++ b/dashboard/sharedComponents/sidebar/sideBar.module.ts @@ -5,12 +5,14 @@ import {RouterModule} from "@angular/router"; import {SideBarComponent} from './sideBar.component'; import {UrlPrefixModule} from "../../../utils/pipes/url-prefix.module"; +import {IconsModule} from "../../../utils/icons/icons.module"; @NgModule({ imports: [ CommonModule, RouterModule, - UrlPrefixModule + UrlPrefixModule, + IconsModule ], declarations: [ SideBarComponent diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index f97e0b6d..1c58b22e 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -499,7 +499,7 @@
- diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 2b01f24a..1315c818 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -271,7 +271,7 @@ [texts]="pageContents['bottom']"> - diff --git a/landingPages/project/project.component.html b/landingPages/project/project.component.html index 6b559786..4e3b24b9 100644 --- a/landingPages/project/project.component.html +++ b/landingPages/project/project.component.html @@ -795,7 +795,7 @@ - diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 29d56109..370392d2 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -658,7 +658,7 @@ - diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index 1d5a8c6f..d599f38e 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -23,7 +23,6 @@ import {Session} from "../../login/utils/helper.class"; import {AnnotationComponent} from "../annotation/annotation.component"; import {ParsingFunctions} from "../landing-utils/parsingFunctions.class"; import {ConnectHelper} from "../../connect/connectHelper"; -import {$e} from "codelyzer/angular/styles/chars"; @Component({ @@ -86,7 +85,6 @@ export class ResultLandingComponent { public warningMessage = ""; public errorMessage = ""; public showLoading: boolean = true; - public dashboard = properties.isDashboard; public routerHelper: RouterHelper = new RouterHelper(); public activeTab: string = null; diff --git a/login/userMini.component.ts b/login/userMini.component.ts index ea4caec3..74cfaf2e 100644 --- a/login/userMini.component.ts +++ b/login/userMini.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core'; +import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Session, User} from './utils/helper.class'; import {RouterHelper} from '../utils/routerHelper.class'; @@ -6,156 +6,64 @@ import {Subscriber} from "rxjs"; import {MenuItem} from "../sharedComponents/menu"; import {UserManagementService} from "../services/user-management.service"; -// declare var logoutClicked; @Component({ selector: 'user-mini', template: ` - - - + ` }) export class UserMiniComponent implements OnInit, OnChanges { @@ -164,7 +72,6 @@ export class UserMiniComponent implements OnInit, OnChanges { public isAuthorized: boolean = false; @Input() public mobileView: boolean = false; public firstLetters: string = ""; - @Input() public dashboard: boolean = false; public server: boolean = true; public routerHelper: RouterHelper = new RouterHelper(); @Input() userMenuItems; @@ -172,9 +79,10 @@ export class UserMiniComponent implements OnInit, OnChanges { @Input() logOutUrl; @Input() cookieDomain; @Input() dark: boolean = false; - subscriptions = []; + @Output() closeCanvasEmitter: EventEmitter = new EventEmitter(); + private subscriptions = []; - constructor(private router: Router, private route: ActivatedRoute, private userManagementService: UserManagementService) { + constructor(private router: Router, private route: ActivatedRoute, private userManagementService: UserManagementService) { } ngOnInit() { @@ -189,7 +97,7 @@ export class UserMiniComponent implements OnInit, OnChanges { this.initUser(); } } - + ngOnDestroy() { this.subscriptions.forEach(subscription => { if (subscription instanceof Subscriber) { @@ -198,6 +106,10 @@ export class UserMiniComponent implements OnInit, OnChanges { }); } + closeCanvas() { + this.closeCanvasEmitter.emit(true); + } + initUser() { if (this.user) { this.loggedIn = true; @@ -222,14 +134,12 @@ export class UserMiniComponent implements OnInit, OnChanges { logIn() { this.userManagementService.login(); } - + isTheActiveSubMenu(menuItem: MenuItem): boolean { let currentRoute = this.router.url.split('?')[0]; - if (menuItem.route == currentRoute || menuItem.route == (currentRoute + "/") ) { - return true; - } - return false; + return menuItem.route == currentRoute || menuItem.route == (currentRoute + "/"); } + parseName() { this.firstLetters = ""; if (this.user && this.user.firstname) { diff --git a/monitor/how/how.component.css b/monitor/how/how.component.css index ecb40f6d..d662a569 100644 --- a/monitor/how/how.component.css +++ b/monitor/how/how.component.css @@ -5,6 +5,8 @@ .how .first > div:first-child:after { content: "we"; + font-size: 20px; + font-weight: 600; text-align: center; padding-bottom: 5%; position: absolute; @@ -19,17 +21,19 @@ .how .second > div:first-child { position: relative; - padding: 0 22% 0 22%; + padding: 0 10% 0 20%; } .how .second > div:first-child:after { content: "and"; + font-size: 20px; + font-weight: 600; text-align: center; padding-bottom: 5%; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/2.svg"); - right: -10%; - top: 31%; + right: -17%; + top: 33%; width: 30%; background-size: contain; background-repeat: no-repeat; @@ -41,20 +45,22 @@ } .how .third > div:first-child { - padding: 0 12% 0 12%; + padding: 0 14% 0 13%; } .how .third:after { content: "on which"; + font-size: 20px; + font-weight: 600; padding-right: 30%; padding-top: 5%; padding-bottom: 5%; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/3.svg"); - bottom: 6%; - left: 6%; + bottom: -6%; + left: 13%; transform: translateY(100%); - width: 55%; + width: 140px; background-size: contain; background-repeat: no-repeat; background-position: center; @@ -66,17 +72,19 @@ .how .fourth > div:first-child { position: relative; - padding: 0 15% 0 15%; + padding: 0 16% 0 16%; } .how .fourth> div:first-child:after { content: "and"; + font-size: 20px; + font-weight: 600; text-align: center; padding-bottom: 5%; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/4.svg"); left: -18%; - top: 35%; + top: 36%; width: 30%; background-size: contain; background-repeat: no-repeat; @@ -84,7 +92,7 @@ } .how .fifth { - padding: 10% 2% 0 2%; + padding: 11% 2% 0 2%; } .how .fifth > div:first-child { @@ -93,6 +101,8 @@ .how .fifth > div:first-child:after { content: "We"; + font-size: 20px; + font-weight: 600; text-align: center; padding-bottom: 5%; position: absolute; @@ -125,7 +135,7 @@ content: ""; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/6.svg"); - left: -20%; + left: -26%; top: -20%; height: 70%; width: 30%; @@ -136,32 +146,17 @@ .how .final > div:first-child:after { content: "We make visualizations, graphs, reports and deliver all in a customisable tool"; + font-size: 20px; position: absolute; - background-image: url("~src/assets/common-assets/monitor-assets/how/circle.png"); - right: -220px; - top: -20%; - width: 300px; - padding: 8% 0 5% 220px; + top: 30%; + width: 250px; + padding: 8% 0 5% 0; background-size: contain; background-repeat: no-repeat; background-position: bottom center; } } -@media only screen and (min-width: 960px) { - .how .third:after { - bottom: -6%; - } -} - -@media only screen and (min-width: 1200px) { - .how .third:after { - bottom: -10%; - left: 25%; - width: 25%; - } -} - @media only screen and (max-width: 639px) { .how .first { position: relative; @@ -171,11 +166,11 @@ .how .first:after { content: "we"; text-align: center; - padding: 25px 105px 25px 0; + padding: 10% 34% 10% 0; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/3.svg"); left: 26%; - top: 72%; + top: 79%; background-size: contain; background-repeat: no-repeat; background-position: center; @@ -183,17 +178,17 @@ .how .second { position: relative; - padding: 0 15% 30% 15%; + padding: 0 10% 30% 10%; } .how .second:after { content: "and"; text-align: center; - padding: 25px 105px 25px 0; + padding: 10% 34% 10% 0; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/3.svg"); left: 25%; - top: 70%; + top: 80%; background-size: contain; background-repeat: no-repeat; background-position: center; @@ -206,12 +201,13 @@ .how .third:after { content: "on which"; + font-weight: bold; text-align: center; - padding: 25px 105px 25px 0; + padding: 10% 41% 10% 0; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/3.svg"); - left: 17%; - top: 75%; + left: 15%; + top: 83%; background-size: contain; background-repeat: no-repeat; background-position: center; @@ -229,7 +225,7 @@ .how .fourth:after { content: "and"; text-align: center; - padding: 25px 105px 25px 0; + padding: 10% 34% 10% 0; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/3.svg"); left: 26%; @@ -247,7 +243,7 @@ .how .fifth:after { content: "We"; text-align: center; - padding: 25px 105px 25px 0; + padding: 10% 34% 10% 0; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/3.svg"); left: 27%; @@ -277,8 +273,8 @@ content: ""; position: absolute; background-image: url("~src/assets/common-assets/monitor-assets/green-arrows/6.svg"); - left: 32%; - top: -80%; + left: 34%; + top: -70%; height: 70%; width: 30%; background-size: contain; @@ -288,12 +284,12 @@ .how .final > div:first-child:after { content: "We make visualizations, graphs, reports and deliver all in a customisable tool"; + text-align: center; position: absolute; - background-image: url("~src/assets/common-assets/monitor-assets/how/circle.png"); left: -62%; top: 85%; width: 300px; - padding: 12% 0 0 70%; + padding: 12% 0 0 54%; background-size: contain; background-repeat: no-repeat; background-position: center; diff --git a/monitor/how/how.component.ts b/monitor/how/how.component.ts index 174044e5..01f6bb69 100644 --- a/monitor/how/how.component.ts +++ b/monitor/how/how.component.ts @@ -3,32 +3,32 @@ import {Component} from "@angular/core"; @Component({ selector: 'how', template: ` -
+
-
+
-
+
Starting from existing
research-related data sources
-
+
-
+
-
+
build an open, global
and trusted Research graph
-
+
@@ -37,7 +37,7 @@ import {Component} from "@angular/core"; Open Science Indicators
-
+
@@ -46,7 +46,7 @@ import {Component} from "@angular/core"; Collaboration Indicators
-
+
@@ -58,7 +58,7 @@ import {Component} from "@angular/core";
-
+
diff --git a/searchPages/find/searchAll.component.html b/searchPages/find/searchAll.component.html index 2ccf4319..c3f33bf8 100644 --- a/searchPages/find/searchAll.component.html +++ b/searchPages/find/searchAll.component.html @@ -1,12 +1,11 @@
-
-
+
+
-
-
- +
+
-
diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index 6413b4c3..d0772f44 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -13,7 +13,8 @@ - + {{type.name}} @@ -41,15 +42,17 @@ - - + + {{value.name}} - + @@ -68,8 +71,9 @@ class="uk-margin-top" role="alert">
-
+
No filters available Filters temporarily unavailable. Please try again later.
@@ -104,17 +108,17 @@
- +
@@ -122,30 +126,32 @@
-
- - +
+
+
+ + +
+ [searchAction]=false [description]="metaDescription">
@@ -153,8 +159,8 @@
-
-
+
+
Filters ({{(selectedRangeFilters + selectedFilters)}}) + *ngIf="(selectedRangeFilters+selectedFilters) > 0">({{(selectedRangeFilters + selectedFilters)}} + )
@@ -196,8 +203,7 @@
-
0 || (searchUtils.refineStatus == errorCodes.LOADING && searchUtils.status != errorCodes.LOADING) || (!hideFilters && (existingFiltersWithValues > 0 || (selectedRangeFilters + selectedFilters + selectedTypesNum) > 0) @@ -207,27 +213,19 @@
- -
-
- Filters: - -
-
Do you want to see results only for {{customFilter.valueName}}? Click here. + (click)="addCustomFilter();">Click here.
The following results are related to {{customFilter.valueName}}. - Are you interested to view more results? Visit + Are you interested to view more results? Visit
-
-
- - - - - - - - - -
-
- -
-
- - -
-
- -
-
-
-
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index e82b7f66..6b4d4256 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -95,7 +95,6 @@ export class NewSearchPageComponent { @Input() showBreadcrumb: boolean = false; @Input() showDownload: boolean = true; @Input() breadcrumbs: Breadcrumb[] = []; - public dashboard: boolean = properties.isDashboard; private subscriptions = []; public parameterNames: string[] = []; public parameterValues: string[] = []; diff --git a/searchPages/searchUtils/portal-search-result.component.html b/searchPages/searchUtils/portal-search-result.component.html index 0747afa0..d7ac98b2 100644 --- a/searchPages/searchUtils/portal-search-result.component.html +++ b/searchPages/searchUtils/portal-search-result.component.html @@ -98,7 +98,7 @@
-
diff --git a/searchPages/searchUtils/portal-search-result.component.ts b/searchPages/searchUtils/portal-search-result.component.ts index e6993534..1b733705 100644 --- a/searchPages/searchUtils/portal-search-result.component.ts +++ b/searchPages/searchUtils/portal-search-result.component.ts @@ -23,7 +23,7 @@ export class PortalSearchResultComponent implements OnInit{ @ViewChild('AlertModal') modal; visibilityIcon: Map = new Map ([ ["PRIVATE", 'incognito'], - ["RESTRICTED", 'group'] + ["RESTRICTED", 'restricted'] ]); public urlParam: string; public errorCodes: ErrorCodes = new ErrorCodes(); diff --git a/searchPages/searchUtils/portal-search-result.module.ts b/searchPages/searchUtils/portal-search-result.module.ts index 05cc15c2..ce1ebcf2 100644 --- a/searchPages/searchUtils/portal-search-result.module.ts +++ b/searchPages/searchUtils/portal-search-result.module.ts @@ -9,7 +9,7 @@ import {ManageModule} from "../../utils/manage/manage.module"; import {IconsModule} from "../../utils/icons/icons.module"; import {UrlPrefixModule} from "../../utils/pipes/url-prefix.module"; import {IconsService} from "../../utils/icons/icons.service"; -import {incognito} from "../../utils/icons/icons"; +import {incognito, restricted} from "../../utils/icons/icons"; import {LogoUrlPipeModule} from "../../utils/pipes/logoUrlPipe.module"; @NgModule({ @@ -29,6 +29,6 @@ import {LogoUrlPipeModule} from "../../utils/pipes/logoUrlPipe.module"; }) export class PortalSearchResultModule { constructor(private iconsService: IconsService) { - this.iconsService.registerIcons([incognito]) + this.iconsService.registerIcons([incognito, restricted]) } } diff --git a/searchPages/searchUtils/searchResult.component.html b/searchPages/searchUtils/searchResult.component.html index 73469942..7057b770 100644 --- a/searchPages/searchUtils/searchResult.component.html +++ b/searchPages/searchUtils/searchResult.component.html @@ -1,7 +1,7 @@ -
    +
    • -
      +
      diff --git a/searchPages/searchUtils/searchResult.component.ts b/searchPages/searchUtils/searchResult.component.ts index 9bbb2ad5..84e55456 100644 --- a/searchPages/searchUtils/searchResult.component.ts +++ b/searchPages/searchUtils/searchResult.component.ts @@ -19,7 +19,7 @@ export class SearchResultComponent implements OnInit, OnChanges { @Input() showLoading: boolean = false; @Input() showSubjects: boolean = true; @Input() showOrganizations: boolean = true; - @Input() custom_class: string = "search-results"; + @Input() custom_class: string = ""; @Input() properties: EnvProperties; @Input() showImpactFactors: boolean = false; @Input() showEnermaps: boolean; diff --git a/sharedComponents/menu.ts b/sharedComponents/menu.ts index 6e646186..7cf36b96 100644 --- a/sharedComponents/menu.ts +++ b/sharedComponents/menu.ts @@ -15,6 +15,7 @@ export class MenuItem { icon: string; open: boolean; customClass: string = null; + isFeatured: boolean; constructor(id: string, title: string, url: string, route: string, needsAuthorization: boolean, entitiesRequired: string[], routeRequired: string[], params, icon=null, fragment = null, customClass = null, routeActive = null) { this._id = id; diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index d98e5150..b4f0da3f 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -1,216 +1,145 @@
      -
      - BETA - -
      -
      - - -
      -
      -
      -
      -
      - -
      -
      -
      - -
      +
      +
      +
      +
      + +
      + +       +
      +
      + +
      +
      + +
      +       +
      +
      -
      - + {{menu.rootItem.title}} + {{menu.rootItem.title}} + {{menu.rootItem.title}} + +
      • + + +
    + + + +
-
--> -
-
-
-