-
-
-
-
+
-
+
-
+ Sign in
+
+ - Sign in - - - - - + - - - - -- - + + +- - +
-
+
-
{{user.fullname + " "}}
-
-
- Sign in
-
-
-
+ Sign in
-
-
- - {{item.title}} - {{item.title}} + {{item.title}} + {{item.title}}
- Log out +
- Log out
- - {{item.title}} - {{item.title}} - -
- Log out -
- - Sign in - - - - - - +---
-
- - -= 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.ts b/monitor/how/how.component.ts index 0bd51283..01f6bb69 100644 --- a/monitor/how/how.component.ts +++ b/monitor/how/how.component.ts @@ -3,9 +3,9 @@ import {Component} from "@angular/core"; @Component({ selector: 'how', template: ` - +-+-@@ -13,12 +13,12 @@ import {Component} from "@angular/core"; Starting from existing
research-related data sources+-
+@@ -28,7 +28,7 @@ import {Component} from "@angular/core";
--+-@@ -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 d85ca02f..d0772f44 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -13,7 +13,8 @@-- ++- - + @@ -68,8 +71,9 @@ class="uk-margin-top" role="alert">@@ -41,15 +42,17 @@ - - + + +- + @@ -104,17 +108,17 @@- +@@ -123,29 +127,31 @@-- ++ ++ ++ [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: --- The following results are related to {{customFilter.valueName}}. - Are you interested to view more results? Visit + Are you interested to view more results? Visit-+-+--+ [results]="results" + [status]="searchUtils.status" + [type]="entityType" + [properties]=properties> + class="uk-margin-small-top uk-grid uk-child-width-1-2">+ [texts]="pageContents['bottom']"> + - - - --- - --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/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 @@ - -
+
-
- +
+
+++-- + class="uk-width-1-1">
{{header.title}}
+ class="uk-width-1-1">
{{header.title}}
diff --git a/sharedComponents/navigationBar.component.ts b/sharedComponents/navigationBar.component.ts index be35cb3e..954661b5 100644 --- a/sharedComponents/navigationBar.component.ts +++ b/sharedComponents/navigationBar.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, OnDestroy, OnInit} from '@angular/core'; +import {Component, Input, OnDestroy, OnInit, ViewChild} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {Session, User} from '../login/utils/helper.class'; import {ConfigurationService} from '../utils/configuration/configuration.service'; @@ -6,6 +6,9 @@ import {MenuItem, RootMenuItem} from './menu'; import {EnvProperties} from '../utils/properties/env-properties'; import {Subscription} from 'rxjs'; import {HelpContentService} from '../services/help-content.service'; +import {properties} from "../../../environments/environment"; + +declare var UIkit; export interface Header { route?: string, @@ -26,7 +29,7 @@ export interface Header { export class NavigationBarComponent implements OnInit, OnDestroy { @Input() portal: string = 'connect'; @Input() dark: boolean = false; - @Input() onlyTop: boolean; + @Input() onlyTop: boolean = false; @Input() logoPath: string = 'assets/common-assets/'; @Input() userMenu: boolean = true; @Input() showHomeMenuItem: boolean = false; @@ -37,7 +40,7 @@ export class NavigationBarComponent implements OnInit, OnDestroy { @Input() header: Header; @Input() showMenu: boolean = true; @Input() homeurl: boolean = true; - @Input() properties: EnvProperties; + @Input() properties: EnvProperties = properties; @Input() user: User; @Input() enableSearch: boolean = false; @Input() searchRoute: string = '/search/find'; @@ -49,9 +52,9 @@ export class NavigationBarComponent implements OnInit, OnDestroy { subs: Subscription[] = []; showEntity = {}; showPage = {}; - specialAnnouncementContent: string = null; - public customMenuItems: MenuItem[] = []; + public additionalMenuItems: MenuItem[] = []; + public featuredMenuItems: MenuItem[] = []; constructor(private router: Router, private route: ActivatedRoute, @@ -68,6 +71,10 @@ export class NavigationBarComponent implements OnInit, OnDestroy { sub.unsubscribe(); } } + + closeCanvas(element) { + UIkit.offcanvas(element).hide(); + } initialize() { if ((['provide', 'develop']).indexOf(this.portal) != -1) { @@ -88,13 +95,13 @@ export class NavigationBarComponent implements OnInit, OnDestroy { this.subs.push(this.config.communityInformationState.subscribe(data => { if (data) { if (data['entities']) { - for (var i = 0; i < data['entities'].length; i++) { + for (let i = 0; i < data['entities'].length; i++) { this.showEntity['' + data['entities'][i]['pid'] + ''] = data['entities'][i]['isEnabled']; } } if (data['pages']) { - for (var i = 0; i < data['pages'].length; i++) { + for (let i = 0; i < data['pages'].length; i++) { this.showPage[data['pages'][i]['route']] = data['pages'][i]['isEnabled']; } @@ -109,15 +116,23 @@ export class NavigationBarComponent implements OnInit, OnDestroy { this.subs.push( this._helpContentService.getMenuItems(this.portal).subscribe( data => { - this.customMenuItems = data; + // Will divide all the custom menu items into 2 arrays. + // One for the extra(added next to the hardcoded menu items in the existing nav bar) - additionalMenuItems + // One for the featured(new nav bar below the existing one) - featuredMenuItems + data.forEach(menuItem => { + if(menuItem.isFeatured) { + this.featuredMenuItems.push(menuItem); + } else { + this.additionalMenuItems.push(menuItem); + } + }); }, error => this.handleError("Server error fetching custom menu items", error) ) ); } } - - + isEnabled(required, enabled) { if (!required) { return true; @@ -143,12 +158,16 @@ export class NavigationBarComponent implements OnInit, OnDestroy { count--; } } - return (count > 0) ? true : false; + return (count > 0); } private handleError(message: string, error) { console.error('NavigationBar (component): ' + message, error); } + + get isHeaderLeft(): boolean { + return this.header.position === 'left' || (this.header.position === 'center' && this.header.menuPosition === 'center' && this.menuItems.length > 0); + } get currentRoute() { return { diff --git a/sharedComponents/quick-contact/quick-contact.component.css b/sharedComponents/quick-contact/quick-contact.component.css index 11492c4d..5834bbe3 100644 --- a/sharedComponents/quick-contact/quick-contact.component.css +++ b/sharedComponents/quick-contact/quick-contact.component.css @@ -9,7 +9,10 @@ } .uk-drop { - width: 380px; + max-height: 650px; + height: calc(80vh - 100px); + width: 500px; + max-width: 80vw; } .avatars > img { @@ -22,14 +25,3 @@ .avatars > img:nth-child(n+1) { margin-left: -5px; } - -/* hide scrollbar but allow scrolling */ -.uk-overflow-auto { - -ms-overflow-style: none; /* for Internet Explorer, Edge */ - scrollbar-width: none; /* for Firefox */ - overflow-y: scroll; -} - -.uk-overflow-auto::-webkit-scrollbar { - display: none; /* for Chrome, Safari, and Opera */ -} diff --git a/sharedComponents/quick-contact/quick-contact.component.html b/sharedComponents/quick-contact/quick-contact.component.html index 7f133589..609ec4d0 100644 --- a/sharedComponents/quick-contact/quick-contact.component.html +++ b/sharedComponents/quick-contact/quick-contact.component.html @@ -1,10 +1,10 @@- -- + + + Contact - +diff --git a/sharedComponents/quick-contact/quick-contact.component.ts b/sharedComponents/quick-contact/quick-contact.component.ts index 490abd02..6ed517e1 100644 --- a/sharedComponents/quick-contact/quick-contact.component.ts +++ b/sharedComponents/quick-contact/quick-contact.component.ts @@ -10,7 +10,7 @@ declare var UIkit; styleUrls: ['quick-contact.component.css'] }) export class QuickContactComponent implements OnInit, OnDestroy { - public showForm: boolean = false; + public showDrop: boolean = false; @Input() public contactForm: FormGroup; @Input() @@ -28,6 +28,12 @@ export class QuickContactComponent implements OnInit, OnDestroy { event.preventDefault(); } })); + this.subscriptions.push(UIkit.util.on(document, 'show', '#quick-contact', (event) => { + this.showDrop = true; + })); + this.subscriptions.push(UIkit.util.on(document, 'hide', '#quick-contact', (event) => { + this.showDrop = false; + })); } } @@ -48,8 +54,4 @@ export class QuickContactComponent implements OnInit, OnDestroy { public send(event) { this.sendEmitter.emit(event); } - - public toggleModal() { - this.showForm = !this.showForm; - } } diff --git a/sharedComponents/sidebar/sideBar.component.html b/sharedComponents/sidebar/sideBar.component.html deleted file mode 100644 index 5d1f3bef..00000000 --- a/sharedComponents/sidebar/sideBar.component.html +++ /dev/null @@ -1,36 +0,0 @@ - diff --git a/sharedComponents/sidebar/sideBar.component.ts b/sharedComponents/sidebar/sideBar.component.ts deleted file mode 100644 index e22daf85..00000000 --- a/sharedComponents/sidebar/sideBar.component.ts +++ /dev/null @@ -1,37 +0,0 @@ -import {Component, Input, OnInit} from '@angular/core'; -import {SideMenuItem} from '../menu'; -import {ActivatedRoute, Router} from '@angular/router'; -import {Subscriber} from "rxjs"; - -@Component({ - selector: 'sidebar', - templateUrl: 'sideBar.component.html' -}) -export class SideBarComponent implements OnInit { - @Input() communityId: string = ''; - @Input() menuItems: SideMenuItem[] = []; - currentParams: any = {}; - sub; - constructor(private router: Router, - private route: ActivatedRoute) { - } - ngOnDestroy() { - if (this.sub instanceof Subscriber) { - this.sub.unsubscribe(); - } - } - ngOnInit(): void { - this.sub = this.route.queryParams.subscribe(params => { - this.currentParams = params; - }); - } - - private getCurrentRoute(): string { - return this.router.url.split('?')[0]; - } - - isTheActiveMenu(route: string, params: any): boolean { - return route === this.getCurrentRoute() && - (!params || JSON.stringify(this.currentParams) === JSON.stringify(params)); - } -} diff --git a/sharedComponents/sidebar/sideBar.module.ts b/sharedComponents/sidebar/sideBar.module.ts deleted file mode 100644 index 4f17e096..00000000 --- a/sharedComponents/sidebar/sideBar.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; - -import {RouterModule} from "@angular/router"; - -import {SideBarComponent} from './sideBar.component'; - -@NgModule({ - imports: [ - CommonModule, - RouterModule - ], - declarations: [ - SideBarComponent - ], - providers: [], - exports: [ - SideBarComponent - ] -}) -export class SideBarModule { -} diff --git a/utils/errorMessages.component.ts b/utils/errorMessages.component.ts index 24e49b4c..5cb8f0ca 100644 --- a/utils/errorMessages.component.ts +++ b/utils/errorMessages.component.ts @@ -7,8 +7,7 @@ import {properties} from "../../../environments/environment"; template: `-Send a message @@ -22,10 +22,10 @@ We usually respond in a few hours.++ [smallForm]="true" sendButton="Send Message" [contactForm]="contactForm"> - -+ No {{type}} available@@ -43,7 +42,6 @@ import {properties} from "../../../environments/environment"; @Input() status: Array; @Input() type: string; @Input() tab_error_class: boolean = false; - dashboard = properties.isDashboard; public errorCodes:ErrorCodes; diff --git a/utils/icons/icons.component.ts b/utils/icons/icons.component.ts index 7ff57455..8175c59a 100644 --- a/utils/icons/icons.component.ts +++ b/utils/icons/icons.component.ts @@ -123,11 +123,11 @@ export class IconsComponent implements AfterViewInit { ngAfterViewInit() { if(this.svg) { let svg: Element = this.icon.nativeElement.getElementsByTagName('svg').item(0); - if(!this.defaultSize) { + if(!this.defaultSize && svg) { svg.setAttribute("width", (this.ratio * IconsComponent.DEFAULT_ICON_SIZE).toString()); svg.setAttribute("height", (this.ratio * IconsComponent.DEFAULT_ICON_SIZE).toString()); } - if(this.gradient) { + if(this.gradient && svg) { this.addGradient(svg); } else { this.style = { diff --git a/utils/icons/icons.ts b/utils/icons/icons.ts index 6e6aadee..847782dd 100644 --- a/utils/icons/icons.ts +++ b/utils/icons/icons.ts @@ -158,3 +158,8 @@ export const restricted = { name: 'restricted', data: '' } + +export const graph = { + name: 'graph', + data: '' +} diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index 26874463..1fde16c8 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -11,8 +11,7 @@ declare var UIkit: any; [ngClass]="classBody"> -{{alertTitle}}
-{{alertTitle}}
+{{alertTitle}}
@@ -26,8 +25,7 @@ declare var UIkit: any;- @@ -50,7 +48,6 @@ export class AlertModal { @Input() classTitle: string = ""; @Input() classBody: string = ""; @Input() large: boolean = false; - isDashboard: boolean = properties.isDashboard; /** * Caption for the title. */ @@ -118,7 +115,7 @@ export class AlertModal { /** * Value will be emitted if @choice is true */ - public select: boolean = false; + public select: boolean = true; /** * Emitted when a ok button was clicked * or when Ok method is called. diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index ad3c7768..57c937fd 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -22,7 +22,7 @@ Visit repository to deposit -+{{type}} . @@ -165,8 +165,8 @@-diff --git a/utils/section-scroll/section-scroll.component.css b/utils/section-scroll/section-scroll.component.css index 06f037e9..7fe0c763 100644 --- a/utils/section-scroll/section-scroll.component.css +++ b/utils/section-scroll/section-scroll.component.css @@ -3,7 +3,6 @@ position: sticky; top: 0; height: 100vh; - /*border: 1px solid red;*/ } [left] .imgContainer { @@ -12,26 +11,6 @@ left: 0; width: 100%; height: 70%; - /*border: 1px solid greenyellow;*/ -} - -@media (max-width: 960px) { - [left] { - height: 50vh; - } - - [left] .imgContainer { - top: 5%; - height: 80%; - } - - [left] > * { - align-items: flex-start; - } - - [scroll] > * { - align-items: flex-end; - } } [left] img { @@ -48,5 +27,23 @@ [scroll] > * { height: 60vh; - /* border: 1px solid darkorange;*/ +} + +@media (max-width: 960px) { + [left] { + height: 50vh; + } + + [left] .imgContainer { + top: 5%; + height: 100%; + } + + [left] > * { + align-items: flex-start; + } + + [scroll] > * { + height: 50vh; + } } diff --git a/utils/section-scroll/section-scroll.component.ts b/utils/section-scroll/section-scroll.component.ts index 85e6a2f4..730a1075 100644 --- a/utils/section-scroll/section-scroll.component.ts +++ b/utils/section-scroll/section-scroll.component.ts @@ -42,7 +42,6 @@ export class SectionScrollComponent implements AfterViewInit { private map: MapAuthors:-Authors: +
-
+ Sign in
+
-