diff --git a/src/frontend/app/app-common.module.ts b/src/frontend/app/app-common.module.ts
index a99900785fe4ab61e5b4dab15ba3e452e09f7c3e..a2727f5dfde7599e1b8b288642285a9ad1b96d1d 100755
--- a/src/frontend/app/app-common.module.ts
+++ b/src/frontend/app/app-common.module.ts
@@ -25,6 +25,9 @@ import { SmdFabSpeedDialComponent,SmdFabSpeedDialTrigger, SmdFabSpeedDialActions
/*MENU COMPONENT*/
+import { HeaderRightComponent } from './header/header-right.component';
+import { HeaderLeftComponent } from './header/header-left.component';
+import { HeaderPanelComponent } from './header/header-panel.component';
import { MainHeaderComponent } from './menu/main-header.component';
import { MenuComponent } from './menu/menu.component';
import { MenuNavComponent } from './menu/menu-nav.component';
@@ -60,6 +63,9 @@ export class MyHammerConfig extends HammerGestureConfig {
MenuComponent,
MenuNavComponent,
MenuShortcutComponent,
+ HeaderRightComponent,
+ HeaderLeftComponent,
+ HeaderPanelComponent,
SearchHomeComponent,
BasketHomeComponent,
TimeAgoPipe,
@@ -76,6 +82,9 @@ export class MyHammerConfig extends HammerGestureConfig {
MenuComponent,
MenuNavComponent,
MenuShortcutComponent,
+ HeaderRightComponent,
+ HeaderLeftComponent,
+ HeaderPanelComponent,
SearchHomeComponent,
BasketHomeComponent,
BrowserModule,
diff --git a/src/frontend/app/app.component.ts b/src/frontend/app/app.component.ts
index 840c8be8bf7debc85090f61b7a90ee827ab611e0..469c0f3d20c26c5256317b1b3a4a66dc48fece8a 100755
--- a/src/frontend/app/app.component.ts
+++ b/src/frontend/app/app.component.ts
@@ -34,6 +34,8 @@ export class AppComponent {
constructor(iconReg: MatIconRegistry, sanitizer: DomSanitizer, public headerService: HeaderService) {
iconReg.addSvgIcon('maarchLogo', sanitizer.bypassSecurityTrustResourceUrl('static.php?filename=logo_white.svg')).addSvgIcon('maarchLogoOnly', sanitizer.bypassSecurityTrustResourceUrl('img/logo_only_white.svg'));
+ iconReg.addSvgIcon('maarchLogoFull', sanitizer.bypassSecurityTrustResourceUrl('static.php?filename=logo.svg')).addSvgIcon('maarchLogoOnlyDefault', sanitizer.bypassSecurityTrustResourceUrl('img/logo.svg'));
+
if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
angularGlobals.mobileMode = true;
} else {
diff --git a/src/frontend/app/basket/basket-home.component.html b/src/frontend/app/basket/basket-home.component.html
index e3ed6361cbbecd9557d89955af84f0fc6cd874c4..600fdd11bf9d1c1333e26db91882af3b3955b408 100755
--- a/src/frontend/app/basket/basket-home.component.html
+++ b/src/frontend/app/basket/basket-home.component.html
@@ -1,6 +1,6 @@
<mat-divider *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
</mat-divider>
-<mat-expansion-panel expanded style="box-shadow:none;" *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
+<mat-expansion-panel class="basketList" expanded style="box-shadow:none;" *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
<mat-expansion-panel-header>
<mat-panel-title style="color: rgba(0,0,0,0.54);font-size: 14px;font-weight: 500;">
{{lang.myBaskets}}
@@ -10,27 +10,10 @@
<input matInput placeholder="Filtrer" #listFilter>
</mat-form-field>
<ng-container *ngFor="let regroupedBasket of homeData.regroupedBaskets">
- <mat-icon *ngIf="regroupedBasket.baskets[0]" color="primary" mat-list-icon class="fa fa-users"></mat-icon> <span *ngIf="regroupedBasket.baskets[0]" color="primary" style="font-weight:bold;">{{regroupedBasket.groupDesc}}</span>
+ <mat-icon *ngIf="regroupedBasket.baskets[0]" color="primary" mat-list-icon class="fa fa-users" style="margin-left:10px;"></mat-icon> <span *ngIf="regroupedBasket.baskets[0]" color="primary" style="font-weight:bold;">{{regroupedBasket.groupDesc}}</span>
<mat-divider *ngIf="regroupedBasket.baskets[0]"></mat-divider>
<mat-nav-list>
<ng-container *ngFor="let basket of regroupedBasket.baskets | filterList:listFilter.value:'basket_name'">
- <!-- <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;">
- <mat-icon [ngStyle]="{'color': basket.color}" *ngIf="basket.redirected && !mobileMode" mat-list-icon class="fa fa-share"></mat-icon>
- <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
- <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
- <p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
- {{basket.basket_name}}<br/><small color="primary">({{lang.redirectedTo}} {{basket.redirectedUser}})</small>
- </p>
- </a>
- <a mat-list-item *ngIf="!basket.redirected" (click)="closePanelLeft();goTo(basket.basket_id,regroupedBasket.groupId);" style="cursor:pointer;" [ngStyle]="{'opacity': basket.resourceNumber==0 ? '0.5' : '1', 'height': mobileMode ? '50px' : '38px'}">
- <mat-icon [ngStyle]="{'color': basket.color}" *ngIf="!mobileMode" mat-list-icon class="fa fa-inbox"></mat-icon>
- <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
- <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
- <p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
- {{basket.basket_name}}
- </p>
- </a> -->
- <!-- TODO NEW BASKET LIST-->
<a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;">
<mat-icon [ngStyle]="{'color': basket.color}" *ngIf="basket.redirected && !mobileMode" mat-list-icon class="fa fa-share"></mat-icon>
<span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
@@ -40,9 +23,8 @@
</p>
</a>
<a mat-list-item [ngClass]="{'selectedBasket': currentBasketInfo.basketId == basket.id && currentBasketInfo.ownerId == basket.owner_user_id && currentBasketInfo.groupId == regroupedBasket.groupSerialId}" *ngIf="!basket.redirected" (click)="closePanelLeft();" routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{regroupedBasket.groupSerialId}}/baskets/{{basket.id}}" style="cursor:pointer;" [ngStyle]="{'opacity': basket.resourceNumber==0 ? '0.5' : '1', 'height': mobileMode ? '50px' : '38px'}">
- <mat-icon [ngStyle]="{'color': basket.color}" *ngIf="!mobileMode" mat-list-icon class="fa fa-inbox"></mat-icon>
- <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
- <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
+ <span *ngIf="basket.resourceNumber==0" class="nbResZero" style="min-width:auto;">{{basket.resourceNumber}}</span>
+ <span *ngIf="basket.resourceNumber!=0" class="nbRes" style="min-width:auto;">{{basket.resourceNumber}}</span>
<p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
{{basket.basket_name}}
</p>
@@ -54,15 +36,6 @@
<span color="primary" style="font-weight:bold;" title="{{lang.basketsAssigned}}">{{lang.basketsAssignedShort}}</span>
<mat-divider></mat-divider>
<mat-nav-list>
- <!-- <a mat-list-item *ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value:'basket_name'">
- <mat-icon *ngIf="!mobileMode" style="color:#666" mat-list-icon class="fa fa-inbox"></mat-icon>
- <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
- <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
- <p mat-line (click)="goToRedirect(basket.basket_id, basket.ownerLogin, basket.uselessGroupId)" title="{{basket.basket_name}}" style="color:#666">
- {{basket.basket_name}}<br/><small color="primary">({{basket.userToDisplay}} - {{basket.group_desc}})</small>
- </p>
- </a> -->
- <!-- TODO NEW BASKET LIST-->
<a mat-list-item *ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value:'basket_name'" [ngClass]="{'selectedBasket': currentBasketInfo.basketId==basket.id && currentBasketInfo.ownerId==basket.owner_user_id && currentBasketInfo.groupId==basket.group_id}" routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{basket.group_id}}/baskets/{{basket.id}}">
<mat-icon *ngIf="!mobileMode" style="color:#666" mat-list-icon class="fa fa-paper-plane"></mat-icon>
<span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
diff --git a/src/frontend/app/basket/basket-home.component.scss b/src/frontend/app/basket/basket-home.component.scss
index 0eee7f3c8ff4a2b7fd8600295c55ee7399f976d2..e98e671e0b3dbbcd49368583c7ff07c02a25e2c7 100644
--- a/src/frontend/app/basket/basket-home.component.scss
+++ b/src/frontend/app/basket/basket-home.component.scss
@@ -1,8 +1,31 @@
+@import '../../css/vars.scss';
+
+.basketList {
+ ::ng-deep.mat-expansion-panel-body {
+ padding: 0;
+ }
+
+ .mat-line {
+ font-size: 12px;
+ font-weight: bold;
+ }
+}
+
.selectedBasket {
- border-left: solid 12px #F99830;
- background: rgba(249, 152, 48, 0.14);
+ border-left: solid 5px $primary;
+ background: rgba($primary, 0.14);
}
.selectedBasket:focus {
- background: rgba(249, 152, 48, 0.14);
+ background: rgba($primary, 0.14);
+}
+.nbRes {
+ color : $primary;
+ font-size: 12px;
+ font-weight: bold;
+}
+.nbResZero {
+ color : #666;
+ font-size: 12px;
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/src/frontend/app/header/header-left.component.html b/src/frontend/app/header/header-left.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..45fb357a9f53c5163d3f6d194ed36bc679369bf7
--- /dev/null
+++ b/src/frontend/app/header/header-left.component.html
@@ -0,0 +1,6 @@
+<div class="bg-head-title-label">
+ <button *ngIf="!snavLeft.opened" mat-icon-button (click)="snavLeft.open()">
+ <mat-icon class="fa fa-bars"></mat-icon>
+ </button>
+ {{headerService.headerMessage}} <span class="admin-toolbar-title-small">{{headerService.subHeaderMessage}}</span>
+</div>
\ No newline at end of file
diff --git a/src/frontend/app/header/header-left.component.scss b/src/frontend/app/header/header-left.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..d16e25dd4b44afa196c15859722815e35f91ea1c
--- /dev/null
+++ b/src/frontend/app/header/header-left.component.scss
@@ -0,0 +1,7 @@
+.bg-head-title-label {
+ .mat-icon-button {
+ position: absolute;
+ margin-left: -35px;
+ margin-top: -5px;
+ }
+}
\ No newline at end of file
diff --git a/src/frontend/app/header/header-left.component.ts b/src/frontend/app/header/header-left.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..3e7704c150d00beaf010bad78cbd32ae105fe595
--- /dev/null
+++ b/src/frontend/app/header/header-left.component.ts
@@ -0,0 +1,24 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { LANG } from '../translate.component';
+import { HeaderService } from '../../service/header.service';
+import { MatDialogRef, MatSidenav } from '@angular/material';
+
+@Component({
+ selector: 'header-left',
+ styleUrls: ['header-left.component.scss'],
+ templateUrl : "header-left.component.html",
+})
+export class HeaderLeftComponent implements OnInit {
+
+ lang : any = LANG;
+ mobileMode : boolean = false;
+
+ dialogRef : MatDialogRef<any>;
+ config : any = {};
+
+ @Input('snavLeft') snavLeft: MatSidenav;
+
+ constructor(public headerService: HeaderService) { }
+
+ ngOnInit(): void { }
+}
\ No newline at end of file
diff --git a/src/frontend/app/header/header-panel.component.html b/src/frontend/app/header/header-panel.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..0814771df0406dd58dd01136383e4ed30bea4bf3
--- /dev/null
+++ b/src/frontend/app/header/header-panel.component.html
@@ -0,0 +1,13 @@
+<div class="panelHeader">
+ <div class="panelHeader-logo">
+ <a href="#" title="{{lang.home}}" *ngIf="!mobileMode" style="margin-right: 30px;">
+ <mat-icon class="maarchLogo" svgIcon="maarchLogoFull"></mat-icon>
+ </a>
+ </div>
+ <div class="panelHeader-button">
+ <button mat-icon-button>
+ <mat-icon fontSet="fas" fontIcon="fa-bars" (click)="snavLeft.close()"></mat-icon>
+ </button>
+ </div>
+</div>
+<mat-divider></mat-divider>
\ No newline at end of file
diff --git a/src/frontend/app/header/header-panel.component.scss b/src/frontend/app/header/header-panel.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..e6e7bf99d7a323596520b147ddab4bdd2dbd400e
--- /dev/null
+++ b/src/frontend/app/header/header-panel.component.scss
@@ -0,0 +1,23 @@
+.panelHeader {
+ display: flex;
+
+ &-logo {
+ flex: 1;
+ }
+
+ &-button {
+ display: flex;
+ align-items: center;
+
+ .mat-icon-button {
+ font-size: 25px;
+ color: #666;
+ }
+ }
+}
+
+.maarchLogo {
+ height: 80px;
+ width: auto;
+ padding: 20px;
+}
\ No newline at end of file
diff --git a/src/frontend/app/header/header-panel.component.ts b/src/frontend/app/header/header-panel.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..34f491596342b4ea755878216bd059a5ae217d85
--- /dev/null
+++ b/src/frontend/app/header/header-panel.component.ts
@@ -0,0 +1,24 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { LANG } from '../translate.component';
+import { HeaderService } from '../../service/header.service';
+import { MatDialogRef, MatSidenav } from '@angular/material';
+
+@Component({
+ selector: 'header-panel',
+ styleUrls: ['header-panel.component.scss'],
+ templateUrl : "header-panel.component.html",
+})
+export class HeaderPanelComponent implements OnInit {
+
+ lang : any = LANG;
+ mobileMode : boolean = false;
+
+ dialogRef : MatDialogRef<any>;
+ config : any = {};
+
+ @Input('snavLeft') snavLeft: MatSidenav;
+
+ constructor(public headerService: HeaderService) { }
+
+ ngOnInit(): void { }
+}
\ No newline at end of file
diff --git a/src/frontend/app/header/header-right.component.html b/src/frontend/app/header/header-right.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..145db173edb4f867ddbc5659b87b66433769dee3
--- /dev/null
+++ b/src/frontend/app/header/header-right.component.html
@@ -0,0 +1,55 @@
+<div class="bg-head-title-tool">
+ <button mat-icon-button>
+ <mat-icon class="fa fa-search"></mat-icon>
+ </button>
+ <button mat-icon-button [matMenuTriggerFor]="applications" *ngIf="!mobileMode" matTooltip="{{lang.menu}}">
+ <mat-icon class="fa fa-th"></mat-icon>
+ </button>
+ <mat-menu #applications="matMenu" class="headerMaarchShortcut">
+ <ng-container *ngFor="let shortcut of headerService.menu">
+ <button (click)="gotToMenu(shortcut);" style="white-space:inherit;height: 100px;line-height:20px;"
+ class="col-md-4 col-xs-6" mat-button color="primary" matTooltip="{{shortcut.comment}}">
+ <i class="{{shortcut.style}} fa-2x"></i>
+ <br />{{shortcut.name}}
+ </button>
+ </ng-container>
+ </mat-menu>
+ <button mat-button [matMenuTriggerFor]="menu" *ngIf="!mobileMode">
+ <mat-icon mat-list-icon class="fa fa-user fa-2x" style="color:white; margin:0px 12px 8px 0px;"></mat-icon>
+ {{headerService.user.firstname | uppercase}} <b>{{headerService.user.lastname | uppercase}}</b>
+ </button>
+ <mat-menu #menu="matMenu" class="headerMaarch">
+ <canvas class="header-bg" width="250" height="70"
+ style="margin-top:-8px;background-image: url('static.php?filename=login-banner.jpg');background-size:cover;border-bottom: solid 1px white;"></canvas>
+ <i title="{{lang.myProfileAccess}}" routerLink="/profile"
+ style="cursor:pointer;z-index:1;color:white;position: absolute;left: 85px;top: 17px;background-image: url('static.php?filename=logo_only.svg');width: 70px;height: 70px;background-size: cover;background-position: top center;border-radius: 50%;border: solid white;background-color:white;"></i>
+ <div class="content" style="padding-top:10px;color:white;max-height:250px;overflow-y:auto;overflow-x:hidden;">
+ <p routerLink="/profile" class="text-center" style="cursor:pointer;">{{headerService.user.firstname}}
+ {{headerService.user.lastname | uppercase}}</p>
+ <mat-list>
+ <h3 mat-subheader style="color:white;">{{lang.groups}}</h3>
+ <mat-divider></mat-divider>
+ <mat-list-item *ngFor="let group of headerService.user.groups">
+ <p mat-line style="color:white;opacity:0.5;"> {{group.group_desc}} </p>
+ </mat-list-item>
+ <h3 mat-subheader style="color:white;">{{lang.entities}}</h3>
+ <mat-divider></mat-divider>
+ <mat-list-item *ngFor="let entity of headerService.user.entities">
+ <p mat-line style="color:white;opacity:0.5;"> {{entity.entity_label}} </p>
+ </mat-list-item>
+ </mat-list>
+ </div>
+ <div style="display:flex;padding: 5px 5px 0 5px;">
+ <div style="text-align:left;flex:1">
+ <a routerLink="/profile" style="color: white;padding-left: 10px;">
+ <span class="badge" style="background:white;" color="primary">{{lang.myProfile}}</span>
+ </a>
+ </div>
+ <div style="text-align:right;flex:2;">
+ <a href="index.php?display=true&page=logout&logout=true" style="color: white;padding-right: 10px;">
+ <span class="badge" style="background:white;" color="primary">{{lang.logout}}</span>
+ </a>
+ </div>
+ </div>
+ </mat-menu>
+</div>
\ No newline at end of file
diff --git a/src/frontend/app/header/header-right.component.scss b/src/frontend/app/header/header-right.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/frontend/app/header/header-right.component.ts b/src/frontend/app/header/header-right.component.ts
new file mode 100644
index 0000000000000000000000000000000000000000..69bb16d4565a39d8503ca0a2f652781a39b4f664
--- /dev/null
+++ b/src/frontend/app/header/header-right.component.ts
@@ -0,0 +1,36 @@
+import { Component, OnInit } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { LANG } from '../translate.component';
+import { HeaderService } from '../../service/header.service';
+import { MatDialog, MatDialogRef } from '@angular/material';
+import { IndexingGroupModalComponent } from '../menu/menu-shortcut.component';
+import { Router } from '@angular/router';
+
+@Component({
+ selector: 'header-right',
+ styleUrls: ['header-right.component.scss'],
+ templateUrl : "header-right.component.html",
+})
+export class HeaderRightComponent implements OnInit {
+
+ lang : any = LANG;
+ mobileMode : boolean = false;
+
+ dialogRef : MatDialogRef<any>;
+ config : any = {};
+
+ constructor(public http: HttpClient, private router: Router, public headerService: HeaderService, public dialog: MatDialog) { }
+
+ ngOnInit(): void { }
+
+ gotToMenu(shortcut:any) {
+ if (shortcut.id == 'index_mlb' && this.headerService.user.indexingGroups.length > 1) {
+ this.config = { data: { indexingGroups:this.headerService.user.indexingGroups, link:shortcut.servicepage } };
+ this.dialogRef = this.dialog.open(IndexingGroupModalComponent, this.config);
+ } else if (shortcut.angular == 'true') {
+ this.router.navigate([shortcut.servicepage]);
+ } else {
+ location.href = shortcut.servicepage;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/frontend/app/home.component.html b/src/frontend/app/home.component.html
index 154dc71d8fd051a39a0e063e7a1a9b155d93d6bc..6f52dcb70084d2667eda239b72cd5440eb726d18 100755
--- a/src/frontend/app/home.component.html
+++ b/src/frontend/app/home.component.html
@@ -1,7 +1,7 @@
<div class="admin-container" [class.admin-is-mobile]="mobileQuery.matches">
<mat-sidenav-container autosize class="admin-sidenav-container">
<mat-sidenav #snav [mode]="mobileMode ? 'over' : 'side'" [fixedInViewport]="mobileMode" fixedTopGap="56" [opened]="mobileMode ? false : true"
- autoFocus="false" style="overflow-x:hidden;" [ngStyle]="{'width': mobileMode ? '80%' : '400px'}">
+ autoFocus="false" style="overflow-x:hidden;" [ngStyle]="{'width': mobileMode ? '80%' : '350px'}">
<menu-shortcut></menu-shortcut>
<menu-nav></menu-nav>
<basket-home *ngIf="homeData" [homeData]="homeData" [snavL]="snav"></basket-home>
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index 02b0df42ccbbe3c3b8fe75f45790aabe49fd44a5..6970cf246aaf6569fc162dc1dc15a801e81da9cf 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -1,9 +1,8 @@
-<div class="admin-container" [class.admin-is-mobile]="mobileQuery.matches">
-
<mat-sidenav-container class="example-container">
<mat-sidenav #snavLeft mode="side" opened class="panel-left" #snav [mode]="mobileMode ? 'over' : 'side'"
[fixedInViewport]="mobileMode" fixedTopGap="56" [opened]="mobileMode ? false : true" autoFocus="false"
- style="overflow-x:hidden;" [ngStyle]="{'width': mobileMode ? '80%' : '400px'}">
+ style="overflow-x:hidden;" [ngStyle]="{'width': mobileMode ? '80%' : '350px'}">
+ <header-panel [snavLeft]="snav"></header-panel>
<menu-shortcut></menu-shortcut>
<menu-nav></menu-nav>
<basket-home *ngIf="homeData" #basketHome [homeData]="homeData" [snavL]="snav"
@@ -14,24 +13,10 @@
<div class="bg-head">
<div class="bg-head-title">
<div class="bg-head-title-label">
- <!--<button *ngIf="!snavLeft.opened" mat-icon-button (click)="snavLeft.open()" style="position: absolute;margin-left: -35px;">
- <mat-icon class="fa fa-bars"></mat-icon>
- </button>
- <b>Utilisateur</b> | Couriers à traiter-->
+ <header-left [snavLeft]="snav"></header-left>
</div>
<div class="bg-head-title-tool">
- <!--<button mat-icon-button>
- <mat-icon class="fa fa-search"></mat-icon>
- </button>
- <button mat-icon-button [matMenuTriggerFor]="menu">
- <mat-icon class="fa fa-th"></mat-icon>
- </button>
- <mat-menu #menu="matMenu">
- <button mat-menu-item>Item 1</button>
- <button mat-menu-item>Item 2</button>
- </mat-menu>
- <mat-icon class="fa fa-user"></mat-icon>
- <span> Alex ORLUC</span>-->
+ <header-right></header-right>
</div>
</div>
<div class="bg-head-content">
@@ -203,7 +188,6 @@
<mat-divider></mat-divider>
</mat-sidenav>
</mat-sidenav-container>
-</div>
-<app-actions-list (triggerEvent)="refreshDaoAfterAction()" #actionsListContext [contextMode]="true"
- [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" [currentBasketInfo]="currentBasketInfo">
-</app-actions-list>
\ No newline at end of file
+ <app-actions-list (triggerEvent)="refreshDaoAfterAction()" #actionsListContext [contextMode]="true"
+ [totalRes]="allResInBasket.length" [selectedRes]="selectedRes" [currentBasketInfo]="currentBasketInfo">
+ </app-actions-list>
\ No newline at end of file
diff --git a/src/frontend/app/list/basket-list.component.scss b/src/frontend/app/list/basket-list.component.scss
index a71a0b0101f8c7d871e0289f38c2885269b7fd25..a9dbd16cb25419489beb1e4dbef0f9db31e7efc6 100644
--- a/src/frontend/app/list/basket-list.component.scss
+++ b/src/frontend/app/list/basket-list.component.scss
@@ -12,7 +12,6 @@
flex-direction: column;
}
-
.bg-head {
background: #135F7F;
min-height: 200px;
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 77a1ad279dbe23fdbcb9cae0a8429d5db68f3520..95dec47d4f79bc4a843ef0641a307e9d93afda2c 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -176,7 +176,7 @@ export class BasketListComponent implements OnInit {
this.allResInBasket = data.allResources;
this.currentBasketInfo.basket_id = data.basket_id;
this.defaultAction = data.defaultAction;
- this.headerService.setHeader(data.basketLabel, this.resultsLength + ' ' + this.lang.entries);
+ this.headerService.setHeader(data.basketLabel);
return data.resources;
}),
catchError((err: any) => {
diff --git a/src/frontend/app/menu/main-header.component.ts b/src/frontend/app/menu/main-header.component.ts
index 5fab6abdb9e31bc0c07dc8cf1746185d231bd365..de28501f28a593a206548c010fbcefceefe8aef7 100755
--- a/src/frontend/app/menu/main-header.component.ts
+++ b/src/frontend/app/menu/main-header.component.ts
@@ -61,7 +61,7 @@ export class MainHeaderComponent implements OnInit {
gotToMenu(shortcut:any) {
if (shortcut.id == 'index_mlb' && this.headerService.user.indexingGroups.length > 1) {
- this.config = { data: { indexingGroups:this.headerService.user.indexingGroups, link:shortcut.menu.servicepage } };
+ this.config = { data: { indexingGroups:this.headerService.user.indexingGroups, link:shortcut.servicepage } };
this.dialogRef = this.dialog.open(IndexingGroupModalComponent, this.config);
} else if (shortcut.angular == 'true') {
this.router.navigate([shortcut.servicepage]);