From 95e4bed4b58e141b8304a10ea0cd8e0b1610b04a Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Fri, 30 Aug 2019 12:25:49 +0200 Subject: [PATCH] FIX #11292 TIME 0:15 add icon header --- .../folder/document-list/folder-document-list.component.ts | 2 +- src/frontend/app/header/header-left.component.html | 2 +- src/frontend/app/list/basket-list.component.ts | 2 +- src/frontend/service/header.service.ts | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/frontend/app/folder/document-list/folder-document-list.component.ts b/src/frontend/app/folder/document-list/folder-document-list.component.ts index 3a54a04ad87..2cbfe6da280 100644 --- a/src/frontend/app/folder/document-list/folder-document-list.component.ts +++ b/src/frontend/app/folder/document-list/folder-document-list.component.ts @@ -136,7 +136,7 @@ export class FolderDocumentListComponent implements OnInit { 'label': data.folder.label }; - this.headerService.setHeader('Dossier : ' + this.folderInfo.label); + this.headerService.setHeader(this.folderInfo.label, '', 'fa fa-folder-open'); }); this.basketUrl = '../../rest/folders/' + params['folderId'] + '/resources'; this.filtersListService.filterMode = false; diff --git a/src/frontend/app/header/header-left.component.html b/src/frontend/app/header/header-left.component.html index 2b89072bf3a..5fac3927e3f 100644 --- a/src/frontend/app/header/header-left.component.html +++ b/src/frontend/app/header/header-left.component.html @@ -2,5 +2,5 @@ <button *ngIf="!snavLeft.opened" mat-icon-button (click)="snavLeft.open()" style="font-size:20px;"> <mat-icon class="fa fa-stream"></mat-icon> </button> - {{headerService.headerMessage}} <span class="admin-toolbar-title-small">{{headerService.subHeaderMessage}}</span> + <i *ngIf="headerService.headerMessageIcon !== ''" class="{{headerService.headerMessageIcon}}"></i> {{headerService.headerMessage}} <span class="admin-toolbar-title-small">{{headerService.subHeaderMessage}}</span> </div> \ No newline at end of file diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts index df435881bff..32af88730e6 100755 --- a/src/frontend/app/list/basket-list.component.ts +++ b/src/frontend/app/list/basket-list.component.ts @@ -184,7 +184,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.headerService.setHeader(data.basketLabel, '', 'fa fa-inbox'); return data.resources; }), catchError((err: any) => { diff --git a/src/frontend/service/header.service.ts b/src/frontend/service/header.service.ts index a7ea7fab8f9..2263743601c 100755 --- a/src/frontend/service/header.service.ts +++ b/src/frontend/service/header.service.ts @@ -6,6 +6,7 @@ import { of } from 'rxjs'; @Injectable() export class HeaderService { + headerMessageIcon: string = ""; headerMessage: string = ""; subHeaderMessage: string = ""; user: any = { firstname: "", lastname: "" }; @@ -102,8 +103,9 @@ export class HeaderService { ); } - setHeader(maintTitle: string, subTitle: any = '') { + setHeader(maintTitle: string, subTitle: any = '', icon = '') { this.headerMessage = maintTitle; this.subHeaderMessage = subTitle; + this.headerMessageIcon = icon; } } -- GitLab