[Library|Trunk]
NavbaR: - remove stakeholder - remove search bar git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@61058 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
a2178095b5
commit
4ea83f6ce8
|
@ -21,14 +21,6 @@
|
||||||
<a *ngIf="!offCanvasFlip" class="uk-navbar-toggle" href="#tm-mobile" uk-toggle="" style="z-index:1000;">
|
<a *ngIf="!offCanvasFlip" class="uk-navbar-toggle" href="#tm-mobile" uk-toggle="" style="z-index:1000;">
|
||||||
<div uk-navbar-toggle-icon="" class="uk-navbar-toggle-icon uk-icon custom-navbar-toggle-icon"></div>
|
<div uk-navbar-toggle-icon="" class="uk-navbar-toggle-icon uk-icon custom-navbar-toggle-icon"></div>
|
||||||
</a>
|
</a>
|
||||||
<!--<ng-container *ngIf="showLogo && header.position == 'left'">
|
|
||||||
<ng-container *ngTemplateOutlet="header_template; context: {mobile: true}"></ng-container>
|
|
||||||
</ng-container>-->
|
|
||||||
<div *ngIf="enableSearch && isEnabled([searchRoute], showPage)"
|
|
||||||
class=" uk-width-large ">
|
|
||||||
<search-bar [searchPlaceHolder]="searchPlaceHolder"
|
|
||||||
[searchRoute]="searchRoute" [properties]="properties" [communityId]="communityId"></search-bar>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-navbar-center">
|
<div class="uk-navbar-center">
|
||||||
<ng-container *ngTemplateOutlet="header_template; context: {mobile: true}"></ng-container>
|
<ng-container *ngTemplateOutlet="header_template; context: {mobile: true}"></ng-container>
|
||||||
|
@ -177,21 +169,9 @@
|
||||||
<nav class="uk-navbar" uk-navbar="{"align":"left"}">
|
<nav class="uk-navbar" uk-navbar="{"align":"left"}">
|
||||||
<div *ngIf="showLogo && header.position== 'left'" class="uk-navbar-left uk-visible@l">
|
<div *ngIf="showLogo && header.position== 'left'" class="uk-navbar-left uk-visible@l">
|
||||||
<ng-container *ngTemplateOutlet="header_template; context: {mobile: false}"></ng-container>
|
<ng-container *ngTemplateOutlet="header_template; context: {mobile: false}"></ng-container>
|
||||||
<div *ngIf="enableSearch && isEnabled([searchRoute], showPage)"
|
|
||||||
class=" uk-margin-left uk-width-xlarge ">
|
|
||||||
<search-bar [searchPlaceHolder]="searchPlaceHolder"
|
|
||||||
[searchRoute]="searchRoute" [properties]="properties"
|
|
||||||
[communityId]="communityId"></search-bar>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="showLogo && header.position == 'left'" class="uk-navbar-left uk-visible@m uk-hidden@l">
|
<div *ngIf="showLogo && header.position == 'left'" class="uk-navbar-left uk-visible@m uk-hidden@l">
|
||||||
<ng-container *ngTemplateOutlet="header_template; context: {mobile: false}"></ng-container>
|
<ng-container *ngTemplateOutlet="header_template; context: {mobile: false}"></ng-container>
|
||||||
<div *ngIf="enableSearch && isEnabled([searchRoute], showPage)"
|
|
||||||
class="uk-width-large ">
|
|
||||||
<search-bar [searchPlaceHolder]="searchPlaceHolder"
|
|
||||||
[searchRoute]="searchRoute" [properties]="properties"
|
|
||||||
[communityId]="communityId"></search-bar>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="showLogo && header.position == 'center'" class="uk-margin-auto uk-visible@m">
|
<div *ngIf="showLogo && header.position == 'center'" class="uk-margin-auto uk-visible@m">
|
||||||
<ng-container *ngTemplateOutlet="header_template; context: {mobile: false}"></ng-container>
|
<ng-container *ngTemplateOutlet="header_template; context: {mobile: false}"></ng-container>
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
import {Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges} from '@angular/core';
|
import {Component, Input, OnDestroy, OnInit} from '@angular/core';
|
||||||
import {ActivatedRoute, Router} from '@angular/router';
|
import {ActivatedRoute, Router} from '@angular/router';
|
||||||
import {Session, User} from '../login/utils/helper.class';
|
import {Session, User} from '../login/utils/helper.class';
|
||||||
import {ConfigurationService} from '../utils/configuration/configuration.service';
|
import {ConfigurationService} from '../utils/configuration/configuration.service';
|
||||||
import {MenuItem, RootMenuItem} from './menu';
|
import {MenuItem, RootMenuItem} from './menu';
|
||||||
import {EnvProperties} from '../utils/properties/env-properties';
|
import {EnvProperties} from '../utils/properties/env-properties';
|
||||||
import {Stakeholder} from '../monitor/entities/stakeholder';
|
|
||||||
import {Subscription} from 'rxjs';
|
import {Subscription} from 'rxjs';
|
||||||
|
|
||||||
export interface Header {
|
export interface Header {
|
||||||
|
@ -30,7 +29,6 @@ export class NavigationBarComponent implements OnInit, OnDestroy {
|
||||||
@Input() userMenu: boolean = true;
|
@Input() userMenu: boolean = true;
|
||||||
@Input() showHomeMenuItem: boolean = false;
|
@Input() showHomeMenuItem: boolean = false;
|
||||||
@Input() communityId;
|
@Input() communityId;
|
||||||
@Input() stakeholder: Stakeholder;
|
|
||||||
@Input() showCommunityName: boolean = false;
|
@Input() showCommunityName: boolean = false;
|
||||||
@Input() userMenuItems: MenuItem[];
|
@Input() userMenuItems: MenuItem[];
|
||||||
@Input() menuItems: RootMenuItem [];
|
@Input() menuItems: RootMenuItem [];
|
||||||
|
@ -78,16 +76,6 @@ export class NavigationBarComponent implements OnInit, OnDestroy {
|
||||||
position: 'left',
|
position: 'left',
|
||||||
badge: true
|
badge: true
|
||||||
};
|
};
|
||||||
} else if (this.stakeholder) {
|
|
||||||
this.header = {
|
|
||||||
route: '',
|
|
||||||
url: null,
|
|
||||||
title: this.stakeholder.name,
|
|
||||||
logoUrl: this.stakeholder.logoUrl,
|
|
||||||
logoSmallUrl: this.stakeholder.logoUrl,
|
|
||||||
position: 'left',
|
|
||||||
badge: true
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
this.isAuthorized = Session.isClaimsCurator(this.user) || Session.isPortalAdministrator(this.user);
|
this.isAuthorized = Session.isClaimsCurator(this.user) || Session.isPortalAdministrator(this.user);
|
||||||
if (this.properties.adminToolsAPIURL && this.communityId) {
|
if (this.properties.adminToolsAPIURL && this.communityId) {
|
||||||
|
|
|
@ -13,7 +13,8 @@ import {SearchBarModule} from "./searchBar/searchBar.module";
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule, FormsModule,
|
CommonModule, FormsModule,
|
||||||
RouterModule,
|
RouterModule,
|
||||||
UserMiniModule, SearchBarModule
|
UserMiniModule
|
||||||
|
// , SearchBarModule
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
NavigationBarComponent
|
NavigationBarComponent
|
||||||
|
|
Loading…
Reference in New Issue