From 08bd5728bb5b61f890a7f0d61bde6aa9e2157831 Mon Sep 17 00:00:00 2001
From: Alex Orluc <alex.orluc@maarch.org>
Date: Tue, 5 Nov 2019 21:36:53 +0100
Subject: [PATCH] FEAT #12074 TIME 0:15 add back to basket button
---
src/frontend/app/header/header-panel.component.html | 10 +++++-----
src/frontend/app/header/header-panel.component.ts | 6 +++---
src/frontend/app/indexation/indexation.component.html | 4 ++--
src/frontend/app/process/process.component.html | 2 +-
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 1 +
src/frontend/lang/lang-nl.ts | 1 +
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/frontend/app/header/header-panel.component.html b/src/frontend/app/header/header-panel.component.html
index 1d7467cdbc7..073106ce27e 100644
--- a/src/frontend/app/header/header-panel.component.html
+++ b/src/frontend/app/header/header-panel.component.html
@@ -1,11 +1,11 @@
<div class="panelHeader">
- <div *ngIf="showBackHome" class="panelHeader-backHome">
- <button mat-button style="padding-top: 5px;padding-bottom: 5px;" (click)="gotToHome()">
- <i class="fa fa-home" style="height: auto"></i>
- <span>{{lang.backHome}}</span>
+ <div *ngIf="navButton !== null" class="panelHeader-backHome">
+ <button mat-button style="padding-top: 5px;padding-bottom: 5px;" (click)="gotTo()">
+ <i class="{{navButton.icon}}" style="height: auto"></i>
+ <span>{{navButton.label}}</span>
</button>
</div>
- <div class="panelHeader-logo" [class.text-center]="showBackHome">
+ <div class="panelHeader-logo" [class.text-center]="navButton !== null">
<a href="#" title="{{lang.home}}" style="margin-right: 30px;">
<mat-icon class="maarchLogo" svgIcon="maarchLogoFull"></mat-icon>
</a>
diff --git a/src/frontend/app/header/header-panel.component.ts b/src/frontend/app/header/header-panel.component.ts
index e0c32773409..6b9658d6a55 100644
--- a/src/frontend/app/header/header-panel.component.ts
+++ b/src/frontend/app/header/header-panel.component.ts
@@ -19,7 +19,7 @@ export class HeaderPanelComponent implements OnInit {
config : any = {};
- @Input('showBackHome') showBackHome: boolean = false;
+ @Input('navButton') navButton: any = null;
@Input('snavLeft') snavLeft: MatSidenav;
constructor(
@@ -30,7 +30,7 @@ export class HeaderPanelComponent implements OnInit {
ngOnInit(): void { }
- gotToHome() {
- this.router.navigate(['/home']);
+ gotTo() {
+ this.router.navigate([this.navButton.route]);
}
}
\ No newline at end of file
diff --git a/src/frontend/app/indexation/indexation.component.html b/src/frontend/app/indexation/indexation.component.html
index dfb3166843d..563d68c1ff3 100644
--- a/src/frontend/app/indexation/indexation.component.html
+++ b/src/frontend/app/indexation/indexation.component.html
@@ -2,7 +2,7 @@
<mat-sidenav #snavLeft class="panel-left" #snav [mode]="appService.getViewMode() ? 'over' : 'side'"
[fixedInViewport]="appService.getViewMode()" [opened]="appService.getViewMode() ? false : true"
autoFocus="false" style="overflow-x:hidden;" [ngStyle]="{'width': appService.getViewMode() ? '95%' : '600px'}">
- <header-panel [snavLeft]="snav" [showBackHome]="true"></header-panel>
+ <header-panel [snavLeft]="snav" [navButton]="{icon: 'fa fa-home', label: lang.backHome, route : '/home'}"></header-panel>
<ng-container *ngIf="indexingModels.length > 0">
<div class="listModels">
<button mat-button class="button-form-primary listModels-button"
@@ -93,7 +93,7 @@
</div>
<div class="document-container" [class.fullContainer]="appService.getViewMode()">
<div class="content">
- <app-document-viewer #appDocumentViewer [tmpFilename]="tmpFilename" style="height:100%;width:100%;">
+ <app-document-viewer #appDocumentViewer [editMode]="true" [tmpFilename]="tmpFilename" style="height:100%;width:100%;">
</app-document-viewer>
</div>
</div>
diff --git a/src/frontend/app/process/process.component.html b/src/frontend/app/process/process.component.html
index 0020d023a63..1445ae2455e 100644
--- a/src/frontend/app/process/process.component.html
+++ b/src/frontend/app/process/process.component.html
@@ -2,7 +2,7 @@
<mat-sidenav #snavLeft class="panel-left" #snav [mode]="appService.getViewMode() ? 'over' : 'side'"
[fixedInViewport]="appService.getViewMode()" [opened]="appService.getViewMode() ? false : true"
autoFocus="false" style="overflow-x:hidden;" [ngStyle]="{'width': appService.getViewMode() ? '95%' : '600px'}">
- <header-panel [snavLeft]="snav" [showBackHome]="true"></header-panel>
+ <header-panel [snavLeft]="snav" [navButton]="{icon: 'fa fa-inbox', label: lang.backBasket, route : '/basketList/users/'+currentUserId+'/groups/'+currentGroupId+'/baskets/'+currentBasketId}"></header-panel>
<div class="listModels">
<div class="processTool">
<div class="processTool-module jiggle" *ngFor="let module of processTool"
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 9bff904b7b7..78d5a7eb4be 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1246,4 +1246,5 @@ export const LANG_EN = {
"chooseFile" : "Choose a file",
"or" : "or",
"dragAndDrop" : "Drag and drop",
+ "backBasket" : "Back to basket",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index de99732d96b..eb394ae466e 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1283,4 +1283,5 @@ export const LANG_FR = {
"chooseFile" : "Choisissez un fichier",
"or" : "ou",
"dragAndDrop" : "Glisser-déposer",
+ "backBasket" : "Retour bannette",
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 8609321d926..2e81ffad91d 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1271,4 +1271,5 @@ export const LANG_NL = {
"chooseFile" : "Choose a file", //_TO_TRANSLATE
"or" : "or", //_TO_TRANSLATE
"dragAndDrop" : "Drag and drop", //_TO_TRANSLATE
+ "backBasket" : "Back to basket", //_TO_TRANSLATE
};
--
GitLab